You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/11/17 17:21:32 UTC

[25/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java
deleted file mode 100644
index 9e786d1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.dmtf.ovf.DeploymentOptionSection;
-import org.jclouds.dmtf.ovf.DiskSection;
-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;
-import com.google.common.collect.Sets;
-
-/**
- * A vApp Template can be in one of these statues:
- * <ul>
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#FAILED_CREATION
- * FAILED_CREATION(-1)} - Transient entity state, e.g., model object is addd but the
- * corresponding VC backing does not exist yet. This is further sub-categorized in the respective
- * entities.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#UNRESOLVED
- * UNRESOLVED(0)} - Entity is whole, e.g., VM creation is complete and all the required model
- * objects and VC backings are addd.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#RESOLVED
- * RESOLVED(1)} - Entity is resolved.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#UNKNOWN
- * UNKNOWN(6)} - Entity state could not be retrieved from the inventory, e.g., VM power state is
- * null.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#POWERED_OFF
- * POWERED_OFF(8)} - All VMs of the vApp template are powered off.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#MIXED MIXED(10)}
- * - vApp template status is set to {@code MIXED} when the VMs in the vApp are in different power
- * states.
- * </ul>
- */
-@XmlRootElement(name = "VAppTemplate")
-public class VAppTemplate extends ResourceEntity {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromVAppTemplate(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-
-   public abstract static class Builder<B extends Builder<B>> extends ResourceEntity.Builder<B> {
-      private Owner owner;
-      private Set<Vm> children = Sets.newLinkedHashSet();
-      private Set<SectionType> sections = Sets.newLinkedHashSet();
-      private String vAppScopedLocalId;
-      private Boolean ovfDescriptorUploaded;
-      private Boolean goldMaster;
-
-      /**
-       * @see VAppTemplate#getOwner()
-       */
-      public B owner(Owner owner) {
-         this.owner = owner;
-         return self();
-      }
-
-      /**
-       * @see VAppTemplate#getChildren()
-       */
-      public B children(Iterable<Vm> children) {
-         this.children = Sets.newLinkedHashSet(checkNotNull(children, "children"));
-         return self();
-      }
-
-      /**
-       * @see VAppTemplate#getSections()
-       */
-      public B sections(Iterable<? extends SectionType> sections) {
-         this.sections = Sets.newLinkedHashSet(checkNotNull(sections, "sections"));
-         return self();
-      }
-
-      /**
-       * @see VAppTemplate#getVAppScopedLocalId()
-       */
-      public B vAppScopedLocalId(String vAppScopedLocalId) {
-         this.vAppScopedLocalId = vAppScopedLocalId;
-         return self();
-      }
-
-      /**
-       * @see VAppTemplate#isOvfDescriptorUploaded()
-       */
-      public B ovfDescriptorUploaded(Boolean ovfDescriptorUploaded) {
-         this.ovfDescriptorUploaded = ovfDescriptorUploaded;
-         return self();
-      }
-
-      /**
-       * @see VAppTemplate#isGoldMaster()
-       */
-      public B goldMaster(Boolean goldMaster) {
-         this.goldMaster = goldMaster;
-         return self();
-      }
-
-      @Override
-      public VAppTemplate build() {
-         return new VAppTemplate(this);
-      }
-
-      public B fromVAppTemplate(VAppTemplate in) {
-         return fromResourceEntityType(in)
-               .owner(in.getOwner())
-               .children(in.getChildren())
-               .sections(in.getSections())
-               .vAppScopedLocalId(in.getVAppScopedLocalId())
-               .ovfDescriptorUploaded(in.isOvfDescriptorUploaded())
-               .goldMaster(in.isGoldMaster());
-      }
-   }
-
-   @XmlElement(name = "Owner")
-   private Owner owner;
-   @XmlElementWrapper(name = "Children")
-   @XmlElement(name = "Vm")
-   private Set<Vm> children = Sets.newLinkedHashSet();
-   @XmlElementRefs({
-      @XmlElementRef(type = VirtualHardwareSection.class),
-      @XmlElementRef(type = LeaseSettingsSection.class),
-//      @XmlElementRef(type = EulaSection.class),
-      @XmlElementRef(type = RuntimeInfoSection.class),
-//      @XmlElementRef(type = AnnotationSection.class),
-      @XmlElementRef(type = DeploymentOptionSection.class),
-      @XmlElementRef(type = StartupSection.class),
-//      @XmlElementRef(type = ResourceAllocationSection.class),
-      @XmlElementRef(type = NetworkConnectionSection.class),
-      @XmlElementRef(type = CustomizationSection.class),
-      @XmlElementRef(type = ProductSection.class),
-      @XmlElementRef(type = GuestCustomizationSection.class),
-      @XmlElementRef(type = OperatingSystemSection.class),
-      @XmlElementRef(type = NetworkConfigSection.class),
-      @XmlElementRef(type = NetworkSection.class),
-//      @XmlElementRef(type = InstallSection.class),
-      @XmlElementRef(type = DiskSection.class)
-   })
-   private Set<SectionType> sections = Sets.newLinkedHashSet();
-   @XmlElement(name = "VAppScopedLocalId")
-   private String vAppScopedLocalId;
-   @XmlAttribute
-   private Boolean ovfDescriptorUploaded;
-   @XmlAttribute
-   private Boolean goldMaster;
-
-   protected VAppTemplate(Builder<?> builder) {
-      super(builder);
-      this.owner = builder.owner;
-      this.children = builder.children.isEmpty() ? ImmutableSet.<Vm>of() : ImmutableSet.copyOf(builder.children);
-      this.sections = builder.sections.isEmpty() ? null : ImmutableSet.copyOf(builder.sections);
-      this.vAppScopedLocalId = builder.vAppScopedLocalId;
-      this.ovfDescriptorUploaded = builder.ovfDescriptorUploaded;
-      this.goldMaster = builder.goldMaster;
-   }
-
-   protected VAppTemplate() {
-      // For JAXB
-   }
-
-   /**
-    * Gets the value of the owner property.
-    */
-   public Owner getOwner() {
-      return owner;
-   }
-
-   /**
-    * Gets the value of the children property.
-    */
-   public Set<Vm> getChildren() {
-      return children;
-   }
-
-   /**
-    * Contains ovf sections for vApp template.
-    *
-    * Objects of the following type(s) are allowed in the list:
-    * <ul>
-    * <li>{@link VirtualHardwareSectionType}
-    * <li>{@link LeaseSettingsSectionType}
-    * <li>{@link EulaSectionType}
-    * <li>{@link RuntimeInfoSectionType}
-    * <li>{@link AnnotationSectionType}
-    * <li>{@link DeploymentOptionSectionType}
-    * <li>{@link StartupSectionType}
-    * <li>{@link ResourceAllocationSectionType}
-    * <li>{@link NetworkConnectionSectionType}
-    * <li>{@link CustomizationSectionType}
-    * <li>{@link ProductSectionType}
-    * <li>{@link GuestCustomizationSectionType}
-    * <li>{@link OperatingSystemSectionType}
-    * <li>{@link NetworkConfigSectionType}
-    * <li>{@link NetworkSectionType}
-    * <li>{@link DiskSectionType}
-    * <li>{@link InstallSectionType}
-    * </ul>
-    */
-   public Set<SectionType> getSections() {
-      return sections != null ? ImmutableSet.copyOf(sections) : ImmutableSet.<SectionType>of();
-   }
-
-   /**
-    * Gets the value of the vAppScopedLocalId property.
-    */
-   public String getVAppScopedLocalId() {
-      return vAppScopedLocalId;
-   }
-
-   /**
-    * Gets the value of the ovfDescriptorUploaded property.
-    */
-   public Boolean isOvfDescriptorUploaded() {
-      return ovfDescriptorUploaded;
-   }
-
-   /**
-    * Gets the value of the goldMaster property.
-    */
-   public boolean isGoldMaster() {
-      if (goldMaster == null) {
-         return false;
-      } else {
-         return goldMaster;
-      }
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      VAppTemplate that = VAppTemplate.class.cast(o);
-      return super.equals(that) &&
-            equal(owner, that.owner) &&
-            equal(children, that.children) &&
-            equal(sections, that.sections) &&
-            equal(vAppScopedLocalId, that.vAppScopedLocalId) &&
-            equal(ovfDescriptorUploaded, that.ovfDescriptorUploaded) &&
-            equal(goldMaster, that.goldMaster);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(),
-            owner,
-            children,
-            sections,
-            vAppScopedLocalId,
-            ovfDescriptorUploaded,
-            goldMaster);
-   }
-
-   @Override
-   public String toString() {
-      return Objects.toStringHelper(super.toString())
-            .add("owner", owner)
-            .add("children", children)
-            .add("sections", sections)
-            .add("vAppScopedLocalId", vAppScopedLocalId)
-            .add("ovfDescriptorUploaded", ovfDescriptorUploaded)
-            .add("goldMaster", goldMaster).toString();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java
deleted file mode 100644
index a237c33..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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 javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "VMWareTools")
-@XmlType(name = "VMWareTools")
-public class VMWareTools {
-
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   public Builder toBuilder() {
-      return new Builder().fromVMWareTools(this);
-   }
-
-   public static class Builder {
-
-      private String version;
-
-      /**
-       * @see VMWareTools#getVersion()
-       */
-      public Builder version(String version) {
-         this.version = version;
-         return this;
-      }
-
-      public VMWareTools build() {
-         VMWareTools vmWareTools = new VMWareTools(version);
-         return vmWareTools;
-      }
-
-      public Builder fromVMWareTools(VMWareTools in) {
-         return version(in.getVersion());
-      }
-   }
-
-   @XmlAttribute(required = true)
-   protected String version;
-
-   protected VMWareTools() {
-      // For JAXB and builder use
-   }
-
-   public VMWareTools(String version) {
-      this.version = version;
-   }
-
-   /**
-    * Gets the value of the version property.
-    */
-   public String getVersion() {
-      return version;
-   }
-
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      VMWareTools that = VMWareTools.class.cast(o);
-      return equal(this.version, that.version);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(version);
-   }
-
-   @Override
-   public String toString() {
-      return Objects.toStringHelper("").add("version", version).toString();
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
deleted file mode 100644
index 65b1ff8..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.XmlAttribute;
-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 com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Represents a virtual data center (vDC).
- */
-@XmlRootElement(name = "Vdc")
-@XmlType(name = "VdcType")
-@XmlSeeAlso({ AdminVdc.class })
-public class Vdc extends Entity {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromVdc(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public abstract static class Builder<B extends Builder<B>> extends Entity.Builder<B> {
-      private String allocationModel;
-      private CapacityWithUsage storageCapacity;
-      private ComputeCapacity computeCapacity;
-      private Set<Reference> resourceEntities = Sets.newLinkedHashSet();
-      private Set<Reference> availableNetworks = Sets.newLinkedHashSet();
-      private Capabilities capabilities;
-      private Integer nicQuota;
-      private Integer networkQuota;
-      private Integer vmQuota;
-      private Boolean isEnabled;
-      private Integer status;
-
-      /**
-       * @see Vdc#getAllocationModel()
-       */
-      public B allocationModel(String allocationModel) {
-         this.allocationModel = allocationModel;
-         return self();
-      }
-
-      /**
-       * @see Vdc#getStorageCapacity()
-       */
-      public B storageCapacity(CapacityWithUsage storageCapacity) {
-         this.storageCapacity = storageCapacity;
-         return self();
-      }
-
-      /**
-       * @see Vdc#getComputeCapacity()
-       */
-      public B computeCapacity(ComputeCapacity computeCapacity) {
-         this.computeCapacity = computeCapacity;
-         return self();
-      }
-
-      /**
-       * @see Vdc#getResourceEntities()
-       */
-      public B resourceEntities(Set<Reference> resourceEntities) {
-         this.resourceEntities = Sets.newLinkedHashSet(checkNotNull(resourceEntities, "resourceEntities"));
-         return self();
-      }
-
-      /**
-       * @see Vdc#getResourceEntities()
-       */
-      public B resourceEntity(Reference resourceEntity) {
-         this.resourceEntities.add(checkNotNull(resourceEntity, "resourceEntity"));
-         return self();
-      }
-
-      /**
-       * @see Vdc#getAvailableNetworks()
-       */
-      public B availableNetworks(Set<Reference> availableNetworks) {
-         this.availableNetworks = Sets.newLinkedHashSet(checkNotNull(availableNetworks, "availableNetworks"));
-         return self();
-      }
-
-      /**
-       * @see Vdc#getAvailableNetworks()
-       */
-      public B network(Reference availableNetwork) {
-         this.availableNetworks.add(checkNotNull(availableNetwork, "availableNetwork"));
-         return self();
-      }
-
-      /**
-       * @see Vdc#getCapabilities()
-       */
-      public B capabilities(Capabilities capabilities) {
-         this.capabilities = capabilities;
-         return self();
-      }
-
-      /**
-       * @see Vdc#getNicQuota()
-       */
-      public B nicQuota(Integer nicQuota) {
-         this.nicQuota = nicQuota;
-         return self();
-      }
-
-      /**
-       * @see Vdc#getNetworkQuota()
-       */
-      public B networkQuota(Integer networkQuota) {
-         this.networkQuota = networkQuota;
-         return self();
-      }
-
-      /**
-       * @see Vdc#getVmQuota()
-       */
-      public B vmQuota(Integer vmQuota) {
-         this.vmQuota = vmQuota;
-         return self();
-      }
-
-      /**
-       * @see Vdc#isEnabled()
-       */
-      public B isEnabled(Boolean isEnabled) {
-         this.isEnabled = isEnabled;
-         return self();
-      }
-
-      /**
-       * @see Vdc#getStatus()
-       */
-      public B status(Integer status) {
-         this.status = status;
-         return self();
-      }
-
-      @Override
-      public Vdc build() {
-         return new Vdc(this);
-      }
-
-      public B fromVdc(Vdc in) {
-         return fromEntityType(in)
-               .allocationModel(in.getAllocationModel())
-               .storageCapacity(in.getStorageCapacity())
-               .computeCapacity(in.getComputeCapacity())
-               .resourceEntities(Sets.newLinkedHashSet(in.getResourceEntities()))
-               .availableNetworks(Sets.newLinkedHashSet(in.getAvailableNetworks()))
-               .capabilities(in.getCapabilities())
-               .nicQuota(in.getNicQuota())
-               .networkQuota(in.getNetworkQuota())
-               .vmQuota(in.getVmQuota())
-               .isEnabled(in.isEnabled())
-               .status(in.getStatus());
-      }
-   }
-   
-   protected Vdc() {
-      // For JAXB
-   }
-
-   public Vdc(Builder<?> builder) {
-      super(builder);
-      this.allocationModel = builder.allocationModel;
-      this.storageCapacity = builder.storageCapacity;
-      this.computeCapacity = builder.computeCapacity;
-      this.resourceEntities = builder.resourceEntities == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.resourceEntities);
-      this.availableNetworks = builder.availableNetworks == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.availableNetworks);
-      this.capabilities = builder.capabilities;
-      this.nicQuota = builder.nicQuota;
-      this.networkQuota = builder.networkQuota;
-      this.vmQuota = builder.vmQuota;
-      this.isEnabled = builder.isEnabled;
-      this.status = builder.status;
-   }
-
-   @XmlElement(name = "AllocationModel", required = true)
-   private String allocationModel;
-   @XmlElement(name = "StorageCapacity", required = true)
-   private CapacityWithUsage storageCapacity;
-   @XmlElement(name = "ComputeCapacity", required = true)
-   private ComputeCapacity computeCapacity;
-   @XmlElementWrapper(name = "ResourceEntities")
-   @XmlElement(name = "ResourceEntity")
-   private Set<Reference> resourceEntities = Sets.newLinkedHashSet();
-   @XmlElementWrapper(name = "AvailableNetworks")
-   @XmlElement(name = "Network")
-   protected Set<Reference> availableNetworks = Sets.newLinkedHashSet();
-   @XmlElement(name = "Capabilities")
-   private Capabilities capabilities;
-   @XmlElement(name = "NicQuota")
-   private Integer nicQuota;
-   @XmlElement(name = "NetworkQuota")
-   private Integer networkQuota;
-   @XmlElement(name = "VmQuota")
-   private Integer vmQuota;
-   @XmlElement(name = "IsEnabled")
-   private Boolean isEnabled;
-   @XmlAttribute
-   private Integer status;
-
-   /**
-    * Gets the value of the allocationModel property.
-    */
-   public String getAllocationModel() {
-      return allocationModel;
-   }
-
-   /**
-    * Gets the value of the storageCapacity property.
-    */
-   public CapacityWithUsage getStorageCapacity() {
-      return storageCapacity;
-   }
-
-   /**
-    * Gets the value of the computeCapacity property.
-    */
-   public ComputeCapacity getComputeCapacity() {
-      return computeCapacity;
-   }
-
-   /**
-    * Gets the value of the resourceEntities property.
-    */
-   public Set<Reference> getResourceEntities() {
-      return resourceEntities;
-   }
-
-   /**
-    * Gets the value of the availableNetworks property.
-    */
-   public Set<Reference> getAvailableNetworks() {
-      return availableNetworks;
-   }
-
-   /**
-    * Gets the value of the capabilities property.
-    */
-   public Capabilities getCapabilities() {
-      return capabilities;
-   }
-
-   /**
-    * Gets the value of the nicQuota property.
-    */
-   public Integer getNicQuota() {
-      return nicQuota;
-   }
-
-   /**
-    * Gets the value of the networkQuota property.
-    */
-   public Integer getNetworkQuota() {
-      return networkQuota;
-   }
-
-   /**
-    * Gets the value of the vmQuota property.
-    */
-   public Integer getVmQuota() {
-      return vmQuota;
-   }
-
-   /**
-    * Gets the value of the isEnabled property.
-    */
-   public Boolean isEnabled() {
-      return isEnabled;
-   }
-
-   /**
-    * Gets the value of the status property.
-    */
-   public Integer getStatus() {
-      return status;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      Vdc that = Vdc.class.cast(o);
-      return super.equals(that) &&
-            equal(this.allocationModel, that.allocationModel) &&
-            equal(this.storageCapacity, that.storageCapacity) &&
-            equal(this.computeCapacity, that.computeCapacity) &&
-            equal(this.resourceEntities, that.resourceEntities) &&
-            equal(this.availableNetworks, that.availableNetworks) &&
-            equal(this.capabilities, that.capabilities) &&
-            equal(this.nicQuota, that.nicQuota) &&
-            equal(this.networkQuota, that.networkQuota) &&
-            equal(this.vmQuota, that.vmQuota) &&
-            equal(this.isEnabled, that.isEnabled) &&
-            equal(this.status, that.status);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), allocationModel, storageCapacity, computeCapacity, resourceEntities, availableNetworks,
-            capabilities, nicQuota, networkQuota, vmQuota, isEnabled, status);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string()
-            .add("allocationModel", allocationModel)
-            .add("storageCapacity", storageCapacity)
-            .add("computeCapacity", computeCapacity)
-            .add("resourceEntities", resourceEntities)
-            .add("availableNetworks", availableNetworks)
-            .add("capabilities", capabilities)
-            .add("nicQuota", nicQuota)
-            .add("networkQuota", networkQuota)
-            .add("vmQuota", vmQuota)
-            .add("isEnabled", isEnabled)
-            .add("status", status);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java
deleted file mode 100644
index db100e4..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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 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.dmtf.ovf.environment.EnvironmentType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Represents a virtual machine.
- */
-@XmlRootElement(name = "Vm")
-@XmlType(name = "VmType")
-public class Vm extends AbstractVApp {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromVm(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public abstract static class Builder<B extends Builder<B>> extends AbstractVApp.Builder<B> {
-
-      private String vAppScopedLocalId;
-      private EnvironmentType environment;
-      private Boolean needsCustomization;
-
-      /**
-       * @see Vm#getVAppScopedLocalId()
-       */
-      public B vAppScopedLocalId(String vAppScopedLocalId) {
-         this.vAppScopedLocalId = vAppScopedLocalId;
-         return self();
-      }
-
-      /**
-       * @see Vm#getEnvironment()
-       */
-      public B environment(EnvironmentType environment) {
-         this.environment = environment;
-         return self();
-      }
-
-      /**
-       * @see Vm#getNeedsCustomization()
-       */
-      public B isNeedsCustomization(Boolean needsCustomization) {
-         this.needsCustomization = needsCustomization;
-         return self();
-      }
-
-      /**
-       * @see Vm#getNeedsCustomization()
-       */
-      public B needsCustomization() {
-         this.needsCustomization = Boolean.TRUE;
-         return self();
-      }
-
-      /**
-       * @see Vm#getNeedsCustomization()
-       */
-      public B notNeedsCustomization() {
-         this.needsCustomization = Boolean.FALSE;
-         return self();
-      }
-
-      @Override
-      public Vm build() {
-         Vm vm = new Vm(this);
-         return vm;
-      }
-
-      public B fromVm(Vm in) {
-         return fromAbstractVAppType(in).vAppScopedLocalId(in.getVAppScopedLocalId()).environment(in.getEnvironment()).isNeedsCustomization(in.isNeedsCustomization());
-      }
-   }
-
-   protected Vm() {
-      // for JAXB and Builders
-   }
-
-   protected Vm(Builder<?> builder) {
-      super(builder);
-      this.vAppScopedLocalId = builder.vAppScopedLocalId;
-      this.environment = builder.environment;
-      this.needsCustomization = builder.needsCustomization;
-   }
-
-   @XmlElement(name = "VAppScopedLocalId")
-   protected String vAppScopedLocalId;
-   @XmlElement(name = "Environment", namespace = "http://schemas.dmtf.org/ovf/environment/1")
-   protected EnvironmentType environment;
-   @XmlAttribute
-   protected Boolean needsCustomization;
-
-   /**
-    * Gets the value of the vAppScopedLocalId property.
-    *
-    * @return possible object is {@link String }
-    */
-   public String getVAppScopedLocalId() {
-      return vAppScopedLocalId;
-   }
-
-   /**
-    * OVF environment section
-    *
-    * @return possible object is {@link Environment }
-    */
-   public EnvironmentType getEnvironment() {
-      return environment;
-   }
-
-   /**
-    * Gets the value of the needsCustomization property.
-    *
-    * @return possible object is {@link Boolean }
-    */
-   public Boolean isNeedsCustomization() {
-      return needsCustomization;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      Vm that = Vm.class.cast(o);
-      return super.equals(that) &&
-            equal(this.vAppScopedLocalId, that.vAppScopedLocalId) && equal(this.environment, that.environment) && equal(this.needsCustomization, that.needsCustomization);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), vAppScopedLocalId, environment, needsCustomization);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string().add("vAppScopedLocalId", vAppScopedLocalId).add("environment", environment).add("needsCustomization", needsCustomization);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java
deleted file mode 100644
index 109592d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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 java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Represents a question which vSphere issued for a VM in a stuck state(WAITING_FOR_INPUT). It has a question element, a question ID
- * element, and a list of choices with at least one element.
- */
-@XmlType(name = "VmPendingQuestion")
-public class VmPendingQuestion extends Resource {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromVmPendingQuestion(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
-      private String question;
-      private String questionId;
-      private List<VmQuestionAnswerChoice> choices;
-
-      /**
-       * @see VmPendingQuestion#getQuestion()
-       */
-      public B question(String question) {
-         this.question = question;
-         return self();
-      }
-
-      /**
-       * @see VmPendingQuestion#getQuestionId()
-       */
-      public B questionId(String questionId) {
-         this.questionId = questionId;
-         return self();
-      }
-
-      /**
-       * @see VmPendingQuestion#getChoices()
-       */
-      public B choices(List<VmQuestionAnswerChoice> choices) {
-         this.choices = choices;
-         return self();
-      }
-
-      @Override
-      public VmPendingQuestion build() {
-         VmPendingQuestion vmPendingQuestion = new VmPendingQuestion(this);
-         return vmPendingQuestion;
-      }
-
-      public B fromVmPendingQuestion(VmPendingQuestion in) {
-         return fromResource(in).question(in.getQuestion()).questionId(in.getQuestionId()).choices(in.getChoices());
-      }
-   }
-
-   @XmlElement(name = "Question", required = true)
-   private String question;
-   @XmlElement(name = "QuestionId", required = true)
-   private String questionId;
-   @XmlElement(name = "Choices", required = true)
-   private List<VmQuestionAnswerChoice> choices;
-
-   protected VmPendingQuestion() {
-      // For JAXB and B use
-   }
-
-   public VmPendingQuestion(Builder<?> builder) {
-      super(builder);
-      this.question = builder.question;
-      this.questionId = builder.questionId;
-      this.choices = builder.choices;
-   }
-
-   /**
-    * Gets the value of the question property.
-    */
-   public String getQuestion() {
-      return question;
-   }
-
-   /**
-    * Gets the value of the questionId property.
-    */
-   public String getQuestionId() {
-      return questionId;
-   }
-
-   /**
-    * Gets the value of the choices property.
-    */
-   public List<VmQuestionAnswerChoice> getChoices() {
-      return choices;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      VmPendingQuestion that = VmPendingQuestion.class.cast(o);
-      return super.equals(that) &&
-            equal(this.question, that.question) && equal(this.questionId, that.questionId) && equal(this.choices, that.choices);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), question, questionId, choices);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string().add("question", question).add("questionId", questionId).add("choices", choices);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java
deleted file mode 100644
index 48a8488..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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 javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-/**
- * Represents a VM answer to a question when the VM is in a stuck
- * {@link ResourceEntity.Status#WAITING_FOR_INPUT} state.
- */
-@XmlType(name = "VmQuestionAnswer", propOrder = {
-    "choiceId",
-    "questionId"
-})
-public class VmQuestionAnswer {
-   
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   public Builder toBuilder() {
-      return builder().fromVmQuestionAnswer(this);
-   }
-
-   public static class Builder {
-      private int choiceId;
-      private String questionId;
-
-      /**
-       * @see VmQuestionAnswer#getChoiceId()
-       */
-      public Builder choiceId(int choiceId) {
-         this.choiceId = choiceId;
-         return this;
-      }
-
-      /**
-       * @see VmQuestionAnswer#getQuestionId()
-       */
-      public Builder questionId(String questionId) {
-         this.questionId = questionId;
-         return this;
-      }
-
-      public VmQuestionAnswer build() {
-         return new VmQuestionAnswer(choiceId, questionId);
-      }
-
-      public Builder fromVmQuestionAnswer(VmQuestionAnswer in) {
-         return choiceId(in.getChoiceId()).questionId(in.getQuestionId());
-      }
-   }
-
-    @XmlElement(name = "ChoiceId")
-    private int choiceId;
-    @XmlElement(name = "QuestionId", required = true)
-    private String questionId;
-
-    protected VmQuestionAnswer() {
-       // For JAXB
-    }
-
-    public VmQuestionAnswer(int choiceId, String questionId) {
-       this.choiceId = choiceId;
-       this.questionId = questionId;
-    }
-
-    /**
-     * Gets the value of the choiceId property.
-     *
-     */
-    public int getChoiceId() {
-        return choiceId;
-    }
-
-    /**
-     * Gets the value of the questionId property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getQuestionId() {
-        return questionId;
-    }
-    
-    @Override
-    public boolean equals(Object o) {
-       if (this == o)
-          return true;
-       if (o == null || getClass() != o.getClass())
-          return false;
-       VmQuestionAnswer that = VmQuestionAnswer.class.cast(o);
-       return equal(this.choiceId, that.choiceId) && equal(this.questionId, that.questionId);
-    }
-
-    @Override
-    public int hashCode() {
-       return Objects.hashCode(choiceId, questionId);
-    }
-
-    @Override
-    public String toString() {
-       return Objects.toStringHelper("").add("choiceId", choiceId).add("questionId", questionId).toString();
-    }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java
deleted file mode 100644
index dd95c97..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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 javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-/**
- * Represents a pair of ID and text of an answer choice of a VM question.
- */
-@XmlType(name = "VmQuestionAnswerChoice", propOrder = {
-    "id",
-    "text"
-})
-public class VmQuestionAnswerChoice {
-
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   public Builder toBuilder() {
-      return builder().fromVmQuestionAnswerChoice(this);
-   }
-
-   public static class Builder {
-      private int id;
-      private String text;
-
-      /**
-       * @see VmQuestionAnswer#getChoiceId()
-       */
-      public Builder id(int id) {
-         this.id = id;
-         return this;
-      }
-
-      /**
-       * @see VmQuestionAnswer#getQuestionId()
-       */
-      public Builder text(String text) {
-         this.text = text;
-         return this;
-      }
-
-      public VmQuestionAnswerChoice build() {
-         return new VmQuestionAnswerChoice(id, text);
-      }
-
-      public Builder fromVmQuestionAnswerChoice(VmQuestionAnswerChoice in) {
-         return id(in.getId()).text(in.getText());
-      }
-   }
-
-   protected VmQuestionAnswerChoice() {
-      // For JAXB
-   }
-
-   public VmQuestionAnswerChoice(int id, String text) {
-      this.id = id;
-      this.text = text;
-   }
-
-    @XmlElement(name = "Id")
-    private int id;
-    @XmlElement(name = "Text")
-    private String text;
-
-    /**
-     * Gets the value of the id property.
-     *
-     */
-    public int getId() {
-        return id;
-    }
-
-    /**
-     * Gets the value of the text property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getText() {
-        return text;
-    }
-    
-    
-    @Override
-    public boolean equals(Object o) {
-       if (this == o)
-          return true;
-       if (o == null || getClass() != o.getClass())
-          return false;
-       VmQuestionAnswerChoice that = VmQuestionAnswerChoice.class.cast(o);
-       return equal(this.id, that.id) && equal(this.text, that.text);
-    }
-
-    @Override
-    public int hashCode() {
-       return Objects.hashCode(id, text);
-    }
-
-    @Override
-    public String toString() {
-       return Objects.toStringHelper("").add("id", id).add("text", text).toString();
-    }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/Envelope.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/Envelope.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/Envelope.java
deleted file mode 100644
index c6ac48c..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/Envelope.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.dmtf;
-
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.dmtf.ovf.internal.BaseEnvelope;
-
-@XmlRootElement(name = "Envelope", namespace = OVF_NS)
-public class Envelope extends BaseEnvelope<VirtualSystem, Envelope> {
-
-   @SuppressWarnings("rawtypes")
-   public static Builder<?> builder() {
-      return new Builder();
-   }
-
-   /**
-    * {@inheritDoc}
-    */
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromEnvelope(this);
-   }
-
-   public static class Builder<B extends Builder<B>> extends BaseEnvelope.Builder<B, VirtualSystem, Envelope> {
-
-      /**
-       * {@inheritDoc}
-       */
-      @Override
-      public Envelope build() {
-         return new Envelope(this);
-      }
-   }
-
-   protected Envelope(Builder<?> builder) {
-      super(builder);
-   }
-   
-   protected Envelope() {
-      // For JaxB
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java
deleted file mode 100644
index 5c83ebf..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.dmtf;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-
-import java.net.URI;
-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.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;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * A vCloud specific {@link ResourceAllocationSettingData} extension.
- */
-@XmlRootElement(name = "Item", namespace = VCLOUD_1_5_NS)
-public class RasdItem extends ResourceAllocationSettingData {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromRasdItem(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public static class Builder<B extends Builder<B>> extends ResourceAllocationSettingData.Builder<Builder<B>>{
-
-      private URI href;
-      private String type;
-      private Set<Link> links = Sets.newLinkedHashSet();
-
-      @Override
-      @SuppressWarnings("unchecked")
-      protected B self() {
-         return (B) this;
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getType()
-       */
-      public B type(String type) {
-         this.type = type;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getHref()
-       */
-      public B href(URI href) {
-         this.href = href;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getLinks()
-       */
-      public B links(Set<Link> links) {
-         this.links = Sets.newLinkedHashSet(checkNotNull(links, "links"));
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getLinks()
-       */
-      public B link(Link link) {
-         this.links.add(checkNotNull(link, "link"));
-         return self();
-      }
-
-      @Override
-      public RasdItem build() {
-         return new RasdItem(this);
-      }
-
-      public B fromRasdItem(RasdItem in) {
-         return fromResourceAllocationSettingData(in)
-               .type(in.getType())
-               .href(in.getHref())
-               .links(in.getLinks());
-      }
-   }
-   
-   @XmlAttribute(name = "type", namespace = VCLOUD_1_5_NS)
-   private String type;
-   @XmlAttribute(name = "href", namespace = VCLOUD_1_5_NS)
-   @XmlSchemaType(name = "anyURI")
-   private URI href;
-   @XmlElement(name = "Link", namespace = VCLOUD_1_5_NS)
-   private Set<Link> links = Sets.newLinkedHashSet();
-
-   protected RasdItem(Builder<?> builder) {
-      super(builder);
-      this.type = builder.type;
-      this.href = builder.href;
-      this.links = builder.links != null && builder.links.isEmpty() ? null : builder.links;
-   }
-
-   protected RasdItem() {
-      // for JAXB
-   }
-
-   /**
-    * Contains the URI to the entity.
-    *
-    * @see ResourceType#getHref()
-    */
-   public String getType() {
-      return type;
-   }
-
-   /**
-    * Contains the type of the the entity.
-    *
-    * @see ResourceType#getType()
-    */
-   public URI getHref() {
-      return href;
-   }
-
-   /**
-    * Set of optional links to an entity or operation associated with this object.
-    *
-    * @see ResourceType#getLinks()
-    */
-   public Set<Link> getLinks() {
-      return links != null ? ImmutableSet.copyOf(links) : Sets.<Link>newLinkedHashSet();
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string()
-            .add("type", type)
-            .add("href", href)
-            .add("links", links);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), type, href, links);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null) return false;
-      if (getClass() != obj.getClass()) return false;
-
-      RasdItem that = RasdItem.class.cast(obj);
-      return super.equals(that)
-            && equal(this.type, that.type)
-            && equal(this.href, that.href)
-            && equal(this.links, that.links);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java
deleted file mode 100644
index 3c42188..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.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 java.util.Set;
-
-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;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "VirtualSystem", namespace = OVF_NS)
-public class VirtualSystem extends BaseVirtualSystem {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return builder().fromVirtualSystem(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public static class Builder<B extends Builder<B>> extends BaseVirtualSystem.Builder<B> {
-
-      private OperatingSystemSection operatingSystem;
-      private Set<VirtualHardwareSection> virtualHardwareSections = Sets.newLinkedHashSet();
-
-
-      /**
-       * @see BaseVirtualSystem#getOperatingSystemSection()
-       */
-      public B operatingSystemSection(OperatingSystemSection operatingSystem) {
-         this.operatingSystem = operatingSystem;
-         return self();
-      }
-
-      /**
-       * @see BaseVirtualSystem#getVirtualHardwareSections()
-       */
-      public B virtualHardwareSection(VirtualHardwareSection virtualHardwareSection) {
-         this.virtualHardwareSections.add(checkNotNull(virtualHardwareSection, "virtualHardwareSection"));
-         return self();
-      }
-
-      /**
-       * @see BaseVirtualSystem#getVirtualHardwareSections()
-       */
-      public B virtualHardwareSections(Iterable<? extends VirtualHardwareSection> virtualHardwareSections) {
-         this.virtualHardwareSections = Sets.newLinkedHashSet(checkNotNull(virtualHardwareSections, "virtualHardwareSections"));
-         return self();
-      }
-      
-      /**
-       * {@inheritDoc}
-       */
-      @Override
-      public VirtualSystem build() {
-         return new VirtualSystem(this);
-      }
-
-      public B fromVirtualSystem(VirtualSystem in) {
-         return fromBaseVirtualSystem(in)
-               .operatingSystemSection(in.getOperatingSystemSection())
-               .virtualHardwareSections(in.getVirtualHardwareSections());
-      }
-   }
-
-   @XmlElement(name = "OperatingSystemSection", namespace = OVF_NS)
-   private OperatingSystemSection operatingSystem;
-   @XmlElement(name = "VirtualHardwareSection", namespace = OVF_NS)
-   private Set<? extends VirtualHardwareSection> virtualHardwareSections;
-
-   private VirtualSystem(Builder<?> builder) {
-      super(builder);
-      this.operatingSystem = checkNotNull(builder.operatingSystem, "operatingSystem");
-      this.virtualHardwareSections = ImmutableSet.copyOf(checkNotNull(builder.virtualHardwareSections, "virtualHardwareSections"));
-   }
-   
-   private VirtualSystem() {
-      // for JAXB
-   }
-
-   public OperatingSystemSection getOperatingSystemSection() {
-      return operatingSystem;
-   }
-
-   /**
-    * Each VirtualSystem element may contain one or more VirtualHardwareSection elements, each of
-    * which describes the virtual virtualHardwareSections required by the virtual system.
-    */
-   public Set<? extends VirtualHardwareSection> getVirtualHardwareSections() {
-      return virtualHardwareSections;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), operatingSystem, virtualHardwareSections);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null) return false;
-      if (getClass() != obj.getClass()) return false;
-
-      VirtualSystem other = (VirtualSystem) obj;
-      return super.equals(other) 
-            && equal(operatingSystem, other.operatingSystem)
-            && equal(virtualHardwareSections, other.virtualHardwareSections);
-   }
-
-   @Override
-   protected Objects.ToStringHelper string() {
-      return super.string()
-            .add("operatingSystem", operatingSystem)
-            .add("virtualHardwareSections", virtualHardwareSections);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/package-info.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/package-info.java
deleted file mode 100644
index 38968ac..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/package-info.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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;
-

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java
deleted file mode 100644
index 7314721..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "DhcpService")
-@XmlType(propOrder = {
-      "defaultLeaseTime",
-      "maxLeaseTime",
-      "ipRange"
-})
-public class DhcpService extends NetworkService<DhcpService> {
-
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   @Override
-   public Builder toBuilder() {
-      return new Builder().fromDhcpService(this);
-   }
-
-   public static class Builder extends NetworkService.Builder<DhcpService> {
-      private int defaultLeaseTime;
-      private int maxLeaseTime;
-      private IpRange ipRange;
-
-      public Builder defaultLeaseTime(int defaultLeaseTime) {
-         this.defaultLeaseTime = defaultLeaseTime;
-         return this;
-      }
-
-      public Builder maxLeaseTime(int maxLeaseTime) {
-         this.maxLeaseTime = maxLeaseTime;
-         return this;
-      }
-
-      public Builder ipRange(IpRange ipRange) {
-         this.ipRange = ipRange;
-         return this;
-      }
-
-      @Override
-      public DhcpService build() {
-         return new DhcpService(isEnabled, defaultLeaseTime, maxLeaseTime, ipRange);
-      }
-
-      public Builder fromDhcpService(DhcpService in) {
-         return fromNetworkService(in).defaultLeaseTime(in.getDefaultLeaseTime()).maxLeaseTime(in.getMaxLeaseTime())
-               .ipRange(in.getIpRange());
-      }
-
-      public Builder fromNetworkService(NetworkService<DhcpService> in) {
-         return Builder.class.cast(super.fromNetworkServiceType(in));
-      }
-
-      @Override
-      public Builder enabled(boolean enabled) {
-         this.isEnabled = enabled;
-         return this;
-      }
-   }
-
-   @XmlElement(name = "DefaultLeaseTime")
-   private int defaultLeaseTime;
-   @XmlElement(name = "MaxLeaseTime")
-   private int maxLeaseTime;
-   @XmlElement(name = "IpRange")
-   private IpRange ipRange;
-
-   private DhcpService(boolean enabled, int defaultLeaseTime, int maxLeaseTime, IpRange ipRange) {
-      super(enabled);
-      this.defaultLeaseTime = defaultLeaseTime;
-      this.maxLeaseTime = maxLeaseTime;
-      this.ipRange = ipRange;
-   }
-
-   private DhcpService() {
-      // for JAXB
-   }
-
-   /**
-    * @return default lease in seconds for DHCP addresses.
-    */
-   public int getDefaultLeaseTime() {
-      return defaultLeaseTime;
-   }
-
-   /**
-    * @return Max lease in seconds for DHCP addresses.
-    */
-   public int getMaxLeaseTime() {
-      return maxLeaseTime;
-   }
-
-   /**
-    * @return IP range for DHCP addresses.
-    */
-   public IpRange getIpRange() {
-      return ipRange;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      DhcpService that = DhcpService.class.cast(o);
-      return super.equals(that)
-            && equal(defaultLeaseTime, that.defaultLeaseTime)
-            && equal(maxLeaseTime, that.maxLeaseTime)
-            && equal(ipRange, that.ipRange);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), defaultLeaseTime, maxLeaseTime, ipRange);
-   }
-
-   @Override
-   protected Objects.ToStringHelper string() {
-      return super.string().add("defaultLeastTime", defaultLeaseTime).add("maxLeaseTime", maxLeaseTime).add("ipRange", ipRange);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java
deleted file mode 100644
index 9800a03..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.network;
-
-import static com.google.common.base.Objects.equal;
-
-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;
-
-@XmlRootElement(name = "ExternalNetwork")
-@XmlType(propOrder = {
-    "providerInfo"
-})
-public class ExternalNetwork extends Network {
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromExternalNetwork(this);
-   }
-   
-   public abstract static class Builder<T extends Builder<T>> extends Network.Builder<T> {
-      private String providerInfo;
-
-      /**
-       * @see ExternalNetwork#getProviderInfo()
-       */
-      public T providerInfo(String providerInfo) {
-         this.providerInfo = providerInfo;
-         return self();
-      }
-
-      @Override
-      public ExternalNetwork build() {
-         return new ExternalNetwork(this);
-      }
-      
-      public T fromExternalNetwork(ExternalNetwork in) {
-         return fromNetwork(in)
-            .providerInfo(in.getProviderInfo());
-      }
-   }
-   
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private ExternalNetwork() {
-      // For JAXB
-   }
-
-   private ExternalNetwork(Builder<?> b) {
-      super(b);
-      providerInfo = b.providerInfo;
-   }
-
-    @XmlElement(name = "ProviderInfo", required = true)
-    protected String providerInfo;
-
-    /**
-     * Gets the value of the providerInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getProviderInfo() {
-        return providerInfo;
-    }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-          return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      ExternalNetwork that = ExternalNetwork.class.cast(o);
-      return super.equals(that) && equal(providerInfo, that.providerInfo);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), providerInfo);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string()
-            .add("providerInfo", providerInfo);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java
deleted file mode 100644
index 13b2e7c..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlType(name = "FirewallRule", propOrder = {
-      "isEnabled",
-      "description",
-      "policy",
-      "protocols",
-      "port",
-      "destinationIp",
-      "sourcePort",
-      "sourceIp",
-      "direction",
-      "enableLogging"
-})
-public class FirewallRule {
-
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   public Builder toBuilder() {
-      return new Builder().fromFirewallRule(this);
-   }
-
-   public static class Builder {
-
-      private Boolean isEnabled;
-      private String description;
-      private String policy;
-      private FirewallRuleProtocols protocols;
-      private Integer port;
-      private String destinationIp;
-      private Integer sourcePort;
-      private String sourceIp;
-      private String direction;
-      private Boolean enableLogging;
-
-      /**
-       * @see FirewallRule#isEnabled()
-       */
-      public Builder isEnabled(Boolean isEnabled) {
-         this.isEnabled = isEnabled;
-         return this;
-      }
-
-      /**
-       * @see FirewallRule#getDescription()
-       */
-      public Builder description(String description) {
-         this.description = description;
-         return this;
-      }
-
-      /**
-       * @see FirewallRule#getPolicy()
-       */
-      public Builder policy(String policy) {
-         this.policy = policy;
-         return this;
-      }
-
-      /**
-       * @see FirewallRule#getProtocols()
-       */
-      public Builder protocols(FirewallRuleProtocols protocols) {
-         this.protocols = protocols;
-         return this;
-      }
-
-      /**
-       * @see FirewallRule#getPort()
-       */
-      public Builder port(int port) {
-         this.port = port;
-         return this;
-      }
-
-      /**
-       * @see FirewallRule#getDestinationIp()
-       */
-      public Builder destinationIp(String destinationIp) {
-         this.destinationIp = destinationIp;
-         return this;
-      }
-
-      /**
-       * @see FirewallRule#getSourcePort()
-       */
-      public Builder sourcePort(int sourcePort) {
-         this.sourcePort = sourcePort;
-         return this;
-      }
-
-      /**
-       * @see FirewallRule#getSourceIp()
-       */
-      public Builder sourceIp(String sourceIp) {
-         this.sourceIp = sourceIp;
-         return this;
-      }
-
-      /**
-       * @see FirewallRule#getDirection()
-       */
-      public Builder direction(String direction) {
-         this.direction = direction;
-         return this;
-      }
-
-      /**
-       * @see FirewallRule#isEnableLogging()
-       */
-      public Builder enableLogging(Boolean enableLogging) {
-         this.enableLogging = enableLogging;
-         return this;
-      }
-
-      public FirewallRule build() {
-         return new FirewallRule(
-               isEnabled, description, policy, protocols, port, destinationIp, sourcePort, sourceIp, direction, enableLogging);
-      }
-
-      public Builder fromFirewallRule(FirewallRule in) {
-         return isEnabled(in.isEnabled())
-               .description(in.getDescription())
-               .policy(in.getPolicy())
-               .protocols(in.getProtocols())
-               .port(in.getPort())
-               .destinationIp(in.getDestinationIp())
-               .sourcePort(in.getSourcePort())
-               .sourceIp(in.getSourceIp())
-               .direction(in.getDirection())
-               .enableLogging(in.isEnableLogging());
-      }
-   }
-
-   private FirewallRule(Boolean enabled, String description, String policy, FirewallRuleProtocols protocols, Integer port,
-                       String destinationIp, Integer sourcePort, String sourceIp, String direction, Boolean enableLogging) {
-      isEnabled = enabled;
-      this.description = description;
-      this.policy = policy;
-      this.protocols = protocols;
-      this.port = port;
-      this.destinationIp = destinationIp;
-      this.sourcePort = sourcePort;
-      this.sourceIp = sourceIp;
-      this.direction = direction;
-      this.enableLogging = enableLogging;
-   }
-
-   private FirewallRule() {
-      // For JAXB
-   }
-
-   @XmlElement(name = "IsEnabled")
-   protected Boolean isEnabled;
-   @XmlElement(name = "Description")
-   protected String description;
-   @XmlElement(name = "Policy")
-   protected String policy;
-   @XmlElement(name = "Protocols")
-   protected FirewallRuleProtocols protocols;
-   @XmlElement(name = "Port")
-   protected Integer port;
-   @XmlElement(name = "DestinationIp", required = true)
-   protected String destinationIp;
-   @XmlElement(name = "SourcePort")
-   protected Integer sourcePort;
-   @XmlElement(name = "SourceIp", required = true)
-   protected String sourceIp;
-   @XmlElement(name = "Direction")
-   protected String direction;
-   @XmlElement(name = "EnableLogging")
-   protected Boolean enableLogging;
-
-   /**
-    * Gets the value of the isEnabled property.
-    *
-    * @return possible object is
-    *         {@link Boolean }
-    */
-   public Boolean isEnabled() {
-      return isEnabled;
-   }
-
-   /**
-    * Gets the value of the description property.
-    *
-    * @return possible object is
-    *         {@link String }
-    */
-   public String getDescription() {
-      return description;
-   }
-
-   /**
-    * Gets the value of the policy property.
-    *
-    * @return possible object is
-    *         {@link String }
-    */
-   public String getPolicy() {
-      return policy;
-   }
-
-   /**
-    * Gets the value of the protocols property.
-    *
-    * @return possible object is
-    *         {@link FirewallRuleProtocols }
-    */
-   public FirewallRuleProtocols getProtocols() {
-      return protocols;
-   }
-
-   /**
-    * Gets the value of the port property.
-    */
-   public int getPort() {
-      return port;
-   }
-
-   /**
-    * Gets the value of the destinationIp property.
-    *
-    * @return possible object is
-    *         {@link String }
-    */
-   public String getDestinationIp() {
-      return destinationIp;
-   }
-
-   /**
-    * Gets the value of the sourcePort property.
-    */
-   public int getSourcePort() {
-      return sourcePort;
-   }
-
-   /**
-    * Gets the value of the sourceIp property.
-    *
-    * @return possible object is
-    *         {@link String }
-    */
-   public String getSourceIp() {
-      return sourceIp;
-   }
-
-   /**
-    * Gets the value of the direction property.
-    *
-    * @return possible object is
-    *         {@link String }
-    */
-   public String getDirection() {
-      return direction;
-   }
-
-   /**
-    * Gets the value of the enableLogging property.
-    *
-    * @return possible object is
-    *         {@link Boolean }
-    */
-   public Boolean isEnableLogging() {
-      return enableLogging;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      FirewallRule that = FirewallRule.class.cast(o);
-      return equal(isEnabled, that.isEnabled) &&
-            equal(description, that.description) &&
-            equal(policy, that.policy) &&
-            equal(protocols, that.protocols) &&
-            equal(port, that.port) &&
-            equal(destinationIp, that.destinationIp) &&
-            equal(sourcePort, that.sourcePort) &&
-            equal(sourceIp, that.sourceIp) &&
-            equal(direction, that.direction) &&
-            equal(enableLogging, that.enableLogging);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(isEnabled,
-            description,
-            policy,
-            protocols,
-            port,
-            destinationIp,
-            sourcePort,
-            sourceIp,
-            direction,
-            enableLogging);
-   }
-
-   @Override
-   public String toString() {
-      return Objects.toStringHelper("")
-            .add("isEnabled", isEnabled)
-            .add("description", description)
-            .add("policy", policy)
-            .add("protocols", protocols)
-            .add("port", port)
-            .add("destinationIp", destinationIp)
-            .add("sourcePort", sourcePort)
-            .add("sourceIp", sourceIp)
-            .add("direction", direction)
-            .add("enableLogging", enableLogging).toString();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java
deleted file mode 100644
index ade1e18..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlType(propOrder = {
-      "tcp",
-      "udp",
-      "icmp",
-      "any"
-})
-public class FirewallRuleProtocols {
-
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   public Builder toBuilder() {
-      return new Builder().fromProtocols(this);
-   }
-
-   public static class Builder {
-      private Boolean tcp;
-      private Boolean udp;
-      private Boolean icmp;
-      private Boolean any;
-
-      public Builder tcp(Boolean tcp) {
-         this.tcp = tcp;
-         return this;
-      }
-
-      public Builder udp(Boolean udp) {
-         this.udp = udp;
-         return this;
-      }
-
-      public Builder icmp(Boolean icmp) {
-         this.icmp = icmp;
-         return this;
-      }
-
-      public Builder any(Boolean any) {
-         this.any = any;
-         return this;
-      }
-
-      public Builder fromProtocols(FirewallRuleProtocols in) {
-         return tcp(in.isTcp()).udp(in.isUdp()).icmp(in.isIcmp()).any(in.isAny());
-      }
-
-      public FirewallRuleProtocols build() {
-         return new FirewallRuleProtocols(tcp, udp, icmp, any);
-      }
-   }
-
-   @XmlElement(name = "Tcp")
-   private Boolean tcp;
-   @XmlElement(name = "Udp")
-   private Boolean udp;
-   @XmlElement(name = "Icmp")
-   private Boolean icmp;
-   @XmlElement(name = "Any")
-   private Boolean any;
-
-   private FirewallRuleProtocols(Boolean tcp, Boolean udp, Boolean icmp, Boolean any) {
-      this.tcp = tcp;
-      this.udp = udp;
-      this.icmp = icmp;
-      this.any = any;
-   }
-
-   private FirewallRuleProtocols() {
-      // for JAXB
-   }
-
-   /**
-    * Gets the value of the tcp property.
-    *
-    * @return possible object is
-    *         {@link Boolean }
-    */
-   public Boolean isTcp() {
-      return tcp;
-   }
-
-   /**
-    * Gets the value of the udp property.
-    *
-    * @return possible object is
-    *         {@link Boolean }
-    */
-   public Boolean isUdp() {
-      return udp;
-   }
-
-   /**
-    * Gets the value of the icmp property.
-    *
-    * @return possible object is
-    *         {@link Boolean }
-    */
-   public Boolean isIcmp() {
-      return icmp;
-   }
-
-   /**
-    * Gets the value of the any property.
-    *
-    * @return possible object is
-    *         {@link Boolean }
-    */
-   public Boolean isAny() {
-      return any;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      FirewallRuleProtocols that = FirewallRuleProtocols.class.cast(o);
-      return equal(tcp, that.tcp) &&
-            equal(udp, that.udp) &&
-            equal(icmp, that.icmp) &&
-            equal(any, that.any);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(tcp, udp, icmp, any);
-   }
-
-   @Override
-   public String toString() {
-      return Objects.toStringHelper("")
-            .add("tcp", tcp)
-            .add("udp", udp)
-            .add("icmp", icmp)
-            .add("any", any).toString();
-   }
-}