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

[27/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/Error.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
deleted file mode 100644
index 13722ef..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
+++ /dev/null
@@ -1,251 +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.Arrays;
-
-import javax.annotation.Resource;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.logging.Logger;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-
-/**
- * The standard error message type used in the vCloud REST API.
- */
-@XmlRootElement(name = "Error")
-public class Error {
-
-   @Resource
-   protected static Logger logger = Logger.NULL;
-
-   @XmlType
-   @XmlEnum(Integer.class)
-   public static enum Code {
-      @XmlEnumValue("200") OK(200),
-      @XmlEnumValue("201") CREATED(201),
-      @XmlEnumValue("202") ACCEPTED(202),
-      @XmlEnumValue("204") NO_CONTENT(204),
-      @XmlEnumValue("303") SEE_OTHER(303),
-      @XmlEnumValue("400") BAD_REQUEST(400),
-      @XmlEnumValue("401") UNAUTHORIZED(401),
-      @XmlEnumValue("403") FORBIDDEN(403), // NOTE also means 'not found' for entities
-      @XmlEnumValue("404") NOT_FOUND(404),
-      @XmlEnumValue("405") NOT_ALLOWED(405),
-      @XmlEnumValue("500") INTERNAL_ERROR(500),
-      @XmlEnumValue("501") NOT_IMPLEMENTED(501),
-      @XmlEnumValue("503") UNAVAILABLE(503),
-      UNRECOGNIZED(-1);
-
-      private Integer majorErrorCode;
-      
-      private Code(Integer majorErrorCode) {
-         this.majorErrorCode = majorErrorCode;
-      }
-
-      public Integer getCode() {
-         return majorErrorCode;
-      }
-
-      public static Code fromCode(final int majorErrorCode) {
-         Optional<Code> found = Iterables.tryFind(Arrays.asList(values()), new Predicate<Code>() {
-            @Override
-            public boolean apply(Code code) {
-               return code.getCode().equals(majorErrorCode);
-            }
-         });
-         if (found.isPresent()) {
-            return found.get();
-         } else {
-            logger.warn("Unrecognized major error code '%d'", majorErrorCode);
-            return UNRECOGNIZED;
-         }
-      }
-   }
-
-   public static final String MEDIA_TYPE = VCloudDirectorMediaType.ERROR;
-
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   public Builder toBuilder() {
-      return new Builder().fromError(this);
-   }
-
-   public static class Builder {
-
-      protected String message;
-      protected int majorErrorCode;
-      protected String minorErrorCode;
-      protected String vendorSpecificErrorCode;
-      protected String stackTrace;
-
-      /**
-       * @see Error#getMessage()
-       */
-      public Builder message(String message) {
-         this.message = message;
-         return this;
-      }
-
-      /**
-       * @see Error#getMajorErrorCode()
-       */
-      public Builder majorErrorCode(int majorErrorCode) {
-         this.majorErrorCode = majorErrorCode;
-         return this;
-      }
-
-      /**
-       * @see Error#getMinorErrorCode()
-       */
-      public Builder minorErrorCode(String minorErrorCode) {
-         this.minorErrorCode = minorErrorCode;
-         return this;
-      }
-
-      /**
-       * @see Error#getVendorSpecificErrorCode()
-       */
-      public Builder vendorSpecificErrorCode(String vendorSpecificErrorCode) {
-         this.vendorSpecificErrorCode = vendorSpecificErrorCode;
-         return this;
-      }
-
-      /**
-       * @see Error#getStackTrace()
-       */
-      public Builder stackTrace(String stackTrace) {
-         this.stackTrace = stackTrace;
-         return this;
-      }
-
-      public Error build() {
-         return new Error(message, majorErrorCode, minorErrorCode, vendorSpecificErrorCode, stackTrace);
-      }
-
-      public Builder fromError(Error in) {
-         return message(in.getMessage())
-               .majorErrorCode(in.getMajorErrorCode())
-               .minorErrorCode(in.getMinorErrorCode())
-               .vendorSpecificErrorCode(in.getVendorSpecificErrorCode())
-               .stackTrace(in.getStackTrace());
-      }
-   }
-
-   @XmlAttribute
-   private String message;
-   @XmlAttribute
-   private Integer majorErrorCode;
-   @XmlAttribute
-   private String minorErrorCode;
-   @XmlAttribute
-   private String vendorSpecificErrorCode;
-   @XmlAttribute
-   private String stackTrace;
-
-   private Error(String message, Integer majorErrorCode, String minorErrorCode, String vendorSpecificErrorCode, String stackTrace) {
-      this.message = checkNotNull(message, "message");
-      this.majorErrorCode = checkNotNull(majorErrorCode, "majorErrorCode");
-      this.minorErrorCode = checkNotNull(minorErrorCode, "minorErrorCode");
-      this.vendorSpecificErrorCode = vendorSpecificErrorCode;
-      this.stackTrace = stackTrace;
-   }
-
-   private Error() {
-      // For JAXB
-   }
-
-   /**
-    * An one line, human-readable message describing the error that occurred.
-    */
-   public String getMessage() {
-      return message;
-   }
-
-   /**
-    * The class of the error. Matches the HTTP status code.
-    */
-   public Integer getMajorErrorCode() {
-      return majorErrorCode;
-   }
-
-   /**
-    * Specific API error code.
-    *
-    * For example - can indicate that vApp power on failed by some reason.
-    */
-   public String getMinorErrorCode() {
-      return minorErrorCode;
-   }
-
-   /**
-    * A vendor/implementation specific error code that point to specific
-    * modules/parts of the code and can make problem diagnostics easier.
-    */
-   public String getVendorSpecificErrorCode() {
-      return vendorSpecificErrorCode;
-   }
-
-   /**
-    * The stack trace of the exception which when examined might make problem
-    * diagnostics easier.
-    */
-   public String getStackTrace() {
-      return stackTrace;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      Error that = (Error) o;
-      return equal(this.message, that.message) &&
-            equal(this.majorErrorCode, that.majorErrorCode) &&
-            equal(this.minorErrorCode, that.minorErrorCode) &&
-            equal(this.vendorSpecificErrorCode, that.vendorSpecificErrorCode) &&
-            equal(this.stackTrace, that.stackTrace);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(message, majorErrorCode, minorErrorCode, vendorSpecificErrorCode, stackTrace);
-   }
-
-   @Override
-   public String toString() {
-      return Objects.toStringHelper("")
-            .add("message", message).add("majorErrorCode", majorErrorCode).add("minorErrorCode", minorErrorCode)
-            .add("vendorSpecificErrorCode", vendorSpecificErrorCode).add("stackTrace", stackTrace)
-            .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/File.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java
deleted file mode 100644
index 1dbb52a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java
+++ /dev/null
@@ -1,173 +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.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-
-/**
- * Represents a file to be transferred (uploaded or downloaded).
- */
-@XmlType(name = "File")
-public class File extends Entity {
-   
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromFile(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public abstract static class Builder<B extends Builder<B>> extends Entity.Builder<B> {
-
-      private Long size;
-      private Long bytesTransferred;
-      private String checksum;
-
-      /**
-       * @see File#getSize()
-       */
-      public B size(Long size) {
-         this.size = size;
-         return self();
-      }
-
-      /**
-       * @see File#getBytesTransferred()
-       */
-      public B bytesTransferred(Long bytesTransferred) {
-         this.bytesTransferred = bytesTransferred;
-         return self();
-      }
-
-      /**
-       * @see File#getChecksum()
-       */
-      public B checksum(String checksum) {
-         this.checksum = checksum;
-         return self();
-      }
-
-      @Override
-      public File build() {
-         return new File(this);
-
-      }
-
-      public B fromFile(File in) {
-         return fromEntityType(in)
-               .size(in.getSize())
-               .bytesTransferred(in.getBytesTransferred())
-               .checksum(in.getChecksum());
-      }
-   }
-
-   public File(Builder<?> builder) {
-      super(builder);
-      this.size = builder.size;
-      this.bytesTransferred = builder.bytesTransferred;
-      this.checksum = builder.checksum;
-   }
-
-   @SuppressWarnings("unused")
-   private File() {
-      // For JAXB
-   }
-
-   @XmlAttribute
-   protected Long size;
-   @XmlAttribute
-   protected Long bytesTransferred;
-   @XmlAttribute
-   @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-   @XmlSchemaType(name = "normalizedString")
-   protected String checksum;
-
-   /**
-    * Gets the value of the size property.
-    *
-    * @return possible object is
-    *         {@link Long }
-    */
-   public Long getSize() {
-      return size;
-   }
-
-   /**
-    * Gets the value of the bytesTransferred property.
-    *
-    * @return possible object is
-    *         {@link Long }
-    */
-   public Long getBytesTransferred() {
-      return bytesTransferred;
-   }
-
-   /**
-    * Gets the value of the checksum property.
-    *
-    * @return possible object is
-    *         {@link String }
-    */
-   public String getChecksum() {
-      return checksum;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      File that = File.class.cast(o);
-      return super.equals(that) &&
-           equal(size, that.size) && 
-            equal(bytesTransferred, that.bytesTransferred) &&
-            equal(checksum, that.checksum);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(),
-           size, 
-            bytesTransferred,
-            checksum);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string()
-            .add("size", size)
-            .add("bytesTransferred", bytesTransferred)
-            .add("checksum", checksum);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java
deleted file mode 100644
index ea5feba..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java
+++ /dev/null
@@ -1,177 +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.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Represents group in the system.
- */
-@XmlRootElement(name = "Group")
-@XmlType(propOrder = {
-    "nameInSource",
-    "usersList",
-    "role"
-})
-public class Group extends Entity {
-   
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromGroup(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public abstract static class Builder<B extends Builder<B>> extends Entity.Builder<B> {
-      
-      private String nameInSource;
-      private Set<Reference> users = Sets.newLinkedHashSet();
-      private Reference role;
-
-      /**
-       * @see Group#getNameInSource()
-       */
-      public B nameInSource(String nameInSource) {
-         this.nameInSource = nameInSource;
-         return self();
-      }
-
-      /**
-       * @see Group#getUsers()
-       */
-      public B users(Iterable<Reference> users) {
-         this.users = Sets.newLinkedHashSet(checkNotNull(users, "users"));
-         return self();
-      }
-      
-      /**
-       * @see Group#getUsers()
-       */
-      public B user(Reference user) {
-         users.add(checkNotNull(user, "user"));
-         return self();
-      }
-
-      /**
-       * @see Group#getRole()
-       */
-      public B role(Reference role) {
-         this.role = role;
-         return self();
-      }
-
-      @Override
-      public Group build() {
-         return new Group(this);
-      }
-      
-      public B fromGroup(Group in) {
-         return fromEntityType(in)
-            .nameInSource(in.getNameInSource())
-            .users(in.getUsersList())
-            .role(in.getRole());
-      }
-   }
-
-   @SuppressWarnings("unused")
-   private Group() {
-      // For JAXB
-   }
-   
-   protected Group(Builder<?> builder) {
-      super(builder);
-      this.nameInSource = builder.nameInSource;
-      this.usersList = builder.users == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.users);
-      this.role = builder.role;
-   }
-
-    @XmlElement(name = "NameInSource")
-    protected String nameInSource;
-    @XmlElementWrapper(name = "UsersList")
-    @XmlElement(name = "UserReference")
-    protected Set<Reference> usersList = Sets.newLinkedHashSet();
-    @XmlElement(name = "Role")
-    protected Reference role;
-
-    /**
-     * Gets the value of the nameInSource property.
-     */
-    public String getNameInSource() {
-        return nameInSource;
-    }
-
-    /**
-     * Gets the value of the users property.
-     */
-    public Set<Reference> getUsersList() {
-        return usersList;
-    }
-
-    /**
-     * Gets the value of the role property.
-     */
-    public Reference getRole() {
-        return role;
-    }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-          return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      Group that = Group.class.cast(o);
-      return super.equals(that) && 
-           equal(nameInSource, that.nameInSource) &&
-           equal(usersList, that.usersList) &&
-           equal(role, that.role);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(),
-           nameInSource, 
-           usersList, 
-           role);
-   }
-
-   @Override
-   public String toString() {
-      return super.string()
-            .add("nameInSource", nameInSource)
-            .add("usersList", usersList)
-            .add("role", role).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/Link.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java
deleted file mode 100644
index ac86bc1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java
+++ /dev/null
@@ -1,238 +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.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-@XmlRootElement(name = "Link")
-public class Link extends Reference {
-   
-   @XmlType
-   @XmlEnum(String.class)
-   public static enum Rel {
-      @XmlEnumValue("add") ADD("add"),
-      @XmlEnumValue("alternate") ALTERNATE("alternate"),
-      @XmlEnumValue("catalogItem") CATALOG_ITEM("catalogItem"),
-      @XmlEnumValue("collaboration:abort") COLLABORATION_ABORT("collaboration:abort"),
-      @XmlEnumValue("collaboration:fail") COLLABORATION_FAIL("collaboration:fail"),
-      @XmlEnumValue("collaboration:resume") COLLABORATION_RESUME("collaboration:resume"),
-      @XmlEnumValue("consolidate") CONSOLIDATE("consolidate"),
-      @XmlEnumValue("controlAccess") CONTROL_ACCESS("controlAccess"),
-      @XmlEnumValue("copy") COPY("copy"),
-      @XmlEnumValue("deploy") DEPLOY("deploy"),
-      @XmlEnumValue("disable") DISABLE("disable"),
-      @XmlEnumValue("discardState") DISCARD_STATE("discardState"),
-      @XmlEnumValue("down") DOWN("down"),
-      @XmlEnumValue("download:alternate") DOWNLOAD_ALTERNATE("download:alternate"),
-      @XmlEnumValue("download:default") DOWNLOAD_DEFAULT("download:default"),
-      @XmlEnumValue("edit") EDIT("edit"),
-      @XmlEnumValue("enable") ENABLE("enable"),
-      @XmlEnumValue("entityResolver") ENTITY_RESOLVER("entityResolver"),
-      @XmlEnumValue("firstPage") FIRST_PAGE("firstPage"),
-      @XmlEnumValue("installVmwareTools") INSTALL_VMWARE_TOOLS("installVmwareTools"),
-      @XmlEnumValue("lastPage") LAST_PAGE("lastPage"),
-      @XmlEnumValue("media:ejectMedia") EJECT_MEDIA("media:ejectMedia"),
-      @XmlEnumValue("media:insertMedia") INSERT_MEDIA("media:insertMedia"),
-      @XmlEnumValue("move") MOVE("move"),
-      @XmlEnumValue("nextPage") NEXT_PAGE("nextPage"),
-      @XmlEnumValue("ova") OVA("ova"),
-      @XmlEnumValue("ovf") OVF("ovf"),
-      @XmlEnumValue("power:powerOff") POWER_OFF("power:powerOff"),
-      @XmlEnumValue("power:powerOn") POWER_ON("power:powerOn"),
-      @XmlEnumValue("power:reboot") REBOOT("power:reboot"),
-      @XmlEnumValue("power:reset") RESET("power:reset"),
-      @XmlEnumValue("power:shutdown") SHUTDOWN("power:shutdown"),
-      @XmlEnumValue("power:suspend") SUSPEND("power:suspend"),
-      @XmlEnumValue("previousPage") PREVIOUS_PAGE("previousPage"),
-      @XmlEnumValue("publish") PUBLISH("publish"),
-      @XmlEnumValue("recompose") RECOMPOSE("recompose"),
-      @XmlEnumValue("reconnect") RECONNECT("reconnect"),
-      @XmlEnumValue("register") REGISTER("register"),
-      @XmlEnumValue("reject") REJECT("reject"),
-      @XmlEnumValue("relocate") RELOCATE("relocate"),
-      @XmlEnumValue("remove") REMOVE("remove"),
-      @XmlEnumValue("screen:acquireTicket") SCREEN_ACQUIRE_TICKET("screen:acquireTicket"),
-      @XmlEnumValue("screen:thumbnail") SCREEN_THUMBNAIL("screen:thumbnail"),
-      @XmlEnumValue("syncSyslogSettings") SYNC_SYSLOG_SETTINGS("syncSyslogSettings"),
-      @XmlEnumValue("task:cancel") TASK_CANCEL("task:cancel"),
-      @XmlEnumValue("blockingTask") BLOCKING_TASK("blockingTask"),
-      @XmlEnumValue("taskOwner") TASK_OWNER("taskOwner"),
-      @XmlEnumValue("taskParams") TASK_PARAMS("taskParams"),
-      @XmlEnumValue("taskRequest") TASK_REQUEST("taskRequest"),
-      @XmlEnumValue("undeploy") UNDEPLOY("undeploy"),
-      @XmlEnumValue("unlock") UNLOCK("unlock"),
-      @XmlEnumValue("unregister") UNREGISTER("unregister"),
-      @XmlEnumValue("up") UP("up"),
-      @XmlEnumValue("updateProgress") UPDATE_PROGRESS("updateProgress"),
-      @XmlEnumValue("upgrade") UPGRADE("upgrade"),
-      @XmlEnumValue("upload:alternate") UPLOAD_ALTERNATE("upload:alternate"),
-      @XmlEnumValue("upload:default") UPLOAD_DEFAULT("upload:default"),
-      @XmlEnumValue("repair") REPAIR("repair"),
-
-      UNRECOGNIZED("unrecognized");
-      
-      public static final List<Rel> ALL = ImmutableList.of(
-            ADD, ALTERNATE, CATALOG_ITEM, COLLABORATION_ABORT,
-            COLLABORATION_FAIL, COLLABORATION_RESUME, CONSOLIDATE,
-            CONTROL_ACCESS, COPY, DEPLOY, DISABLE, DISCARD_STATE, DOWN,
-            DOWNLOAD_ALTERNATE, DOWNLOAD_DEFAULT, EDIT, ENABLE, ENTITY_RESOLVER, FIRST_PAGE,
-            INSTALL_VMWARE_TOOLS, LAST_PAGE, EJECT_MEDIA, INSERT_MEDIA, MOVE,
-            NEXT_PAGE, OVA, OVF, POWER_OFF, POWER_ON, REBOOT, RESET, SHUTDOWN,
-            SUSPEND, PREVIOUS_PAGE, PUBLISH, RECOMPOSE, RECONNECT, REGISTER,
-            REJECT, RELOCATE, REMOVE, REPAIR, SCREEN_ACQUIRE_TICKET,
-            SCREEN_THUMBNAIL, SYNC_SYSLOG_SETTINGS, TASK_CANCEL, BLOCKING_TASK, TASK_OWNER,
-            TASK_PARAMS, TASK_REQUEST, UNDEPLOY, UNLOCK, UNREGISTER, UP,
-            UPDATE_PROGRESS, UPGRADE, UPLOAD_ALTERNATE, UPLOAD_DEFAULT,
-            UPLOAD_DEFAULT);
-
-      protected final String stringValue;
-
-      Rel(String stringValue) {
-         this.stringValue = stringValue;
-      }
-
-      public String value() {
-         return stringValue;
-      }
-
-      protected static final Map<String, Rel> REL_BY_ID = Maps.uniqueIndex(
-            ImmutableSet.copyOf(Rel.values()), new Function<Rel, String>() {
-               @Override
-               public String apply(Rel input) {
-                  return input.stringValue;
-               }
-            });
-
-      public static Rel fromValue(String value) {
-         Rel rel = REL_BY_ID.get(checkNotNull(value, "stringValue"));
-         return rel == null ? UNRECOGNIZED : rel;
-      }
-   }
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromLink(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public static class Builder<B extends Builder<B>> extends Reference.Builder<B> {
-
-      private Rel rel;
-
-      /**
-       * @see Link#getRel()
-       */
-      public B rel(String rel) {
-         this.rel = Rel.fromValue(rel);
-         return self();
-      }
-
-      /**
-       * @see Link#getRel()
-       */
-      public B rel(Rel rel) {
-         this.rel = rel;
-         return self();
-      }
-
-      @Override
-      public Link build() {
-         return new Link(this);
-      }
-
-      public B fromLink(Link in) {
-         return fromReference(in).rel(in.getRel());
-      }
-
-      /**
-       * {@inheritDoc}
-       */
-      @Override
-      public B fromAttributes(Map<String, String> attributes) {
-         super.fromAttributes(attributes);
-         rel(attributes.get("rel"));
-         return self();
-      }
-   }
-
-   @XmlAttribute(required = true)
-   private Rel rel;
-
-   protected Link(Builder<?> builder) {
-      super(builder);
-      this.rel = checkNotNull(builder.rel, "rel");
-   }
-
-   protected Link() {
-      // For JAXB
-   }
-
-   /**
-    * Defines the relationship of the link to the object that contains it. A relationship can be the
-    * name of an operation on the object, a reference to a contained or containing object, or a
-    * reference to an alternate representation of the object. The relationship value implies the
-    * HTTP verb to use when you use the link's href value as a request URL.
-    *
-    * @return relationship of the link to the object that contains it.
-    */
-   public Rel getRel() {
-      return rel;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      Link that = (Link) o;
-      return super.equals(that) && equal(this.rel, that.rel);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), rel);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string().add("rel", rel);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
deleted file mode 100644
index 9d72e4d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
+++ /dev/null
@@ -1,202 +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.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-/**
- * Represents removable media, such as a CD-ROM, DVD or Floppy disk.
- */
-@XmlRootElement(name = "Media")
-public class Media extends ResourceEntity {
-   
-   @XmlType
-   @XmlEnum(String.class)
-   public static enum ImageType {
-      @XmlEnumValue("iso") ISO("iso"),
-      @XmlEnumValue("floppy") FLOPPY("floppy"),
-      @XmlEnumValue("") UNRECOGNIZED("unrecognized");
-      
-      public static final List<ImageType> ALL = ImmutableList.of(ISO, FLOPPY);
-
-      protected final String stringValue;
-
-      ImageType(String stringValue) {
-         this.stringValue = stringValue;
-      }
-
-      public String value() {
-         return stringValue;
-      }
-
-      protected static final Map<String, ImageType> STATUS_BY_ID = Maps.uniqueIndex(
-            ImmutableSet.copyOf(ImageType.values()), new Function<ImageType, String>() {
-               @Override
-               public String apply(ImageType input) {
-                  return input.stringValue;
-               }
-            });
-
-      public static ImageType fromValue(String value) {
-         ImageType type = STATUS_BY_ID.get(checkNotNull(value, "stringValue"));
-         return type == null ? UNRECOGNIZED : type;
-      }
-   }
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromMedia(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 ImageType imageType;
-      private long size;
-
-      /**
-       * @see Media#getOwner()
-       */
-      public B owner(Owner owner) {
-         this.owner = owner;
-         return self();
-      }
-
-      /**
-       * @see Media#getImageType()
-       */
-      public B imageType(Media.ImageType imageType) {
-         this.imageType = imageType;
-         return self();
-      }
-
-      /**
-       * @see Media#getSize()
-       */
-      public B size(long size) {
-         this.size = size;
-         return self();
-      }
-
-      @Override
-      public Media build() {
-         return new Media(this);
-      }
-
-      public B fromMedia(Media in) {
-         return fromResourceEntityType(in).owner(in.getOwner()).imageType(in.getImageType()).size(in.getSize());
-      }
-   }
-
-
-   public Media(Builder<?> builder) {
-      super(builder);
-      this.owner = builder.owner;
-      this.imageType = builder.imageType;
-      this.size = builder.size;
-   }
-
-   protected Media() {
-      // for JAXB
-   }
-
-   @XmlElement(name = "Owner")
-   protected Owner owner;
-   @XmlAttribute(required = true)
-   protected ImageType imageType;
-   @XmlAttribute(required = true)
-   protected long size;
-
-   /**
-    * Gets the value of the owner property.
-    */
-   public Owner getOwner() {
-      return owner;
-   }
-
-   /**
-    * Gets the value of the imageType property.
-    */
-   public ImageType getImageType() {
-      return imageType;
-   }
-
-   /**
-    * Gets the value of the size property.
-    */
-   public long getSize() {
-      return size;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      Media that = Media.class.cast(o);
-      return super.equals(that) &&
-            equal(this.owner, that.owner) && equal(this.imageType, that.imageType) && equal(this.size, that.size);
-   }
-   
-   @Override
-   public boolean clone(Object o) {
-      if (this == o)
-         return false;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      Media that = Media.class.cast(o);
-      return super.clone(that) && 
-            equal(this.imageType, that.imageType) && equal(this.size, that.size);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), owner, imageType, size);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string().add("owner", owner).add("imageType", imageType).add("size", size);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java
deleted file mode 100644
index 3185b76..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "Metadata")
-public class Metadata extends Resource implements Map<String, String> {
-   
-   public static Metadata toMetadata(Map<String, String> input) {
-      if (input instanceof Metadata)
-         return Metadata.class.cast(input);
-      Builder<?> builder = builder();
-      for (Map.Entry<String, String> entry : input.entrySet()) {
-         builder.entry(MetadataEntry.builder().entry(entry.getKey(), entry.getValue()).build());
-      }
-      return builder.build();
-   }
-
-   public static final String MEDIA_TYPE = VCloudDirectorMediaType.METADATA;
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromMetadata(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-
-   public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
-      private Set<MetadataEntry> metadataEntries = Sets.newLinkedHashSet();
-      
-      /**
-       * @see Metadata#getMetadataEntries()
-       */
-      public B entries(Set<MetadataEntry> metadataEntries) {
-         this.metadataEntries = Sets.newLinkedHashSet(checkNotNull(metadataEntries, "metadataEntries"));
-         return self();
-      }
-
-      /**
-       * @see Metadata#getMetadataEntries()
-       */
-      public B entry(MetadataEntry metadataEntry) {
-         metadataEntries.add(checkNotNull(metadataEntry, "metadataEntry"));
-         return self();
-      }
-
-      @Override
-      public Metadata build() {
-         return new Metadata(this);
-      }
-
-      public B fromMetadata(Metadata in) {
-         return fromResource(in).entries(in.getMetadataEntries());
-      }
-   }
-
-   protected Metadata() {
-      // For JAXB
-   }
-
-   protected Metadata(Builder<?> builder) {
-      super(builder);
-      this.metadataEntries = ImmutableSet.copyOf(builder.metadataEntries);
-   }
-
-   @XmlElement(name = "MetadataEntry")
-   private Set<MetadataEntry> metadataEntries = Sets.newLinkedHashSet();
-
-   public Set<MetadataEntry> getMetadataEntries() {
-      return ImmutableSet.copyOf(metadataEntries);
-   }
-
-   protected Map<String, String> toMap() {
-      ImmutableMap.Builder<String, String> builder = ImmutableMap.<String, String> builder();
-      for (MetadataEntry entry : metadataEntries) {
-         builder.put(entry.getKey(), entry.getValue());
-      }
-      return builder.build();
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      Metadata that = Metadata.class.cast(o);
-      return super.equals(that) && equal(this.metadataEntries, that.metadataEntries);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), metadataEntries);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string().add("metadataEntries", metadataEntries);
-   }
-
-   @Override
-   public void clear() {
-      throw new UnsupportedOperationException();
-   }
-
-   @Override
-   public boolean containsKey(Object arg0) {
-      return toMap().containsKey(arg0);
-   }
-
-   @Override
-   public boolean containsValue(Object arg0) {
-      return toMap().containsValue(arg0);
-   }
-
-   @Override
-   public Set<Map.Entry<String, String>> entrySet() {
-      return toMap().entrySet();
-   }
-
-   @Override
-   public String get(Object arg0) {
-      return toMap().get(arg0);
-   }
-
-   @Override
-   public boolean isEmpty() {
-      return getMetadataEntries().size() == 0;
-   }
-
-   @Override
-   public Set<String> keySet() {
-      return toMap().keySet();
-   }
-
-   @Override
-   public String put(String arg0, String arg1) {
-      throw new UnsupportedOperationException();
-   }
-
-   @Override
-   public void putAll(Map<? extends String, ? extends String> arg0) {
-      throw new UnsupportedOperationException();
-   }
-
-   @Override
-   public String remove(Object arg0) {
-      throw new UnsupportedOperationException();
-   }
-
-   @Override
-   public int size() {
-      return getMetadataEntries().size();
-   }
-
-   @Override
-   public Collection<String> values() {
-      return toMap().values();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
deleted file mode 100644
index 11cef70..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
+++ /dev/null
@@ -1,177 +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.net.URI;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.Sets;
-
-//TODO: this is a ridiculously complicated way of representing Map<String, String>
-@XmlRootElement(name = "MetadataEntry")
-public class MetadataEntry extends Resource {
-
-   public static final String MEDIA_TYPE = VCloudDirectorMediaType.METADATA_ENTRY;
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromMetadataEntry(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-      private String key;
-      private String value;
-
-      /**
-       * @see MetadataEntry#getKey()
-       */
-      public B key(String key) {
-         this.key = key;
-         return self();
-      }
-
-      /**
-       * @see MetadataEntry#getValue()
-       */
-      public B value(String value) {
-         this.value = value;
-         return self();
-      }
-
-      /**
-       * @see MetadataEntry#getKey()
-       * @see MetadataEntry#getValue()
-       */
-      public B entry(String key, String value) {
-         this.key = key;
-         this.value = value;
-         return self();
-      }
-
-      @Override
-      public MetadataEntry build() {
-         return new MetadataEntry(this);
-      }
-
-      /**
-       * @see ResourceType#getHref()
-       */
-      @Override
-      public B href(URI href) {
-         super.href(href);
-         return self();
-      }
-
-      /**
-       * @see ResourceType#getType()
-       */
-      @Override
-      public B type(String type) {
-         super.type(type);
-         return self();
-      }
-
-      /**
-       * @see ResourceType#getLinks()
-       */
-      @Override
-      public B links(Set<Link> links) {
-         super.links(Sets.newLinkedHashSet(checkNotNull(links, "links")));
-         return self();
-      }
-
-      /**
-       * @see ResourceType#getLinks()
-       */
-      @Override
-      public B link(Link link) {
-         super.link(link);
-         return self();
-      }
-
-      public B fromMetadataEntry(MetadataEntry in) {
-         return fromResource(in).entry(key, value);
-      }
-
-   }
-
-   MetadataEntry() {
-      // for JAXB
-   }
-
-   public MetadataEntry(Builder<?> builder) {
-      super(builder);
-      this.key = checkNotNull(builder.key, "key");
-      this.value = checkNotNull(builder.value, "value");
-   }
-
-   @XmlElement(name = "Key")
-   private String key;
-   @XmlElement(name = "Value")
-   private String value;
-
-   /**
-    * @return key of the entry
-    */
-   public String getKey() {
-      return key;
-   }
-
-   /**
-    * @return value of the entry
-    */
-   public String getValue() {
-      return value;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      MetadataEntry that = MetadataEntry.class.cast(o);
-      return super.equals(that) && equal(key, that.key) && equal(this.value, that.value);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), key, value);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string().add("key", key).add("value", value);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
deleted file mode 100644
index 0035046..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
+++ /dev/null
@@ -1,108 +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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Represents the owner of an entity.
- */
-@XmlRootElement(name = "Owner")
-@XmlType(name = "OwnerType")
-public class Owner extends Resource {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromOwner(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
-      private Reference user;
-
-      /**
-       * @see Owner#getUser()
-       */
-      public B user(Reference user) {
-         this.user = user;
-         return self();
-      }
-
-      @Override
-      public Owner build() {
-         return new Owner(this);
-      }
-      
-      public B fromOwner(Owner in) {
-         return fromResource(in)
-               .user(in.getUser());
-      }
-   }
-
-   protected Owner() {
-      // for JAXB
-   }
-
-   public Owner(Builder<?> builder) {
-      super(builder);
-      this.user = builder.user;
-   }
-
-   @XmlElement(name = "User", required = true)
-   private Reference user;
-
-   /**
-    * Gets the value of the user property.
-    */
-   public Reference getUser() {
-      return user;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      Owner that = Owner.class.cast(o);
-      return super.equals(that) && equal(this.user, that.user);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), user);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string().add("user", user);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java
deleted file mode 100644
index 8cb0aa4..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java
+++ /dev/null
@@ -1,201 +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.Collection;
-import java.util.Iterator;
-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.DMTFConstants;
-import org.jclouds.dmtf.ovf.ProductSection;
-
-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;
-
-@XmlRootElement(name = "ProductSectionList")
-@XmlType(name = "ProductSectionListType")
-public class ProductSectionList extends Resource implements Set<ProductSection> {
-   
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromProductSectionList(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
-      private Set<ProductSection> productSections = Sets.newLinkedHashSet();
-
-      /**
-       * @see ProductSectionList#getProductSections()
-       */
-      public B productSections(Set<ProductSection> productSections) {
-         this.productSections = Sets.newLinkedHashSet(checkNotNull(productSections, "productSections"));
-         return self();
-      }
-
-      /**
-       * @see ProductSectionList#getProductSections()
-       */
-      public B productSection(ProductSection productSection) {
-         this.productSections.add(checkNotNull(productSection, "productSection"));
-         return self();
-      }
-
-      @Override
-      public ProductSectionList build() {
-         return new ProductSectionList(this);
-      }
-
-      public B fromProductSectionList(ProductSectionList in) {
-         return fromResource(in)
-               .productSections(Sets.newLinkedHashSet(in));
-      }
-   }
-
-   protected ProductSectionList() {
-      // for JAXB
-   }
-
-   protected ProductSectionList(Builder<?> builder) {
-      super(builder);
-      this.productSections = builder.productSections != null && builder.productSections.isEmpty() ? null : builder.productSections;
-   }
-
-
-   @XmlElement(name = "ProductSection", namespace = DMTFConstants.OVF_NS)
-   private Set<ProductSection> productSections;
-
-   /**
-    * Gets the value of the productSection property.
-    */
-   public Set<ProductSection> getProductSections() {
-      return productSections != null ? ImmutableSet.copyOf(productSections) : ImmutableSet.<ProductSection>of();
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      ProductSectionList that = ProductSectionList.class.cast(o);
-      return super.equals(that)
-            && equal(this.productSections, that.productSections);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), productSections);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string().add("productSections", productSections);
-   }
-   
-   /**
-    * The delegate always returns a {@link Set} even if {@link #productSections} is {@literal null}.
-    * 
-    * The delegated {@link Set} is used by the methods implementing its interface.
-    * <p>
-    * NOTE Annoying lack of multiple inheritance for using ForwardingList!
-    */
-   private Set<ProductSection> delegate() {
-      return getProductSections();
-   }
-
-   @Override
-   public boolean add(ProductSection arg0) {
-      return delegate().add(arg0);
-   }
-
-   @Override
-   public boolean addAll(Collection<? extends ProductSection> arg0) {
-      return delegate().addAll(arg0);
-   }
-
-   @Override
-   public void clear() {
-      delegate().clear();
-   }
-
-   @Override
-   public boolean contains(Object arg0) {
-      return delegate().contains(arg0);
-   }
-
-   @Override
-   public boolean containsAll(Collection<?> arg0) {
-      return delegate().containsAll(arg0);
-   }
-
-   @Override
-   public boolean isEmpty() {
-      return delegate().isEmpty();
-   }
-
-   @Override
-   public Iterator<ProductSection> iterator() {
-      return delegate().iterator();
-   }
-
-   @Override
-   public boolean remove(Object arg0) {
-      return delegate().remove(arg0);
-   }
-
-   @Override
-   public boolean removeAll(Collection<?> arg0) {
-      return delegate().removeAll(arg0);
-   }
-
-   @Override
-   public boolean retainAll(Collection<?> arg0) {
-      return delegate().retainAll(arg0);
-   }
-
-   @Override
-   public int size() {
-      return delegate().size();
-   }
-
-   @Override
-   public Object[] toArray() {
-      return delegate().toArray();
-   }
-
-   @Override
-   public <T> T[] toArray(T[] arg0) {
-      return delegate().toArray(arg0);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Property.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Property.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Property.java
deleted file mode 100644
index 15b37f1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Property.java
+++ /dev/null
@@ -1,108 +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 javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlValue;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-
-/**
- * Contains key/value pair as property.
- */
-@XmlRootElement(name = "Property")
-public class Property {
-
-   public static final String MEDIA_TYPE = VCloudDirectorMediaType.PROPERTY;
-
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   public Builder toBuilder() {
-      return new Builder();
-   }
-
-   public static class Builder {
-
-      private String value;
-      private String key;
-
-      /**
-       * @see Property#getKey()
-       */
-      public Builder key(String key) {
-         this.key = key;
-         return this;
-      }
-
-      /**
-       * @see Property#getValue()
-       */
-      public Builder value(String value) {
-         this.value = value;
-         return this;
-      }
-
-      /**
-       * @see Property#getKey()
-       * @see Property#getValue()
-       */
-      public Builder property(String key, String value) {
-         this.key = key;
-         this.value = value;
-         return this;
-      }
-
-      public Property build() {
-         return new Property(key, value);
-      }
-
-      public Builder fromProperty(Property in) {
-         return property(in.getKey(), in.getValue());
-      }
-   }
-
-   private Property() {
-      // For JAXB
-   }
-
-   private Property(String key, String value) {
-      this.value = value;
-      this.key = key;
-   }
-
-   @XmlValue
-   private String value;
-   @XmlAttribute(required = true)
-   private String key;
-
-   /**
-    * Gets the value of the value property.
-    */
-   public String getValue() {
-      return value;
-   }
-
-   /**
-    * Gets the value of the key property.
-    */
-   public String getKey() {
-      return key;
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java
deleted file mode 100644
index 7837ffc..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java
+++ /dev/null
@@ -1,197 +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.Collection;
-import java.util.Iterator;
-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.vcloud.director.v1_5.domain.dmtf.RasdItem;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "RasdItemsList")
-@XmlType(name = "RasdItemsList")
-public class RasdItemsList extends Resource implements Set<RasdItem> {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromRasdItemsList(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
-      private Set<RasdItem> items = Sets.newLinkedHashSet();
-
-      /**
-       * @see RasdItemsList#getItems()
-       */
-      public B items(Set<RasdItem> items) {
-         this.items = checkNotNull(items, "items");
-         return self();
-      }
-
-      /**
-       * @see RasdItemsList#getItems()
-       */
-      public B item(RasdItem item) {
-         this.items.add(checkNotNull(item, "item"));
-         return self();
-      }
-
-      @Override
-      public RasdItemsList build() {
-         RasdItemsList rasdItemsList = new RasdItemsList(this);
-         return rasdItemsList;
-      }
-
-      public B fromRasdItemsList(RasdItemsList in) {
-         return fromResource(in).items(in.getItems());
-      }
-   }
-
-   protected RasdItemsList() {
-      // For JAXB and B use
-   }
-
-   protected RasdItemsList(Builder<?> builder) {
-      super(builder);
-      this.items = builder.items;
-   }
-
-   @XmlElement(name = "Item")
-   protected Set<RasdItem> items = Sets.newLinkedHashSet();
-
-   /**
-    * A RASD item content.
-    */
-   public Set<RasdItem> getItems() {
-      return items;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      RasdItemsList that = RasdItemsList.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);
-   }
-
-   /**
-    * The delegate always returns a {@link Set} even if {@link #items} is {@literal null}.
-    * 
-    * The delegated {@link Set} is used by the methods implementing its interface.
-    * <p>
-    * NOTE Annoying lack of multiple inheritance for using ForwardingList!
-    */
-   private Set<RasdItem> delegate() {
-      return getItems();
-   }
-
-   @Override
-   public boolean add(RasdItem arg0) {
-      return delegate().add(arg0);
-   }
-
-   @Override
-   public boolean addAll(Collection<? extends RasdItem> arg0) {
-      return delegate().addAll(arg0);
-   }
-
-   @Override
-   public void clear() {
-      delegate().clear();
-   }
-
-   @Override
-   public boolean contains(Object arg0) {
-      return delegate().contains(arg0);
-   }
-
-   @Override
-   public boolean containsAll(Collection<?> arg0) {
-      return delegate().containsAll(arg0);
-   }
-
-   @Override
-   public boolean isEmpty() {
-      return delegate().isEmpty();
-   }
-
-   @Override
-   public Iterator<RasdItem> iterator() {
-      return delegate().iterator();
-   }
-
-   @Override
-   public boolean remove(Object arg0) {
-      return delegate().remove(arg0);
-   }
-
-   @Override
-   public boolean removeAll(Collection<?> arg0) {
-      return delegate().removeAll(arg0);
-   }
-
-   @Override
-   public boolean retainAll(Collection<?> arg0) {
-      return delegate().retainAll(arg0);
-   }
-
-   @Override
-   public int size() {
-      return delegate().size();
-   }
-
-   @Override
-   public Object[] toArray() {
-      return delegate().toArray();
-   }
-
-   @Override
-   public <T> T[] toArray(T[] arg0) {
-      return delegate().toArray(arg0);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java
deleted file mode 100644
index 7322b60..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import java.net.URI;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * A reference to a resource.
- * 
- * <p/> Contains an href attribute and optional name and type attributes.
- */
-@XmlSeeAlso({ VAppReference.class, CatalogReference.class, RoleReference.class })
-@XmlRootElement(name = "Reference")
-@XmlType(name = "ReferenceType")
-public class Reference {
-
-   @javax.annotation.Resource
-   protected static Logger logger = Logger.NULL;
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return builder().fromReference(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-
-   public static class Builder<B extends Builder<B>> {
-
-      private URI href;
-      private String name;
-      private String type;
-
-      @SuppressWarnings("unchecked")
-      protected B self() {
-         return (B) this;
-      }
-
-      /**
-       * @see Reference#getHref()
-       */
-      public B href(URI href) {
-         this.href = href;
-         return self();
-      }
-
-      /**
-       * @see Reference#getType()
-       */
-      public B type(String type) {
-         this.type = type;
-         return self();
-      }
-
-      /**
-       * @see Reference#getName()
-       */
-      public B name(String name) {
-         this.name = name;
-         return self();
-      }
-
-      public Reference build() {
-         return new Reference(this);
-      }
-
-      public B fromReference(Reference in) {
-         return href(in.getHref()).name(in.getName()).type(in.getType());
-      }
-
-      public B fromEntity(Entity in) {
-         return href(in.getHref()).name(in.getName()).type(in.getType());
-      }
-
-      protected B fromAttributes(Map<String, String> attributes) {
-         return href(URI.create(attributes.get("href"))).name(attributes.get("name")).type(attributes.get("type"));
-      }
-   }
-
-   @XmlAttribute(required = true)
-   private URI href;
-   @XmlAttribute
-   private String name;
-   @XmlAttribute
-   private String type;
-
-   protected Reference(Builder<?> builder) {
-      this.href = builder.href;
-      this.name = builder.name;
-      this.type = builder.type;
-   }
-
-   protected Reference(URI href, String name, String type) {
-      this.href = href;
-      this.name = name;
-      this.type = type;
-   }
-
-   protected Reference() {
-      // For JAXB
-   }
-
-   /**
-    * Contains the URI to the entity.
-    * <p/>
-    * An object reference, expressed in URL format. Because this URL includes the object identifier
-    * portion of the id attribute value, it uniquely identifies the object, persists for the life of
-    * the object, and is never reused. The value of the href attribute is a reference to a view of
-    * the object, and can be used to access a representation of the object that is valid in a
-    * particular context. Although URLs have a well-known syntax and a well-understood
-    * interpretation, a api should treat each href as an opaque string. The rules that govern how
-    * the server constructs href strings might change in future releases.
-    * 
-    * @return an opaque reference and should never be parsed
-    */
-   public URI getHref() {
-      return href;
-   }
-
-   /**
-    * Contains the name of the the entity.
-    * <p/>
-    * The object type, specified as a MIME content type, of the object that the link references.
-    * This attribute is present only for links to objects. It is not present for links to actions.
-    * 
-    * @return type definition, type, expressed as an HTTP Content-Type
-    */
-   public String getName() {
-      return name;
-   }
-
-   /**
-    * Contains the type of the the entity.
-    * <p/>
-    * The object type, specified as a MIME content type, of the object that the link references.
-    * This attribute is present only for links to objects. It is not present for links to actions.
-    * 
-    * @return type definition, type, expressed as an HTTP Content-Type
-    */
-   public String getType() {
-      return type;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      Reference that = Reference.class.cast(o);
-      return equal(this.href, that.href) && equal(this.name, that.name) && equal(this.type, that.type);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(href, name, type);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   protected ToStringHelper string() {
-      return Objects.toStringHelper("").add("href", href).add("name", name).add("type", type);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java
deleted file mode 100644
index b5b52e6..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java
+++ /dev/null
@@ -1,132 +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.Set;
-
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.query.Container;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "References")
-@XmlType(propOrder = {
-    "references"
-})
-public class References extends Container {
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromReferences(this);
-   }
-   
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   public abstract static class Builder<T extends Builder<T>> extends Container.Builder<T> {
-      private Set<Reference> references;
-
-      /**
-       * @see References#getReference()
-       */
-      public T references(Set<Reference> references) {
-         this.references = references;
-         return self();
-      }
-
-      @Override
-      public References build() {
-         return new References(this);
-      }
-      
-      public T fromReferences(References in) {
-         return fromContainerType(in)
-            .references(in.getReferences());
-      }
-   }
-
-   private References(Builder<?> b) {
-      super(b);
-      this.references = b.references;
-   }
-
-
-    @XmlElementRef(name = "Reference", namespace = "http://www.vmware.com/vcloud/v1.5")
-    protected Set<Reference> references = Sets.newLinkedHashSet();
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the reference property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getReference().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}
-     * 
-     * 
-     */
-    public Set<Reference> getReferences() {
-        return this.references;
-    }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-          return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      References that = References.class.cast(o);
-      return super.equals(that) && equal(references, that.references);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), references);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string()
-            .add("references", references);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
deleted file mode 100644
index bc2c373..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
+++ /dev/null
@@ -1,199 +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.net.URI;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * The base type for all objects in the vCloud model.
- *
- * <p/> Has an optional list of links and href and type attributes.
- */
-@XmlRootElement(name = "Resource")
-@XmlType(name = "ResourceType")
-public class Resource {
-
-   @javax.annotation.Resource
-   protected static Logger logger = Logger.NULL;
-   
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return builder().fromResource(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public abstract static class Builder<B extends Builder<B>> {
-      private URI href;
-      private String type;
-      private Set<Link> links;
-
-      @SuppressWarnings("unchecked")
-      protected B self() {
-         return (B) this;
-      }
-      
-      /**
-       * @see ResourceType#getHref()
-       */
-      public B href(URI href) {
-         this.href = href;
-         return self();
-      }
-
-      /**
-       * @see ResourceType#getType()
-       */
-      public B type(String type) {
-         this.type = type;
-         return self();
-      }
-
-      /**
-       * @see ResourceType#getLinks()
-       */
-      public B links(Set<Link> links) {
-         this.links = Sets.newLinkedHashSet(checkNotNull(links, "links"));
-         return self();
-      }
-
-      /**
-       * @see ResourceType#getLinks()
-       */
-      public B link(Link link) {
-         if (links == null)
-            links = Sets.newLinkedHashSet();
-         this.links.add(checkNotNull(link, "link"));
-         return self();
-      }
-
-      public Resource build() {
-         return new Resource(this);
-      }
-
-      protected B fromResource(Resource in) {
-         return href(in.getHref()).type(in.getType()).links(Sets.newLinkedHashSet(in.getLinks()));
-      }
-   }
-
-   @XmlAttribute
-   private URI href;
-   @XmlAttribute
-   private String type;
-   @XmlElement(name = "Link")
-   private Set<Link> links = Sets.newLinkedHashSet();
-
-   protected Resource(Builder<?> builder) {
-      this.href = builder.href;
-      this.type = builder.type;
-      this.links = builder.links == null ? ImmutableSet.<Link>of() : builder.links;
-   }
-   
-   protected Resource() {
-      // For JAXB
-   }
-
-   /**
-    * Contains the URI to the entity.
-    *
-    * An object reference, expressed in URL format. Because this URL includes the object identifier
-    * portion of the id attribute value, it uniquely identifies the object, persists for the life of
-    * the object, and is never reused. The value of the href attribute is a reference to a view of
-    * the object, and can be used to access a representation of the object that is valid in a
-    * particular context. Although URLs have a well-known syntax and a well-understood
-    * interpretation, a api should treat each href as an opaque string. The rules that govern how
-    * the server constructs href strings might change in future releases.
-    *
-    * @return an opaque reference and should never be parsed
-    */
-   public URI getHref() {
-      return href;
-   }
-
-   /**
-    * Contains the type of the the entity.
-    *
-    * The object type, specified as a MIME content type, of the object that the link references.
-    * This attribute is present only for links to objects. It is not present for links to actions.
-    *
-    * @return type definition, type, expressed as an HTTP Content-Type
-    */
-   public String getType() {
-      return type;
-   }
-
-   /**
-    * Set of optional links to an entity or operation associated with this object.
-    */
-   public Set<Link> getLinks() {
-      return links == null ? ImmutableSet.<Link>of() : Collections.unmodifiableSet(links);
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      Resource that = Resource.class.cast(o);
-      return equal(this.href, that.href) && equal(this.links, that.links) && equal(this.type, that.type);
-   }
-   
-   public boolean clone(Object o) {
-      if (this == o)
-         return false;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      Resource that = Resource.class.cast(o);
-      return equal(this.type, that.type);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(href, links, type);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   protected ToStringHelper string() {
-      return Objects.toStringHelper("").add("href", href).add("links", links).add("type", type);
-   }
-}