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:37 UTC

[30/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/dmtf/ovf/DiskSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
deleted file mode 100644
index 5d17fc0..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.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.dmtf.ovf;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-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.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * A DiskSection describes meta-information about virtual disks in the OVF package. Virtual disks
- * and their metadata are described outside the virtual hardware to facilitate sharing between
- * virtual machines within an OVF package.
- */
-@XmlRootElement(name = "DiskSection")
-@XmlType(propOrder = {
-      "disks"
-})
-public class DiskSection extends SectionType {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return builder().fromDiskSection(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-      private Set<Disk> disks = Sets.newLinkedHashSet();
-
-      /**
-       * @see DiskSection#getDisks
-       */
-      public B disk(Disk disk) {
-         this.disks.add(checkNotNull(disk, "disk"));
-         return self();
-      }
-
-      /**
-       * @see DiskSection#getDisks
-       */
-      public B disks(Iterable<Disk> disks) {
-         this.disks = ImmutableSet.<Disk>copyOf(checkNotNull(disks, "disks"));
-         return self();
-      }
-
-      /**
-       * {@inheritDoc}
-       */
-      @Override
-      public DiskSection build() {
-         return new DiskSection(this);
-      }
-
-      public B fromDiskSection(DiskSection in) {
-         return disks(in.getDisks()).info(in.getInfo());
-      }
-  }
-
-   @XmlElement(name = "Disk")
-   private Set<Disk> disks;
-
-   protected DiskSection(Builder<?> builder) {
-      super(builder);
-      this.disks = ImmutableSet.<Disk>copyOf(checkNotNull(builder.disks, "disks"));
-   }
-   
-   protected DiskSection() {
-      // for JAXB
-   }   
-
-   /**
-    * All disks referred to from Connection elements in all {@link VirtualHardwareSection} elements
-    * shall be defined in the DiskSection.
-    *
-    * @return
-    */
-   public Set<Disk> getDisks() {
-      return disks;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), disks);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null) return false;
-      if (getClass() != obj.getClass()) return false;
-
-      DiskSection other = (DiskSection) obj;
-      return super.equals(other) && Objects.equal(disks, other.disks);
-   }
-
-   @Override
-   protected Objects.ToStringHelper string() {
-      return super.string().add("disks", disks);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java
deleted file mode 100644
index 8901a0d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java
+++ /dev/null
@@ -1,192 +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.dmtf.ovf;
-
-import static com.google.common.base.Objects.equal;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.Maps;
-
-/**
- * Java class for anonymous complex type.
- *
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="order" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       &lt;attribute name="startDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
- *       &lt;attribute name="waitingForGuest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *       &lt;attribute name="stopDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
- *       &lt;attribute name="startAction" type="{http://www.w3.org/2001/XMLSchema}string" default="powerOn" />
- *       &lt;attribute name="stopAction" type="{http://www.w3.org/2001/XMLSchema}string" default="powerOff" />
- *       &lt;anyAttribute processContents='lax'/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlType
-@XmlSeeAlso({
-    StartupSectionItem.class
-})
-public class Item {
-   
-   // TODO Builder
-
-    @XmlAttribute(required = true)
-    protected String id;
-    @XmlAttribute(required = true)
-    @XmlSchemaType(name = "unsignedShort")
-    protected int order;
-    @XmlAttribute
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer startDelay;
-    @XmlAttribute
-    protected Boolean waitingForGuest;
-    @XmlAttribute
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer stopDelay;
-    @XmlAttribute
-    protected String startAction;
-    @XmlAttribute
-    protected String stopAction;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = Maps.newHashMap();
-
-    /**
-     * Gets the value of the id property.
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Gets the value of the order property.
-     */
-    public int getOrder() {
-        return order;
-    }
-
-    /**
-     * Gets the value of the startDelay property.
-     */
-    public int getStartDelay() {
-        if (startDelay == null) {
-            return  0;
-        } else {
-            return startDelay;
-        }
-    }
-
-    /**
-     * Gets the value of the waitingForGuest property.
-     */
-    public boolean isWaitingForGuest() {
-        if (waitingForGuest == null) {
-            return false;
-        } else {
-            return waitingForGuest;
-        }
-    }
-
-    /**
-     * Gets the value of the stopDelay property.
-     */
-    public int getStopDelay() {
-        if (stopDelay == null) {
-            return  0;
-        } else {
-            return stopDelay;
-        }
-    }
-
-    /**
-     * Gets the value of the startAction property.
-     */
-    public String getStartAction() {
-        if (startAction == null) {
-            return "powerOn";
-        } else {
-            return startAction;
-        }
-    }
-
-    /**
-     * Gets the value of the stopAction property.
-     */
-    public String getStopAction() {
-        if (stopAction == null) {
-            return "powerOff";
-        } else {
-            return stopAction;
-        }
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-    @Override
-    public int hashCode() {
-       return Objects.hashCode(id, order, startDelay, waitingForGuest, stopDelay, startAction, stopAction);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-       if (this == obj)
-          return true;
-       if (obj == null)
-          return false;
-       if (getClass() != obj.getClass())
-          return false;
-       Item that = Item.class.cast(obj);
-       return equal(this.id, that.id) &&
-             equal(this.order, that.order) &&
-             equal(this.startDelay, that.startDelay) &&
-             equal(this.waitingForGuest, that.waitingForGuest) &&
-             equal(this.stopDelay, that.stopDelay) &&
-             equal(this.startAction, that.startAction) &&
-             equal(this.stopAction, that.stopAction);
-    }
-
-    @Override
-    public String toString() {
-       return Objects.toStringHelper("")
-             .add("id", id)
-             .add("order", order)
-             .add("startDelay", startDelay)
-             .add("waitingForGuest", waitingForGuest)
-             .add("stopDelay", stopDelay)
-             .add("startAction", startAction)
-             .add("stopAction", stopAction)
-             .toString();
-    }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
deleted file mode 100644
index ef6b29b..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
+++ /dev/null
@@ -1,141 +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.dmtf.ovf;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-
-import com.google.common.base.Objects;
-
-
-/**
- * Type for localizable string.
- *
- * Default string value
- * 
- * <pre>
- * &lt;complexType name="Msg_Type" /&gt;
- * </pre>
- */
-@XmlType(name = "Msg_Type")
-public class MsgType {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return builder().fromMsgType(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-
-   public abstract static class Builder<B extends Builder<B>> {
-
-      protected String value;
-      protected String msgid;
-
-      @SuppressWarnings("unchecked")
-      protected B self() {
-         return (B) this;
-      }
-
-      /**
-       * @see MsgType#getValue()
-       */
-      public B value(String value) {
-         this.value = value;
-         return self();
-      }
-
-      /**
-       * @see MsgType#getMsgid()
-       */
-      public B msgid(String msgid) {
-         this.msgid = msgid;
-         return self();
-      }
-
-      public MsgType build() {
-         return new MsgType(this);
-      }
-
-      public B fromMsgType(MsgType in) {
-         return value(in.getValue()).msgid(in.getMsgid());
-      }
-   }
-
-    @XmlValue
-    protected String value;
-    @XmlAttribute
-    protected String msgid;
-
-    private MsgType() {
-       // JAXB
-    }
-
-    private MsgType(Builder<?> builder) {
-       this.value = builder.value;
-       this.msgid = builder.msgid;
-    }
-
-    /**
-     * Gets the value of the value property.
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Gets the value of the msgid property.
-     */
-    public String getMsgid() {
-        if (msgid == null) {
-            return "";
-        } else {
-            return msgid;
-        }
-    }
-
-    @Override
-    public int hashCode() {
-       return Objects.hashCode(value, msgid);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-       if (this == obj)
-          return true;
-       if (obj == null)
-          return false;
-       if (getClass() != obj.getClass())
-          return false;
-       MsgType that = MsgType.class.cast(obj);
-       return equal(this.value, that.value) &&
-             equal(this.msgid, that.msgid);
-    }
-
-    @Override
-    public String toString() {
-       return Objects.toStringHelper("")
-             .add("value", value).add("msgid", msgid).toString();
-    }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Network.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Network.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Network.java
deleted file mode 100644
index 0bf0a9d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Network.java
+++ /dev/null
@@ -1,111 +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.dmtf.ovf;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "Network")
-public class Network {
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   public static class Builder {
-      protected String name;
-      protected String description;
-
-      /**
-       * @see Network#getName
-       */
-      public Builder name(String name) {
-         this.name = name;
-         return this;
-      }
-
-      /**
-       * @see Network#getDescription
-       */
-      public Builder description(String description) {
-         this.description = description;
-         return this;
-      }
-
-      public Network build() {
-         return new Network(name, description);
-      }
-
-      public Builder fromNetwork(Network in) {
-         return name(in.getName()).description(in.getDescription());
-      }
-   }
-
-   private String name;
-   private String description;
-
-   protected Network(String name, String description) {
-      this.name = name;
-      this.description = description;
-   }
-   
-   protected Network() {
-      // for JAXB
-   }
-
-   @Override
-   public int hashCode() {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((description == null) ? 0 : description.hashCode());
-      result = prime * result + ((name == null) ? 0 : name.hashCode());
-      return result;
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      Network other = (Network) obj;
-      if (description == null) {
-         if (other.description != null)
-            return false;
-      } else if (!description.equals(other.description))
-         return false;
-      if (name == null) {
-         if (other.name != null)
-            return false;
-      } else if (!name.equals(other.name))
-         return false;
-      return true;
-   }
-
-   @Override
-   public String toString() {
-      return "[name=" + name + ", description=" + description + "]";
-   }
-
-   public String getName() {
-      return name;
-   }
-
-   public String getDescription() {
-      return description;
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
deleted file mode 100644
index a9df5d0..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
+++ /dev/null
@@ -1,123 +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.dmtf.ovf;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * The NetworkSection element shall list all logical networks used in the OVF package.
- */
-@XmlRootElement(name = "NetworkSection")
-@XmlType(name = "NetworkSection_Type")
-public class NetworkSection extends SectionType {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return builder().fromNetworkSection(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-      protected Set<Network> networks = Sets.newLinkedHashSet();
-
-      /**
-       * @see NetworkSection#getNetworks
-       */
-      public B network(Network network) {
-         this.networks.add(checkNotNull(network, "network"));
-         return self();
-      }
-
-      /**
-       * @see NetworkSection#getNetworks
-       */
-      public B networks(Iterable<Network> networks) {
-         this.networks = ImmutableSet.<Network> copyOf(checkNotNull(networks, "networks"));
-         return self();
-      }
-
-      /**
-       * {@inheritDoc}
-       */
-      @Override
-      public NetworkSection build() {
-         return new NetworkSection(this);
-      }
-
-      public B fromNetworkSection(NetworkSection in) {
-         return networks(in.getNetworks()).info(in.getInfo());
-      }
-   }
-
-   private Set<Network> networks;
-
-   private NetworkSection(Builder<?> builder) {
-      super(builder);
-      this.networks = ImmutableSet.copyOf(checkNotNull(networks, "networks"));
-   }
-   
-   private NetworkSection() {
-      // for JAXB
-   }
-
-   /**
-    * All networks referred to from Connection elements in all {@link VirtualHardwareSection}
-    * elements shall be defined in the NetworkSection.
-    */
-   public Set<Network> getNetworks() {
-      return networks;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), networks);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      NetworkSection other = (NetworkSection) obj;
-      return super.equals(other)
-            && Objects.equal(networks, other.networks);
-   }
-
-   @Override
-   protected Objects.ToStringHelper string() {
-      return super.string()
-            .add("networks", networks);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
deleted file mode 100644
index dde69ce..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
+++ /dev/null
@@ -1,155 +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.dmtf.ovf;
-
-import static com.google.common.base.Objects.equal;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
-import com.google.common.base.Objects;
-
-/**
- * An OperatingSystemSection specifies the operating system installed on a virtual machine.
- */
-public class OperatingSystemSection extends SectionType {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return builder().fromOperatingSystemSection(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
-      private int id;
-      private String description;
-      private String version;
-
-      /**
-       * @see OperatingSystemSection#getId()
-       */
-      public B id(int id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see OperatingSystemSection#getVersion()
-       */
-      public B version(String version) {
-         this.version = version;
-         return self();
-      }
-
-      /**
-       * @see OperatingSystemSection#getDescription
-       */
-      public B description(String description) {
-         this.description = description;
-         return self();
-      }
-
-      /**
-       * {@inheritDoc}
-       */
-      @Override
-      public OperatingSystemSection build() {
-         return new OperatingSystemSection(this);
-      }
-
-      public B fromOperatingSystemSection(OperatingSystemSection in) {
-         return fromSectionType(in)
-               .id(in.getId())
-               .version(in.getVersion())
-               .description(in.getDescription());
-      }
-   }
-
-   @XmlAttribute(namespace = OVF_NS, required = true)
-   protected int id;
-   @XmlAttribute(namespace = OVF_NS)
-   protected String version;
-   @XmlElement(name = "Description")
-   protected String description;
-
-   public OperatingSystemSection(Builder<?> builder) {
-      super(builder);
-      this.id = builder.id;
-      this.description = builder.description;
-      this.version = builder.version;
-   }
-
-   protected OperatingSystemSection() {
-      // For Builders and JAXB
-   }
-
-   /**
-    * Gets the OVF id
-    *
-    * @see org.jclouds.vcloud.director.v1_5.domain.cim.OSType#getCode()
-    */
-   public int getId() {
-      return id;
-   }
-
-   /**
-    * Gets the version
-    */
-   public String getVersion() {
-      return version;
-   }
-
-   /**
-    * Gets the description or null
-    */
-   public String getDescription() {
-      return description;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), id, version, description);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null) return false;
-      if (getClass() != obj.getClass()) return false;
-      
-      OperatingSystemSection that = (OperatingSystemSection) obj;
-      return super.equals(that)
-            && equal(this.id, that.id)
-            && equal(this.version, that.version)
-            && equal(this.description, that.description);
-   }
-
-   @Override
-   protected Objects.ToStringHelper string() {
-      return super.string()
-            .add("id", id)
-            .add("version", version)
-            .add("description", description);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
deleted file mode 100644
index 8b4c5d6..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
+++ /dev/null
@@ -1,299 +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.dmtf.ovf;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.cim.CimString;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * The ProductSection element specifies product-information for an appliance, such as product name,
- * version, and vendor.
- */
-@XmlRootElement(name = "ProductSection")
-@XmlType(name = "ProductSection_Type")
-public class ProductSection extends SectionType {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return builder().fromProductSection(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
-      private MsgType product;
-      private MsgType vendor;
-      private CimString version;
-      private CimString fullVersion;
-      private CimString productUrl;
-      private CimString vendorUrl;
-      private CimString appUrl;
-      protected Set<ProductSectionProperty> properties = Sets.newLinkedHashSet();
-
-      @Override
-      @SuppressWarnings("unchecked")
-      protected B self() {
-         return (B) this;
-      }
-
-      /**
-       * @see ProductSection#getProduct()
-       */
-      public B product(MsgType product) {
-         this.product = product;
-         return self();
-      }
-
-      /**
-       * @see ProductSection#getVendor()
-       */
-      public B vendor(MsgType vendor) {
-         this.vendor = vendor;
-         return self();
-      }
-
-      /**
-       * @see ProductSection#getVersion()
-       */
-      public B version(CimString version) {
-         this.version = version;
-         return self();
-      }
-
-      /**
-       * @see ProductSection#geFullVersion()
-       */
-      public B fullVersion(CimString fullVersion) {
-         this.fullVersion = fullVersion;
-         return self();
-      }
-
-      /**
-       * @see ProductSection#getProductUrl()
-       */
-      public B productUrl(CimString productUrl) {
-         this.productUrl = productUrl;
-         return self();
-      }
-
-      /**
-       * @see ProductSection#getProductUrl()
-       */
-      public B productUrl(String productUrl) {
-         this.productUrl = new CimString(productUrl);
-         return self();
-      }
-
-      /**
-       * @see ProductSection#getVendorUrl()
-       */
-      public B vendorUrl(CimString vendorUrl) {
-         this.vendorUrl = vendorUrl;
-         return self();
-      }
-
-      /**
-       * @see ProductSection#getAppUrl()
-       */
-      public B appUrl(CimString appUrl) {
-         this.appUrl = appUrl;
-         return self();
-      }
-
-      /**
-       * @see ProductSection#getProperties()
-       */
-      public B property(ProductSectionProperty property) {
-         this.properties.add(checkNotNull(property, "property"));
-         return self();
-      }
-
-      /**
-       * @see ProductSection#getProperties
-       */
-      public B properties(Iterable<ProductSectionProperty> properties) {
-         this.properties = ImmutableSet.copyOf(checkNotNull(properties, "properties"));
-         return self();
-      }
-      
-      /**
-       * {@inheritDoc}
-       */
-      @Override
-      public ProductSection build() {
-         return new ProductSection(this);
-      }
-
-      public B fromProductSection(ProductSection in) {
-         return fromSectionType(in)
-               .product(in.getProduct())
-               .vendor(in.getVendor())
-               .version(in.getVersion())
-               .fullVersion(in.getFullVersion())
-               .productUrl(in.getProductUrl())
-               .vendorUrl(in.getVendorUrl())
-               .appUrl(in.getAppUrl())
-               .properties(Sets.newLinkedHashSet(in.getProperties()));
-      }
-   }
-
-   private ProductSection(Builder<?> builder) {
-      super(builder);
-      this.product = builder.product;
-      this.vendor = builder.vendor;
-      this.version = builder.version;
-      this.fullVersion = builder.fullVersion;
-      this.productUrl = builder.productUrl;
-      this.vendorUrl = builder.vendorUrl;
-      this.appUrl = builder.appUrl;
-      this.properties = builder.properties != null ? ImmutableSet.copyOf(checkNotNull(builder.properties, "properties")) : ImmutableSet.<ProductSectionProperty>of();
-   }
-   
-   private ProductSection() {
-      // For JAXB
-   }
-
-   @XmlElement(name = "Product")
-   private MsgType product;
-   @XmlElement(name = "Vendor")
-   private MsgType vendor;
-   @XmlElement(name = "Version", namespace = CIM_NS)
-   private CimString version;
-   @XmlElement(name = "FullVersion", namespace = CIM_NS)
-   private CimString fullVersion;
-   @XmlElement(name = "ProductUrl", namespace = CIM_NS)
-   private CimString productUrl;
-   @XmlElement(name = "VendorUrl", namespace = CIM_NS)
-   private CimString vendorUrl;
-   @XmlElement(name = "AppUrl", namespace = CIM_NS)
-   private CimString appUrl;
-   @XmlElement(name = "Property")
-   private Set<ProductSectionProperty> properties = Sets.newLinkedHashSet();
-
-   /**
-    * Name of product.
-    */
-   public MsgType getProduct() {
-      return product;
-   }
-
-   /**
-    * Name of product vendor.
-    */
-   public MsgType getVendor() {
-      return vendor;
-   }
-
-   /**
-    * Product version, short form.
-    */
-   public CimString getVersion() {
-      return version;
-   }
-
-   /**
-    * Product version, long form.
-    */
-   public CimString getFullVersion() {
-      return fullVersion;
-   }
-
-   /**
-    * URL resolving to product description.
-    */
-   public CimString getProductUrl() {
-      return productUrl;
-   }
-
-   /**
-    * URL resolving to vendor description.
-    */
-   public CimString getVendorUrl() {
-      return vendorUrl;
-   }
-
-   /**
-    * Experimental: URL resolving to deployed product instance.
-    */
-   public CimString getAppUrl() {
-      return appUrl;
-   }
-
-   // TODO Set<Icon>
-   
-   /**
-    * Properties for application-level customization.
-    */
-   public Set<ProductSectionProperty> getProperties() {
-      return properties;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), product, vendor, version, fullVersion, productUrl, vendorUrl, appUrl, properties);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (!super.equals(obj)) return false;
-      if (getClass() != obj.getClass()) return false;
-
-      ProductSection that = ProductSection.class.cast(obj);
-      return super.equals(that) &&
-            equal(this.product, that.product) &&
-            equal(this.vendor, that.vendor) &&
-            equal(this.version, that.version) &&
-            equal(this.fullVersion, that.fullVersion) &&
-            equal(this.productUrl, that.productUrl) &&
-            equal(this.vendorUrl, that.vendorUrl) &&
-            equal(this.appUrl, that.appUrl) &&
-            equal(this.properties, that.properties);
-   }
-
-   @Override
-   protected Objects.ToStringHelper string() {
-      return super.string()
-            .add("product", product)
-            .add("vendor", vendor)
-            .add("version", version)
-            .add("fullVersion", fullVersion)
-            .add("productUrl", productUrl)
-            .add("vendorUrl", vendorUrl)
-            .add("appUrl", appUrl)
-            .add("properties", properties);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSectionProperty.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSectionProperty.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSectionProperty.java
deleted file mode 100644
index 318a2bb..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSectionProperty.java
+++ /dev/null
@@ -1,34 +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.dmtf.ovf;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Property element
- * 
- * <pre>
- * &lt;element name="Property" /&gt;
- * </pre>
- */
-@XmlType(name = "")
-@XmlRootElement(name = "Property")
-public class ProductSectionProperty extends Property {
-   // TODO hashCode, equals, toString
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java
deleted file mode 100644
index c404694..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java
+++ /dev/null
@@ -1,301 +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.dmtf.ovf;
-
-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.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.Objects;
-import com.google.common.collect.Sets;
-
-@XmlType(name = "Property")
-@XmlSeeAlso({ ProductSectionProperty.class })
-public class Property {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return builder().fromProperty(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-
-   public abstract static class Builder<B extends Builder<B>> {
-
-      protected String key;
-      protected Set<PropertyConfigurationValueType> values = Sets.newLinkedHashSet();
-      protected MsgType label;
-      protected MsgType description;
-      protected String type;
-      protected String qualifiers;
-      protected Boolean userConfigurable;
-      protected String defaultValue = "";
-
-      @SuppressWarnings("unchecked")
-      protected B self() {
-         return (B) this;
-      }
-
-      /**
-       * @see Property#getKey()
-       */
-      public B key(String key) {
-         this.key = key;
-         return self();
-      }
-
-      /**
-       * @see Property#getValues()
-       */
-      public B values(Set<PropertyConfigurationValueType> values) {
-         this.values = checkNotNull(values, "values");
-         return self();
-      }
-
-      /**
-       * @see Property#getValues()
-       */
-      public B value(PropertyConfigurationValueType value) {
-         this.values.add(checkNotNull(value, "value"));
-         return self();
-      }
-
-      /**
-       * @see Property#getLabel()
-       */
-      public B label(MsgType label) {
-         this.label = label;
-         return self();
-      }
-
-      /**
-       * @see Property#getDescription()
-       */
-      public B description(MsgType description) {
-         this.description = description;
-         return self();
-      }
-
-      /**
-       * @see Property#getType()
-       */
-      public B type(String type) {
-         this.type = type;
-         return self();
-      }
-
-      /**
-       * @see Property#getQualifiers()
-       */
-      public B qualifiers(String qualifiers) {
-         this.qualifiers = qualifiers;
-         return self();
-      }
-
-      /**
-       * @see Property#getQualifiers()
-       */
-      public B qualifiers(Iterable<String> qualifiers) {
-         this.qualifiers = Joiner.on(',').join(qualifiers);
-         return self();
-      }
-
-      /**
-       * @see Property#getQualifiers()
-       */
-      public B qualifiers(String...qualifiers) {
-         this.qualifiers = Joiner.on(',').join(qualifiers);
-         return self();
-      }
-
-      /**
-       * @see Property#isUserConfigurable()
-       */
-      public B isUserConfigurable(Boolean userConfigurable) {
-         this.userConfigurable = userConfigurable;
-         return self();
-      }
-
-      /**
-       * @see Property#isUserConfigurable()
-       */
-      public B userConfigurable() {
-         this.userConfigurable = Boolean.TRUE;
-         return self();
-      }
-
-      /**
-       * @see Property#isUserConfigurable()
-       */
-      public B notUserConfigurable() {
-         this.userConfigurable = Boolean.FALSE;
-         return self();
-      }
-
-      /**
-       * @see Property#getDefaultValue()
-       */
-      public B defaultValue(String defaultValue) {
-         this.defaultValue = defaultValue;
-         return self();
-      }
-
-      public Property build() {
-         return new Property(this);
-      }
-
-      public B fromProperty(Property in) {
-         return key(in.getKey()).values(in.getValues()).description(in.getDescription()).label(in.getLabel())
-               .type(in.getType()).qualifiers(in.getQualifiers()).isUserConfigurable(in.isUserConfigurable()).defaultValue(in.getDefaultValue());
-      }
-   }
-
-   @XmlAttribute
-   private String key;
-   @XmlElement(name = "Value")
-   private Set<PropertyConfigurationValueType> values;
-   @XmlElement(name = "Label")
-   private MsgType label;
-   @XmlElement(name = "Description")
-   private MsgType description;
-   @XmlAttribute(required = true)
-   private String type;
-   @XmlAttribute(required = true)
-   private String qualifiers;
-   @XmlAttribute
-   private Boolean userConfigurable;
-   @XmlAttribute(name = "value")
-   private String defaultValue;
-
-   protected Property(Builder<?> builder) {
-      this.key = builder.key;
-      this.values = builder.values;
-      this.label = builder.label;
-      this.description = builder.description;
-      this.type = builder.type;
-      this.qualifiers = builder.qualifiers;
-      this.userConfigurable = builder.userConfigurable;
-      this.defaultValue = builder.defaultValue;
-   }
-
-   protected Property() {
-      // for JAXB
-   }
-
-   /**
-    * Property identifier.
-    */
-   public String getKey() {
-      return key;
-   }
-
-   /**
-    * Description of property.
-    */
-   public MsgType getDescription() {
-      return description;
-   }
-
-   /**
-    * Short description of property.
-    */
-   public MsgType getLabel() {
-      return label;
-   }
-
-   /**
-    * Alternative default property values for different configuration
-    */
-   public Set<PropertyConfigurationValueType> getValues() {
-      return values;
-   }
-
-   /**
-    * Property type.
-    */
-   public String getType() {
-      return type;
-   }
-
-   /**
-    * A comma-separated set of type qualifiers.
-    */
-   public String getQualifiers() {
-      return qualifiers;
-   }
-
-   /**
-    * Determines whether the property value is configurable during installation.
-    */
-   public Boolean isUserConfigurable() {
-      return userConfigurable;
-   }
-
-   /**
-    * A Default value for property.
-    */
-   public String getDefaultValue() {
-      if (defaultValue == null) {
-         return "";
-      } else {
-	      return defaultValue;
-      }
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(key, values, label, description, type, qualifiers, userConfigurable, defaultValue);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      Property that = Property.class.cast(obj);
-      return equal(this.key, that.key) &&
-            equal(this.values, that.values) &&
-            equal(this.label, that.label) &&
-            equal(this.description, that.description) &&
-            equal(this.type, that.type) &&
-            equal(this.qualifiers, that.qualifiers) &&
-            equal(this.userConfigurable, that.userConfigurable) &&
-            equal(this.defaultValue, that.defaultValue);
-   }
-
-   @Override
-   public String toString() {
-      return Objects.toStringHelper("")
-            .add("key", key).add("values", values).add("label", label).add("description", description)
-            .add("type", type).add("qualifiers", qualifiers).add("userConfigurable", userConfigurable).add("defaultValue", defaultValue)
-            .toString();
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/PropertyConfigurationValueType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/PropertyConfigurationValueType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/PropertyConfigurationValueType.java
deleted file mode 100644
index 7efb08e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/PropertyConfigurationValueType.java
+++ /dev/null
@@ -1,54 +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.dmtf.ovf;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Type for alternative default values for properties when DeploymentOptionSection is used
- * 
- * <pre>
- * &lt;complexType name="PropertyConfigurationValue_Type">
- * </pre>
- */
-@XmlType(name = "PropertyConfigurationValue_Type")
-public class PropertyConfigurationValueType {
-
-   // TODO Builder
-
-   @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true)
-   protected String value;
-   @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1")
-   protected String configuration;
-
-   /**
-    * Gets the value of the value property.
-    */
-   public String getValue() {
-      return value;
-   }
-
-   /**
-    * Gets the value of the configuration property.
-    */
-   public String getConfiguration() {
-      return configuration;
-   }
-
-   // TODO hashCode, equals, toString
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
deleted file mode 100644
index cc532a7..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
+++ /dev/null
@@ -1,141 +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.dmtf.ovf;
-
-import static com.google.common.base.Objects.equal;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-/**
- * Metadata about a virtual machine or grouping of them.
- *
- * Base type for Sections, subclassing this is the most common form of extensibility. Subtypes define more specific elements.
- */
-@XmlType(name = "Section_Type")
-public abstract class SectionType {
-
-   public abstract static class Builder<B extends Builder<B>> {
-      private String info;
-      private Boolean required;
-
-      @SuppressWarnings("unchecked")
-      protected B self() {
-         return (B) this;
-      }
-
-      public abstract SectionType build();
-
-      /**
-       * @see SectionType#getInfo()
-       */
-      public B info(String info) {
-         this.info = info;
-         return self();
-      }
-
-      /**
-       * @see SectionType#isRequired()
-       */
-      public B required(Boolean required) {
-         this.required = required;
-         return self();
-      }
-
-      /**
-       * @see SectionType#isRequired()
-       */
-      public B required() {
-         this.required = Boolean.TRUE;
-         return self();
-      }
-
-      /**
-       * @see SectionType#isRequired()
-       */
-      public B notRequired() {
-         this.required = Boolean.FALSE;
-         return self();
-      }
-
-      public B fromSectionType(SectionType in) {
-         return info(in.getInfo()).required(in.isRequired());
-      }
-   }
-
-   @XmlElement(name = "Info", required = true)
-   private String info;
-   @XmlAttribute(namespace = OVF_NS)
-   private Boolean required;
-
-   protected SectionType(Builder<?> builder) {
-      this.info = builder.info;
-      this.required = builder.required;
-   }
-
-   protected SectionType() {
-      // For JAXB
-   }
-
-   /**
-    * Info element describes the meaning of the Section, this is typically shown if the Section is not understood by an application
-    * 
-    * @return ovf info
-    */
-   public String getInfo() {
-      return info;
-   }
-
-   public void setInfo(String info) {
-      this.info = info;
-   }
-
-   public Boolean isRequired() {
-      return required;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(info, required);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      SectionType other = (SectionType) obj;
-      return equal(this.info, other.info) && equal(this.required, other.required);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   protected Objects.ToStringHelper string() {
-      return Objects.toStringHelper("").add("info", info).add("required", required);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
deleted file mode 100644
index fecdfa3..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
+++ /dev/null
@@ -1,123 +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.dmtf.ovf;
-
-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.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;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
-/**
- * Specifies the order in which entities in a VirtualSystemCollection are powered on and shut down
- *
- * <pre>
- * &lt;complexType name="StartupSection_Type" /&gt;
- * </pre>
- */
-@XmlRootElement(name = "StartupSection")
-@XmlType(name = "StartupSection_Type")
-public class StartupSection extends SectionType {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return builder().fromStartupSection(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
-      private List<StartupSectionItem> items = Lists.newArrayList();
-
-      /**
-       * @see StartupSection#getItem()
-       */
-      public B items(List<StartupSectionItem> items) {
-         this.items = checkNotNull(items, "items");
-         return self();
-      }
-
-      /**
-       * @see StartupSection#getItem()
-       */
-      public B item(StartupSectionItem item) {
-         this.items.add(checkNotNull(item, "item"));
-         return self();
-      }
-
-      @Override
-      public StartupSection build() {
-         return new StartupSection(this);
-      }
-      
-      public B fromStartupSection(StartupSection in) {
-         return fromSectionType(in).items(in.getItems());
-      }
-   }
-
-   @XmlElement(name = "Item")
-   private List<StartupSectionItem> items = Lists.newArrayList();
-
-   protected StartupSection() {
-      // For JAXB
-   }
-
-   public StartupSection(Builder<?> builder) {
-      super(builder);
-      this.items = (items != null) ? ImmutableList.<StartupSectionItem>copyOf(builder.items) : ImmutableList.<StartupSectionItem>of();
-   }
-
-   /**
-    * Gets the value of the item property.
-    */
-   public List<StartupSectionItem> getItems() {
-      return items;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      StartupSection that = StartupSection.class.cast(o);
-      return super.equals(that) && equal(this.items, that.items);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), items);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string().add("items", items);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSectionItem.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSectionItem.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSectionItem.java
deleted file mode 100644
index e1cd012..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSectionItem.java
+++ /dev/null
@@ -1,62 +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.dmtf.ovf;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Java class for Item element declaration.
- *
- * <pre>
- * &lt;element name="Item">
- *   &lt;complexType>
- *     &lt;complexContent>
- *       &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         &lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *         &lt;attribute name="order" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *         &lt;attribute name="startDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
- *         &lt;attribute name="waitingForGuest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *         &lt;attribute name="stopDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
- *         &lt;attribute name="startAction" type="{http://www.w3.org/2001/XMLSchema}string" default="powerOn" />
- *         &lt;attribute name="stopAction" type="{http://www.w3.org/2001/XMLSchema}string" default="powerOff" />
- *         &lt;anyAttribute processContents='lax'/>
- *       &lt;/restriction>
- *     &lt;/complexContent>
- *   &lt;/complexType>
- * &lt;/element>
- * </pre>
- */
-@XmlType
-@XmlRootElement(name = "Item")
-public class StartupSectionItem extends Item {
-   
-   // TODO Builder
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      StartupSectionItem that = StartupSectionItem.class.cast(obj);
-      return super.equals(that);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
deleted file mode 100644
index 864d153..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
+++ /dev/null
@@ -1,198 +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.dmtf.ovf;
-
-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 org.jclouds.dmtf.cim.ResourceAllocationSettingData;
-import org.jclouds.dmtf.cim.VirtualSystemSettingData;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * The virtual hardware required by a virtual machine is specified in VirtualHardwareSection.
- *
- * This specification supports abstract or incomplete hardware descriptions in which only the major
- * devices are described. The hypervisor is allowed to create additional virtual hardware
- * controllers and devices, as long as the required devices listed in the descriptor are realized.
- */
-public class VirtualHardwareSection extends SectionType {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return builder().fromVirtualHardwareSection(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
-      private VirtualSystemSettingData virtualSystem;
-      private String transport;
-      private Set<ResourceAllocationSettingData> items = Sets.newLinkedHashSet();
-
-      /**
-       * @see VirtualHardwareSection#getSystem()
-       */
-      public B system(VirtualSystemSettingData virtualSystem) {
-         this.virtualSystem = virtualSystem;
-         return self();
-      }
-
-      /**
-       * @see VirtualHardwareSection#getTransport()
-       */
-      public B transport(String transport) {
-         this.transport = transport;
-         return self();
-      }
-
-      /**
-       * @see VirtualHardwareSection#getTransport()
-       */
-      public B transport(Iterable<String> transports) {
-         this.transport = Joiner.on(',').join(transports);
-         return self();
-      }
-
-      /**
-       * @see VirtualHardwareSection#getTransport()
-       */
-      public B transport(String...transports) {
-         this.transport = Joiner.on(',').join(transports);
-         return self();
-      }
-
-      /**
-       * @see VirtualHardwareSection#getItems()
-       */
-      public B item(ResourceAllocationSettingData item) {
-         this.items.add(checkNotNull(item, "item"));
-         return self();
-      }
-
-      /**
-       * @see VirtualHardwareSection#getItems()
-       */
-      public B items(Iterable<? extends ResourceAllocationSettingData> items) {
-         this.items = Sets.newLinkedHashSet(checkNotNull(items, "items"));
-         return self();
-      }
-
-      /**
-       * {@inheritDoc}
-       */
-      @Override
-      public VirtualHardwareSection build() {
-         return new VirtualHardwareSection(this);
-      }
-
-      public B fromVirtualHardwareSection(VirtualHardwareSection in) {
-         return fromSectionType(in)
-               .items(in.getItems())
-               .transport(in.getTransport())
-               .system(in.getSystem());
-      }
-   }
-
-   @XmlElement(name = "System")
-   protected VirtualSystemSettingData virtualSystem;
-   @XmlAttribute(name = "transport")
-   protected String transport;
-   @XmlElement(name = "Item")
-   protected Set<? extends ResourceAllocationSettingData> items = Sets.newLinkedHashSet();
-
-   protected VirtualHardwareSection(Builder<?> builder) {
-      super(builder);
-      this.virtualSystem = builder.virtualSystem;
-      this.transport = builder.transport;
-      this.items = builder.items != null ? ImmutableSet.copyOf(builder.items) : Sets.<ResourceAllocationSettingData>newLinkedHashSet();
-   }
-
-   protected VirtualHardwareSection() {
-      // For JAXB
-   }
-
-   /**
-    * Comma-separated list of supported transports types for the OVF descriptor.
-    *
-    * Transport types define methods by which the environment document is communicated from the
-    * deployment platform to the guest software.
-    * <p>
-    * To enable interoperability, this specification defines an "iso" transport type which all
-    * implementations that support CD-ROM devices are required to support. The iso transport
-    * communicates the environment 1346 document by making a dynamically generated ISO image
-    * available to the guest software. To support the iso transport type, prior to booting a virtual
-    * machine, an implementation shall make an ISO 9660 read-only disk image available as backing
-    * for a disconnected CD-ROM. If the iso transport is selected for a VirtualHardwareSection, at
-    * least one disconnected CD-ROM device shall be present in this section.
-    * <p>
-    * Support for the "iso" transport type is not a requirement for virtual hardware architectures
-    * or guest 1351 operating systems which do not have CD-ROM device support.
-    *
-    * @return
-    */
-   public String getTransport() {
-      return transport;
-   }
-
-   public VirtualSystemSettingData getSystem() {
-      return virtualSystem;
-   }
-
-   public Set<? extends ResourceAllocationSettingData> getItems() {
-      return ImmutableSet.copyOf(items);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), transport, virtualSystem, items);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null) return false;
-      if (getClass() != obj.getClass()) return false;
-      VirtualHardwareSection that = VirtualHardwareSection.class.cast(obj);
-      return super.equals(that)
-            && equal(this.transport, that.transport)
-            && equal(this.virtualSystem, that.virtualSystem)
-            && equal(this.items, that.items);
-   }
-
-   @Override
-   protected Objects.ToStringHelper string() {
-      return super.string()
-            .add("transport", transport)
-            .add("virtualSystem", virtualSystem)
-            .add("items", items);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EntityType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EntityType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EntityType.java
deleted file mode 100644
index aeedeaf..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EntityType.java
+++ /dev/null
@@ -1,91 +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.dmtf.ovf.environment;
-
-import static org.jclouds.dmtf.DMTFConstants.OVF_ENV_NS;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-/**
- * Container of sections for a specific entity
- *
- * <pre>
- * &lt;complexType name="Entity_Type">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://schemas.dmtf.org/ovf/environment/1}Section" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;anyAttribute processContents='lax'/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlType(name = "Entity_Type")
-public class EntityType {
-
-    @XmlElementRef(name = "Section", namespace = OVF_ENV_NS)
-    protected Set<SectionType<?>> sections = Sets.newLinkedHashSet();
-    @XmlAnyElement(lax = true)
-    protected Set<Object> any = Sets.newLinkedHashSet();
-    @XmlAttribute(namespace = OVF_ENV_NS, required = true)
-    protected String id;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = Maps.newLinkedHashMap();
-
-    /**
-     * Gets the value of the sections property.
-     */
-    public Set<SectionType<?>> getSection() {
-        return sections;
-    }
-
-    /**
-     * Gets the value of the any property.
-     */
-    public Set<Object> getAny() {
-        return any;
-    }
-
-    /**
-     * Gets the value of the id property.
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EnvironmentType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EnvironmentType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EnvironmentType.java
deleted file mode 100644
index ee15f55..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EnvironmentType.java
+++ /dev/null
@@ -1,114 +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.dmtf.ovf.environment;
-
-import static org.jclouds.dmtf.DMTFConstants.OVF_ENV_NS;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-/**
- * Type for root OVF environment
- *
- * <pre>
- * &lt;complexType name="Environment_Type">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://schemas.dmtf.org/ovf/environment/1}Section" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="Entity" type="{http://schemas.dmtf.org/ovf/environment/1}Entity_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- *       &lt;anyAttribute processContents='lax'/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlType(name = "Environment_Type")
-public class EnvironmentType {
-
-    @XmlElementRef(name = "Section", namespace = OVF_ENV_NS)
-    protected Set<SectionType<?>> sections = Sets.newLinkedHashSet();
-    @XmlElement(name = "Entity")
-    protected Set<EntityType> entities = Sets.newLinkedHashSet();
-    @XmlAnyElement(lax = true)
-    protected Set<Object> any = Sets.newLinkedHashSet();
-    @XmlAttribute(namespace = OVF_ENV_NS)
-    protected String id;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = Maps.newLinkedHashMap();
-
-    /**
-     * Entity independent meta-data sections Gets the value of the sections property.
-     */
-    public Set<SectionType<?>> getSections() {
-        return sections;
-    }
-
-    /**
-     * Gets the value of the entities property.
-     */
-    public Set<EntityType> getEntities() {
-        return entities;
-    }
-
-    /**
-     * Gets the value of the any property.
-     */
-    public Set<Object> getAny() {
-        return any;
-    }
-
-    /**
-     * Gets the value of the id property.
-     */
-    public String getId() {
-        if (id == null) {
-            return "";
-        } else {
-            return id;
-        }
-    }
-
-    /**
-     * Sets the value of the id property.
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
deleted file mode 100644
index fd56577..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
+++ /dev/null
@@ -1,140 +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.dmtf.ovf.environment;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.cim.CimString;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.Sets;
-
-/**
- * Information about deployment platform
- *
- * <pre>
- * &lt;complexType name="PlatformSection_Type">
- *   &lt;complexContent>
- *     &lt;extension base="{http://schemas.dmtf.org/ovf/environment/1}Section_Type">
- *       &lt;sequence>
- *         &lt;element name="Kind" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- *         &lt;element name="Version" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- *         &lt;element name="Vendor" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- *         &lt;element name="Locale" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- *         &lt;element name="Timezone" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;anyAttribute processContents='lax'/>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlRootElement(name = "PlatformSection")
-@XmlType(name = "PlatformSection_Type")
-public class PlatformSectionType extends SectionType<PlatformSectionType> {
-
-   @XmlElement(name = "Kind")
-   protected CimString kind;
-   @XmlElement(name = "Version")
-   protected CimString version;
-   @XmlElement(name = "Vendor")
-   protected CimString vendor;
-   @XmlElement(name = "Locale")
-   protected CimString locale;
-   @XmlElement(name = "Timezone")
-   protected Integer timezone;
-   @XmlAnyElement(lax = true)
-   protected Set<Object> any = Sets.newLinkedHashSet();
-
-   /**
-    * Gets the value of the kind property.
-    */
-   public CimString getKind() {
-      return kind;
-   }
-
-   /**
-    * Gets the value of the version property.
-    */
-   public CimString getVersion() {
-      return version;
-   }
-
-   /**
-    * Gets the value of the vendor property.
-    */
-   public CimString getVendor() {
-      return vendor;
-   }
-
-   /**
-    * Gets the value of the locale property.
-    */
-   public CimString getLocale() {
-      return locale;
-   }
-
-   /**
-    * Gets the value of the timezone property.
-    */
-   public Integer getTimezone() {
-      return timezone;
-   }
-
-   /**
-    * Gets the value of the any property.
-    */
-   public Set<Object> getAny() {
-      return any;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), version, vendor, timezone, locale, kind, any);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      PlatformSectionType that = (PlatformSectionType) obj;
-      return super.equals(that) &&
-            Objects.equal(this.version, that.version) &&
-            Objects.equal(this.vendor, that.vendor) &&
-            Objects.equal(this.timezone, that.timezone) &&
-            Objects.equal(this.locale, that.locale) &&
-            Objects.equal(this.kind, that.kind) &&
-            Objects.equal(this.any, that.any);
-   }
-
-   @Override
-   protected Objects.ToStringHelper string() {
-      return super.string()
-            .add("version", version).add("vendor", vendor).add("timezone", timezone)
-            .add("locale", locale).add("kind", kind).add("any", any);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/Property.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/Property.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/Property.java
deleted file mode 100644
index 2baf2bd..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/Property.java
+++ /dev/null
@@ -1,78 +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.dmtf.ovf.environment;
-
-import static org.jclouds.dmtf.DMTFConstants.OVF_ENV_NS;
-
-import java.util.Map;
-
-import com.google.common.collect.Maps;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-/**
- * Java class for anonymous complex type.
- */
-@XmlType(name = "")
-public class Property {
-
-    @XmlAttribute(namespace = OVF_ENV_NS, required = true)
-    protected String key;
-    @XmlAttribute(namespace = OVF_ENV_NS, required = true)
-    protected String value;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = Maps.newHashMap();
-
-    /**
-     * Gets the value of the key property.
-     */
-    public String getKey() {
-        return key;
-    }
-
-    /**
-     * Sets the value of the key property.
-     */
-    public void setKey(String value) {
-        this.key = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
deleted file mode 100644
index 1d88afd..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
+++ /dev/null
@@ -1,103 +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.dmtf.ovf.environment;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAnyElement;
-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.collect.Sets;
-
-/**
- * Key/value pairs of assigned properties for an entity
- *
- * <pre>
- * &lt;complexType name="PropertySection_Type">
- *   &lt;complexContent>
- *     &lt;extension base="{http://schemas.dmtf.org/ovf/environment/1}Section_Type">
- *       &lt;sequence>
- *         &lt;element name="Property" maxOccurs="unbounded" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 &lt;attribute name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 &lt;attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 &lt;anyAttribute processContents='lax'/>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;anyAttribute processContents='lax'/>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlRootElement(name = "PropertySection")
-@XmlType(name = "PropertySection_Type")
-public class PropertySectionType extends SectionType<PropertySectionType> {
-
-    @XmlElement(name = "Property")
-    protected Set<Property> properties = Sets.newLinkedHashSet();
-    @XmlAnyElement(lax = true)
-    protected Set<Object> any = Sets.newLinkedHashSet();
-
-    /**
-     * Gets the value of the properties property.
-     */
-    public Set<Property> getProperties() {
-        return properties;
-    }
-
-    /**
-     * Gets the value of the any property.
-     */
-    public Set<Object> getAny() {
-        return any;
-    }
-
-    @Override
-    public int hashCode() {
-       return Objects.hashCode(super.hashCode(), properties, any);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-       if (this == obj)
-          return true;
-       if (obj == null)
-          return false;
-       if (getClass() != obj.getClass())
-          return false;
-       PropertySectionType that = (PropertySectionType) obj;
-       return super.equals(that) &&
-             Objects.equal(this.properties, that.properties) &&
-             Objects.equal(this.any, that.any);
-    }
-
-    @Override
-    protected Objects.ToStringHelper string() {
-       return super.string()
-             .add("properties", properties).add("any", any);
-    }
-}