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

[20/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/params/MediaInsertOrEjectParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java
deleted file mode 100644
index cd1e7d4..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java
+++ /dev/null
@@ -1,100 +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.params;
-
-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 org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "MediaInsertOrEjectParams")
-@XmlType(name = "MediaInsertOrEjectParamsType")
-public class MediaInsertOrEjectParams {
-
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   public Builder toBuilder() {
-      return new Builder().fromMediaInsertOrEjectParams(this);
-   }
-
-   public static class Builder {
-
-      private Reference media;
-
-      /**
-       * @see MediaInsertOrEjectParams#getMedia()
-       */
-      public Builder media(Reference media) {
-         this.media = media;
-         return this;
-      }
-
-      public MediaInsertOrEjectParams build() {
-         MediaInsertOrEjectParams mediaInsertOrEjectParams = new MediaInsertOrEjectParams(media);
-         return mediaInsertOrEjectParams;
-      }
-
-      public Builder fromMediaInsertOrEjectParams(MediaInsertOrEjectParams in) {
-         return media(in.getMedia());
-      }
-   }
-
-   protected MediaInsertOrEjectParams() {
-      // For JAXB and builder use
-   }
-
-   public MediaInsertOrEjectParams(Reference media) {
-      this.media = media;
-   }
-
-   @XmlElement(name = "Media", required = true)
-   protected Reference media;
-
-   /**
-    * Gets the value of the media property.
-    */
-   public Reference getMedia() {
-      return media;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      MediaInsertOrEjectParams that = MediaInsertOrEjectParams.class.cast(o);
-      return equal(media, that.media);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(media);
-   }
-
-   @Override
-   public String toString() {
-      return Objects.toStringHelper("").add("media", media).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/params/ParamsType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java
deleted file mode 100644
index 50d9d32..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java
+++ /dev/null
@@ -1,133 +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.params;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * A basic type used to specify parameters for operations.
- */
-@XmlType(name = "ParamsType")
-public class ParamsType {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return builder().fromParamsType(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public abstract static class Builder<B extends Builder<B>> {
-
-      private String description;
-      private String name;
-
-      @SuppressWarnings("unchecked")
-      protected B self() {
-         return (B) this;
-      }
-      
-      /**
-       * @see ParamsType#getDescription()
-       */
-      public B description(String description) {
-         this.description = description;
-         return self();
-      }
-
-      /**
-       * @see ParamsType#getName()
-       */
-      public B name(String name) {
-         this.name = name;
-         return self();
-      }
-
-      public ParamsType build() {
-         return new ParamsType(this);
-      }
-
-      public B fromParamsType(ParamsType in) {
-         return description(in.getDescription())
-               .name(in.getName());
-      }
-   }
-
-   protected ParamsType(Builder<?> builder) {
-      this.description = builder.description;
-      this.name = builder.name;
-   }
-
-   protected ParamsType() {
-      // for JAXB
-   }
-
-
-   @XmlElement(name = "Description")
-   protected String description;
-   @XmlAttribute
-   protected String name;
-
-   /**
-    * Optional description.
-    */
-   public String getDescription() {
-      return description;
-   }
-
-   /**
-    * A name as parameter.
-    */
-   public String getName() {
-      return name;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      ParamsType that = ParamsType.class.cast(o);
-      return equal(this.description, that.description) && equal(this.name, that.name);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(description, name);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   public ToStringHelper string() {
-      return Objects.toStringHelper("").add("description", description).add("name", name);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java
deleted file mode 100644
index e6da358..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java
+++ /dev/null
@@ -1,104 +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.params;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "PublishCatalogParams")
-@XmlType(propOrder = {
-    "isPublished"
-})
-//TODO: this is ridiculously complex boolean wrapper.
-public class PublishCatalogParams {
-   
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   public Builder toBuilder() {
-      return new Builder().fromPublishCatalogParams(this);
-   }
-
-   public static class Builder {
-      
-      private boolean isPublished;
-
-      /**
-       * @see PublishCatalogParams#getIsPublished()
-       */
-      public Builder isPublished(boolean isPublished) {
-         this.isPublished = isPublished;
-         return this;
-      }
-
-      public PublishCatalogParams build() {
-         return new PublishCatalogParams(isPublished);
-      }
-
-      public Builder fromPublishCatalogParams(PublishCatalogParams in) {
-         return isPublished(in.isPublished());
-      }
-   }
-
-   @SuppressWarnings("unused")
-   private PublishCatalogParams() {
-      // For JAXB and builder use
-   }
-   
-   public PublishCatalogParams(Boolean isPublished) {
-      this.isPublished = isPublished;
-   }
-
-    @XmlElement(name = "IsPublished")
-    protected boolean isPublished;
-
-    /**
-     * Gets the value of the isPublished property.
-     * 
-     */
-    public boolean isPublished() {
-        return isPublished;
-    }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-          return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      PublishCatalogParams that = PublishCatalogParams.class.cast(o);
-      return equal(isPublished, that.isPublished);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(isPublished);
-   }
-
-   @Override
-   public String toString() {
-      return Objects.toStringHelper("")
-            .add("isPublished", isPublished).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/params/RecomposeVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java
deleted file mode 100644
index f42a385..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java
+++ /dev/null
@@ -1,137 +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.params;
-
-import static com.google.common.base.Objects.equal;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.Lists;
-
-@XmlRootElement(name = "RecomposeVAppParams")
-@XmlType(name = "RecomposeVAppParamsType")
-public class RecomposeVAppParams extends ComposeVAppParams {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromRecomposeVAppParams(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public abstract static class Builder<B extends Builder<B>> extends ComposeVAppParams.Builder<B> {
-
-      private List<Vm> createItem;
-      private List<Reference> removeItem;
-
-      /**
-       * @see RecomposeVAppParams#getCreateItem()
-       */
-      public B createItem(List<Vm> createItem) {
-         this.createItem = createItem;
-         return self();
-      }
-
-      /**
-       * @see RecomposeVAppParams#getDeleteItem()
-       */
-      public B removeItem(List<Reference> removeItem) {
-         this.removeItem = removeItem;
-         return self();
-      }
-
-      @Override
-      public RecomposeVAppParams build() {
-         return new RecomposeVAppParams(this);
-      }
-
-      public B fromRecomposeVAppParams(RecomposeVAppParams in) {
-         return fromComposeVAppParams(in).createItem(in.getCreateItem()).removeItem(in.getDeleteItem());
-      }
-   }
-
-   private RecomposeVAppParams() {
-      // For JAXB and B use
-   }
-
-   private RecomposeVAppParams(Builder<?> builder) {
-      super(builder);
-      this.createItem = builder.createItem;
-      this.removeItem = builder.removeItem;
-   }
-
-   @XmlElement(name = "CreateItem")
-   protected List<Vm> createItem;
-   @XmlElement(name = "DeleteItem")
-   protected List<Reference> removeItem;
-
-   /**
-    * Gets the value of the createItem property.
-    */
-   public List<Vm> getCreateItem() {
-      if (createItem == null) {
-         createItem = Lists.newArrayList();
-      }
-      return this.createItem;
-   }
-
-   /**
-    * Gets the value of the removeItem property.
-    */
-   public List<Reference> getDeleteItem() {
-      if (removeItem == null) {
-         removeItem = Lists.newArrayList();
-      }
-      return this.removeItem;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      RecomposeVAppParams that = RecomposeVAppParams.class.cast(o);
-      return super.equals(that) &&
-            equal(this.createItem, that.createItem) && equal(this.removeItem, that.removeItem);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), createItem, removeItem);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string().add("createItem", createItem).add("removeItem", removeItem);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java
deleted file mode 100644
index 19462c4..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java
+++ /dev/null
@@ -1,93 +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.params;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "RelocateParams")
-@XmlType(propOrder = {
-      "datastore"
-})
-public class RelocateParams {
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   public static class Builder {
-      private Reference datastore;
-
-      public Builder datastore(Reference dataStore) {
-         this.datastore = dataStore;
-         return this;
-      }
-
-      public RelocateParams build() {
-         return new RelocateParams(datastore);
-      }
-   }
-
-   @XmlElement(name = "Datastore", required = true)
-   private Reference datastore;
-
-   private RelocateParams(Reference datastore) {
-      this.datastore = checkNotNull(datastore);
-   }
-   
-   private RelocateParams() {
-      // for JAXB
-   }
-
-   /**
-    * Gets the value of the datastore property.
-    *
-    * @return possible object is
-    *         {@link Reference }
-    */
-   public Reference getDatastore() {
-      return datastore;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      RelocateParams that = RelocateParams.class.cast(o);
-      return equal(datastore, that.datastore);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(datastore);
-   }
-
-   @Override
-   public String toString() {
-      return Objects.toStringHelper("")
-            .add("datastore", datastore).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/params/SourcedCompositionItemParam.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java
deleted file mode 100644
index f53fedc..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java
+++ /dev/null
@@ -1,217 +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.params;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkAssignment;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlType(name = "SourcedCompositionItemParam", propOrder = {
-      "source",
-      "vAppScopedLocalId",
-      "instantiationParams",
-      "networkAssignment"
-})
-public class SourcedCompositionItemParam {
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   public Builder toBuilder() {
-      return new Builder().fromSourcedCompositionItemParam(this);
-   }
-
-   public static class Builder {
-
-      private Reference source;
-      private String vAppScopedLocalId;
-      private InstantiationParams instantiationParams;
-      private Set<NetworkAssignment> networkAssignment = Sets.newLinkedHashSet();
-      private Boolean sourceDelete;
-
-      /**
-       * @see SourcedCompositionItemParam#getSource()
-       */
-      public Builder source(Reference source) {
-         this.source = source;
-         return this;
-      }
-
-      /**
-       * @see SourcedCompositionItemParam#getVAppScopedLocalId()
-       */
-      public Builder vAppScopedLocalId(String vAppScopedLocalId) {
-         this.vAppScopedLocalId = vAppScopedLocalId;
-         return this;
-      }
-
-      /**
-       * @see SourcedCompositionItemParam#getInstantiationParams()
-       */
-      public Builder instantiationParams(InstantiationParams instantiationParams) {
-         this.instantiationParams = instantiationParams;
-         return this;
-      }
-
-      /**
-       * @see SourcedCompositionItemParam#getNetworkAssignment()
-       */
-      public Builder networkAssignment(Set<NetworkAssignment> networkAssignment) {
-         this.networkAssignment = ImmutableSet.copyOf(checkNotNull(networkAssignment, "networkAssignments"));
-         return this;
-      }
-
-      /**
-       * @see SourcedCompositionItemParam#isSourceDelete()
-       */
-      public Builder sourceDelete(Boolean sourceDelete) {
-         this.sourceDelete = sourceDelete;
-         return this;
-      }
-
-      public SourcedCompositionItemParam build() {
-         return new SourcedCompositionItemParam(source, vAppScopedLocalId, instantiationParams, networkAssignment, sourceDelete);
-      }
-
-      public Builder fromSourcedCompositionItemParam(SourcedCompositionItemParam in) {
-         return source(in.getSource())
-               .vAppScopedLocalId(in.getVAppScopedLocalId())
-               .instantiationParams(in.getInstantiationParams())
-               .networkAssignment(in.getNetworkAssignment())
-               .sourceDelete(in.isSourceDelete());
-      }
-   }
-
-   public SourcedCompositionItemParam(Reference source, String vAppScopedLocalId, InstantiationParams instantiationParams,
-                                      Set<NetworkAssignment> networkAssignment, Boolean sourceDelete) {
-      this.source = source;
-      this.vAppScopedLocalId = vAppScopedLocalId;
-      this.instantiationParams = instantiationParams;
-      this.networkAssignment = ImmutableSet.copyOf(networkAssignment);
-      this.sourceDelete = sourceDelete;
-   }
-
-   SourcedCompositionItemParam() {
-      // for JAXB
-   }
-
-   @XmlElement(name = "Source", required = true)
-   protected Reference source;
-   @XmlElement(name = "VAppScopedLocalId")
-   protected String vAppScopedLocalId;
-   @XmlElement(name = "InstantiationParams")
-   protected InstantiationParams instantiationParams;
-   @XmlElement(name = "NetworkAssignment")
-   protected Set<NetworkAssignment> networkAssignment = Sets.newLinkedHashSet();
-   @XmlAttribute
-   protected Boolean sourceDelete;
-
-   /**
-    * Gets the value of the source property.
-    *
-    * @return possible object is
-    *         {@link Reference }
-    */
-   public Reference getSource() {
-      return source;
-   }
-
-
-   /**
-    * Gets the value of the vAppScopedLocalId property.
-    *
-    * @return possible object is
-    *         {@link String }
-    */
-   public String getVAppScopedLocalId() {
-      return vAppScopedLocalId;
-   }
-
-   /**
-    * Gets the value of the instantiationParams property.
-    *
-    * @return possible object is
-    *         {@link InstantiationParams }
-    */
-   public InstantiationParams getInstantiationParams() {
-      return instantiationParams;
-   }
-
-   /**
-    * Gets the value of the networkAssignment property.
-    */
-   public Set<NetworkAssignment> getNetworkAssignment() {
-      return Collections.unmodifiableSet(this.networkAssignment);
-   }
-
-   /**
-    * Gets the value of the sourceDelete property.
-    *
-    * @return possible object is
-    *         {@link Boolean }
-    */
-   public Boolean isSourceDelete() {
-      return sourceDelete;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      SourcedCompositionItemParam that = SourcedCompositionItemParam.class.cast(o);
-      return equal(source, that.source) &&
-            equal(vAppScopedLocalId, that.vAppScopedLocalId) &&
-            equal(instantiationParams, that.instantiationParams) &&
-            equal(networkAssignment, that.networkAssignment) &&
-            equal(sourceDelete, that.sourceDelete);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(source,
-            vAppScopedLocalId,
-            instantiationParams,
-            networkAssignment,
-            sourceDelete);
-   }
-
-   @Override
-   public String toString() {
-      return Objects.toStringHelper("")
-            .add("source", source)
-            .add("vAppScopedLocalId", vAppScopedLocalId)
-            .add("instantiationParams", instantiationParams)
-            .add("networkAssignment", networkAssignment)
-            .add("sourceDelete", sourceDelete).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/params/UndeployVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java
deleted file mode 100644
index e8ddb01..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java
+++ /dev/null
@@ -1,165 +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.params;
-
-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.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 org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-@XmlRootElement(name = "UndeployVAppParams")
-@XmlType(name = "UndeployVAppParamsType")
-public class UndeployVAppParams {
-   
-   public static final String MEDIA_TYPE = VCloudDirectorMediaType.UNDEPLOY_VAPP_PARAMS;
-   
-   @XmlType
-   @XmlEnum(String.class)
-   public static enum PowerAction {
-      @XmlEnumValue("powerOff") POWER_OFF("powerOff"),
-      @XmlEnumValue("suspend") SUSPEND("suspend"),
-      @XmlEnumValue("shutdown") SHUTDOWN("shutdown"),
-      @XmlEnumValue("force") FORCE("force"),
-      @XmlEnumValue("") UNRECOGNIZED("unrecognized");
-      
-      public static final List<PowerAction> ALL = ImmutableList.of( POWER_OFF, SUSPEND, SHUTDOWN, FORCE );
-
-      protected final String stringValue;
-
-      PowerAction(String stringValue) {
-         this.stringValue = stringValue;
-      }
-
-      public String value() {
-         return stringValue;
-      }
-
-      protected static final Map<String, PowerAction> POWER_ACTION_BY_ID = Maps.uniqueIndex(
-            ImmutableSet.copyOf(PowerAction.values()), new Function<PowerAction, String>() {
-               @Override
-               public String apply(PowerAction input) {
-                  return input.stringValue;
-               }
-            });
-
-      public static PowerAction fromValue(String value) {
-         PowerAction action = POWER_ACTION_BY_ID.get(checkNotNull(value, "stringValue"));
-         return action == null ? UNRECOGNIZED : action;
-      }
-   }
-
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   public Builder toBuilder() {
-      return new Builder().fromUndeployVAppParams(this);
-   }
-
-   public static class Builder {
-
-      private PowerAction undeployPowerAction;
-
-      /**
-       * @see UndeployVAppParams#getUndeployPowerAction()
-       */
-      public Builder undeployPowerAction(PowerAction undeployPowerAction) {
-         this.undeployPowerAction = undeployPowerAction;
-         return this;
-      }
-
-      /**
-       * @see UndeployVAppParams#getUndeployPowerAction()
-       */
-      public Builder undeployPowerAction(String undeployPowerAction) {
-         this.undeployPowerAction = PowerAction.valueOf(undeployPowerAction);
-         return this;
-      }
-
-      public UndeployVAppParams build() {
-         UndeployVAppParams undeployVAppParams = new UndeployVAppParams();
-         undeployVAppParams.undeployPowerAction = undeployPowerAction;
-         return undeployVAppParams;
-      }
-
-      public Builder fromUndeployVAppParams(UndeployVAppParams in) {
-         return undeployPowerAction(in.getUndeployPowerAction());
-      }
-   }
-
-   private UndeployVAppParams() {
-      // For JAXB and builder use
-   }
-
-   @XmlElement(name = "UndeployPowerAction")
-   protected PowerAction undeployPowerAction;
-
-   /**
-    * The specified action is applied to all VMs in the vApp.
-    *
-    * All values other than {@code default} ignore actions, order, and delay specified in the StartupSection. One of:
-    * <ul>
-    *    <li>{@link PowerAction#POWER_OFF powerOff}
-    *    <li>{@link PowerAction#SUSPEND suspend}
-    *    <li>{@link PowerAction#SHUTDOWN shutdown}
-    *    <li>{@link PowerAction#FORCE force}
-    * </ul>
-    * Failures in undeploying the VM or associated networks are ignored. All references to the vApp and its VMs are
-    * removed from the database), default (Use the actions, order, and delay specified in the StartupSection).
-    *
-    * @since 1.5
-    */
-   public PowerAction getUndeployPowerAction() {
-      return undeployPowerAction;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      UndeployVAppParams that = UndeployVAppParams.class.cast(o);
-      return equal(undeployPowerAction, that.undeployPowerAction);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(undeployPowerAction);
-   }
-
-   @Override
-   public String toString() {
-      return Objects.toStringHelper("").add("undeployPowerAction", undeployPowerAction).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/params/UploadVAppTemplateParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java
deleted file mode 100644
index 0dd54e7..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java
+++ /dev/null
@@ -1,136 +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.params;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "UploadVAppTemplateParams")
-@XmlType(name = "UploadVAppTemplateParamsType")
-public class UploadVAppTemplateParams extends ParamsType {
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromUploadVAppTemplateParams(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public abstract static class Builder<B extends Builder<B>> extends ParamsType.Builder<B> {
-
-      private String transferFormat;
-      private Boolean manifestRequired;
-
-      /**
-       * @see UploadVAppTemplateParams#getTransferFormat()
-       */
-      public B transferFormat(String transferFormat) {
-         this.transferFormat = transferFormat;
-         return self();
-      }
-
-      /**
-       * @see UploadVAppTemplateParams#isManifestRequired()
-       */
-      public B manifestRequired(Boolean manifestRequired) {
-         this.manifestRequired = manifestRequired;
-         return self();
-      }
-
-
-      @Override
-      public UploadVAppTemplateParams build() {
-         return new UploadVAppTemplateParams(this);
-      }
-
-      public B fromUploadVAppTemplateParams(UploadVAppTemplateParams in) {
-         return fromParamsType(in)
-               .transferFormat(in.getTransferFormat())
-               .manifestRequired(in.isManifestRequired());
-      }
-   }
-
-   public UploadVAppTemplateParams(Builder<?> builder) {
-      super(builder);
-      this.transferFormat = builder.transferFormat;
-      this.manifestRequired = builder.manifestRequired;
-   }
-
-   protected UploadVAppTemplateParams() {
-      // For JAXB
-   }
-
-
-   @XmlAttribute
-   protected String transferFormat;
-   @XmlAttribute
-   protected Boolean manifestRequired;
-
-   /**
-    * Gets the value of the transferFormat property.
-    *
-    * @return possible object is
-    *         {@link String }
-    */
-   public String getTransferFormat() {
-      return transferFormat;
-   }
-
-   /**
-    * Gets the value of the manifestRequired property.
-    *
-    * @return possible object is
-    *         {@link Boolean }
-    */
-   public Boolean isManifestRequired() {
-      return manifestRequired;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      UploadVAppTemplateParams that = UploadVAppTemplateParams.class.cast(o);
-      return equal(transferFormat, that.transferFormat) &&
-            equal(manifestRequired, that.manifestRequired);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(transferFormat,
-            manifestRequired);
-   }
-
-   @Override
-   public String toString() {
-      return Objects.toStringHelper("")
-            .add("transferFormat", transferFormat)
-            .add("manifestRequired", manifestRequired).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/params/VAppCreationParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java
deleted file mode 100644
index 221caa4..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.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.params;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "VAppCreationParams")
-@XmlType(name = "VAppCreationParamsType")
-public class VAppCreationParams extends ParamsType {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromVAppCreationParamsType(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public abstract static class Builder<B extends Builder<B>> extends ParamsType.Builder<B> {
-
-      private Reference vAppParent;
-      private InstantiationParams instantiationParams;
-      private Boolean deploy;
-      private Boolean powerOn;
-
-      /**
-       * @see VAppCreationParamsType#getVAppParent()
-       */
-      public B vAppParent(Reference vAppParent) {
-         this.vAppParent = vAppParent;
-         return self();
-      }
-
-      /**
-       * @see VAppCreationParamsType#getInstantiationParams()
-       */
-      public B instantiationParams(InstantiationParams instantiationParams) {
-         this.instantiationParams = instantiationParams;
-         return self();
-      }
-
-      /**
-       * @see VAppCreationParamsType#isDeploy()
-       */
-      public B deploy(Boolean deploy) {
-         this.deploy = deploy;
-         return self();
-      }
-
-      /**
-       * @see VAppCreationParamsType#isDeploy()
-       */
-      public B deploy() {
-         this.deploy = Boolean.TRUE;
-         return self();
-      }
-
-      /**
-       * @see VAppCreationParamsType#isDeploy()
-       */
-      public B notDeploy() {
-         this.deploy = Boolean.FALSE;
-         return self();
-      }
-
-      /**
-       * @see VAppCreationParamsType#isPowerOn()
-       */
-      public B powerOn(Boolean powerOn) {
-         this.powerOn = powerOn;
-         return self();
-      }
-
-      /**
-       * @see VAppCreationParamsType#isPowerOn()
-       */
-      public B powerOn() {
-         this.powerOn = Boolean.TRUE;
-         return self();
-      }
-
-      /**
-       * @see VAppCreationParamsType#isPowerOn()
-       */
-      public B notPowerOn() {
-         this.powerOn = Boolean.FALSE;
-         return self();
-      }
-      
-      public B fromVAppCreationParamsType(VAppCreationParams in) {
-         return fromParamsType(in).vAppParent(in.getVAppParent()).instantiationParams(in.getInstantiationParams()).deploy(in.isDeploy()).powerOn(in.isPowerOn());
-      }
-   }
-
-   protected VAppCreationParams() {
-      // For JAXB and B use
-   }
-
-   public VAppCreationParams(Builder<?> builder) {
-      super(builder);
-      this.vAppParent = builder.vAppParent;
-      this.instantiationParams = builder.instantiationParams;
-      this.deploy = builder.deploy;
-      this.powerOn = builder.powerOn;
-   }
-
-   @XmlElement(name = "VAppParent")
-   protected Reference vAppParent;
-   @XmlElement(name = "InstantiationParams")
-   protected InstantiationParams instantiationParams;
-   @XmlAttribute
-   protected Boolean deploy;
-   @XmlAttribute
-   protected Boolean powerOn;
-
-   /**
-    * Reserved.
-    *
-    * Unimplemented.
-    */
-   public Reference getVAppParent() {
-      return vAppParent;
-   }
-
-   /**
-    * Instantiation parameters of a VApp.
-    */
-   public InstantiationParams getInstantiationParams() {
-      return instantiationParams;
-   }
-
-   /**
-    * Flag to deploy the VApp after successful creation.
-    */
-   public Boolean isDeploy() {
-      return deploy;
-   }
-
-   /**
-    * Flag to deploy and power on the VApp after successful creation.
-    */
-   public Boolean isPowerOn() {
-      return powerOn;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      VAppCreationParams that = VAppCreationParams.class.cast(o);
-      return super.equals(that) &&
-            equal(vAppParent, that.vAppParent) &&
-            equal(instantiationParams, that.instantiationParams) &&
-            equal(deploy, that.deploy) &&
-            equal(powerOn, that.powerOn);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), vAppParent, instantiationParams, deploy, powerOn);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return Objects.toStringHelper("")
-            .add("vAppParent", vAppParent)
-            .add("instantiationParams", instantiationParams)
-            .add("deploy", deploy)
-            .add("powerOn", powerOn);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/package-info.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/package-info.java
deleted file mode 100644
index c83b00d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/package-info.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-@XmlSchema(namespace = VCLOUD_1_5_NS,
-      elementFormDefault = XmlNsForm.QUALIFIED,
-      xmlns = {
-            @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS)
-      }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.vcloud.director.v1_5.domain.params;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java
deleted file mode 100644
index 5fe4014..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java
+++ /dev/null
@@ -1,67 +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.query;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "CatalogReferences")
-public class CatalogReferences extends QueryResultReferences {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromCatalogReferences(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public static class Builder<B extends Builder<B>> extends QueryResultReferences.Builder<B> {
-
-      @Override
-      public CatalogReferences build() {
-         return new CatalogReferences(this);
-      }
-
-      public B fromCatalogReferences(CatalogReferences in) {
-         return fromQueryResultReferences(in);
-      }
-   }
-
-   protected CatalogReferences(Builder<?> builder) {
-      super(builder);
-   }
-
-   protected CatalogReferences() {
-      // for JAXB
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      CatalogReferences that = CatalogReferences.class.cast(o);
-      return super.equals(that);
-   }
-   
-   // NOTE hashcode inherited from QueryResultReferences
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java
deleted file mode 100644
index 67cb49f..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java
+++ /dev/null
@@ -1,165 +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.query;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Container for query result sets.
- */
-public class Container extends Resource {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromContainerType(this);
-   }
-
-   public static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
-      private String name;
-      private Integer page;
-      private Integer pageSize;
-      private Long total;
-
-      /**
-       * @see Container#getName()
-       */
-      public B name(String name) {
-         this.name = name;
-         return self();
-      }
-
-      /**
-       * @see Container#getPage()
-       */
-      public B page(Integer page) {
-         this.page = page;
-         return self();
-      }
-
-      /**
-       * @see Container#getPageSize()
-       */
-      public B pageSize(Integer pageSize) {
-         this.pageSize = pageSize;
-         return self();
-      }
-
-      /**
-       * @see Container#getTotal()
-       */
-      public B total(Long total) {
-         this.total = total;
-         return self();
-      }
-
-      @Override
-      public Container build() {
-         return new Container(this);
-      }
-
-      public B fromContainerType(Container in) {
-         return fromResource(in).name(in.getName()).page(in.getPage()).pageSize(in.getPageSize()).total(in.getTotal());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   @XmlAttribute
-   private String name;
-   @XmlAttribute
-   private Integer page;
-   @XmlAttribute
-   private Integer pageSize;
-   @XmlAttribute
-   private Long total;
-
-   protected Container(Builder<?> builder) {
-      super(builder);
-      this.name = builder.name;
-      this.page = builder.page;
-      this.pageSize = builder.pageSize;
-      this.total = builder.total;
-   }
-
-   protected Container() {
-      // for JAXB
-   }
-
-   /**
-    * Query name that generated this result set.
-    */
-   public String getName() {
-      return name;
-   }
-
-   /**
-    * Page of the result set that this container holds. The first page is page number 1.
-    */
-   public Integer getPage() {
-      return page;
-   }
-
-   /**
-    * Page size, as a number of records or references.
-    */
-   public Integer getPageSize() {
-      return pageSize;
-   }
-
-   /**
-    * Total number of records or references in the container.
-    */
-   public Long getTotal() {
-      return total;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      Container that = Container.class.cast(o);
-      return super.equals(that) &&
-            equal(this.name, that.name) && equal(this.page, that.page) &&
-            equal(this.pageSize, that.pageSize) && equal(this.total, that.total);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), name, page, pageSize, total);
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string().add("name", name).add("page", page).add("pageSize", pageSize).add("total", total);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java
deleted file mode 100644
index 7f7ef92..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java
+++ /dev/null
@@ -1,84 +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.query;
-
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Container for the list of typed queries available to the
- * requesting user.
- */
-@XmlType(name = "QueryList")
-public class QueryList extends Container {
-
-   // FIXME Should this class have fields?!
-   
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromQueryList(this);
-   }
-
-   public static class Builder<B extends Builder<B>> extends Container.Builder<B> {
-
-      @Override
-      public QueryList build() {
-         return new QueryList(this);
-      }
-
-      public Builder<?> fromQueryList(QueryList in) {
-         return fromContainerType(in);
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   QueryList() {
-      // for JAXB
-   }
-
-   protected QueryList(Builder<?> builder) {
-      super(builder);
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      QueryList that = QueryList.class.cast(o);
-      return super.equals(that);
-   }
-
-   @Override
-   public int hashCode() {
-      return super.hashCode();
-   }
-
-   @Override
-   public ToStringHelper string() {
-      return super.string();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java
deleted file mode 100644
index 67f37d5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java
+++ /dev/null
@@ -1,167 +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.query;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "GroupRecord")
-@XmlType(name = "QueryResultAdminGroupRecordType")
-public class QueryResultAdminGroupRecord extends QueryResultRecord {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromQueryResultAdminGroupRecord(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-
-   public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
-      private String name;
-      private String org;
-      private String roleName;
-      private Boolean isReadOnly;
-
-      /**
-       * @see QueryResultAdminGroupRecord#getName()
-       */
-      public B name(String val) {
-         this.name = val;
-         return self();
-      }
-
-      /**
-       * @see QueryResultAdminGroupRecord#get()
-       */
-      public B org(String val) {
-         this.org = val;
-         return self();
-      }
-
-      /**
-       * @see QueryResultAdminGroupRecord#getRoleName()
-       */
-      public B roleName(String val) {
-         this.roleName = val;
-         return self();
-      }
-
-      /**
-       * @see QueryResultAdminGroupRecord#isReadOnly()
-       */
-      public B isReadOnly(Boolean val) {
-         this.isReadOnly = val;
-         return self();
-      }
-
-      @Override
-      public QueryResultAdminGroupRecord build() {
-         return new QueryResultAdminGroupRecord(this);
-      }
-
-      public B fromQueryResultAdminGroupRecord(QueryResultAdminGroupRecord in) {
-         return fromQueryResultRecordType(in)
-                  .name(in.getName())
-                  .org(in.get())
-                  .roleName(in.getRoleName())
-                  .isReadOnly(in.isReadOnly());
-      }
-
-   }
-
-   @XmlAttribute
-   private String name;
-   @XmlAttribute
-   private String org;
-   @XmlAttribute
-   private String roleName;
-   @XmlAttribute
-   private Boolean isReadOnly;
-
-   protected QueryResultAdminGroupRecord(Builder<?> builder) {
-      super(builder);
-      this.name = builder.name;
-      this.org = builder.org;
-      this.roleName = builder.roleName;
-      this.isReadOnly = builder.isReadOnly;
-   }
-
-   protected QueryResultAdminGroupRecord() {
-      // for JAXB
-   }
-
-   /**
-    * name
-    */
-   public String getName() {
-      return name;
-   }
-
-   /**
-    * Organization reference or id
-    */
-   public String get() {
-      return org;
-   }
-
-   /**
-    * Role name
-    */
-   public String getRoleName() {
-      return roleName;
-   }
-
-   /**
-    * Shows whether it is read only
-    */
-   public Boolean isReadOnly() {
-      return isReadOnly;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      QueryResultAdminGroupRecord that = QueryResultAdminGroupRecord.class.cast(o);
-
-      return super.equals(that) && equal(name, that.name) && equal(org, that.org) && equal(roleName, that.roleName) && 
-               equal(isReadOnly, that.isReadOnly);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), name, org, roleName, isReadOnly);
-   }
-   @Override
-   public ToStringHelper string() {
-      return super.string().add("name", name).add("org", org).add("roleName", roleName).add("isReadOnly", isReadOnly);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java
deleted file mode 100644
index d17ed0b..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java
+++ /dev/null
@@ -1,314 +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.query;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "UserRecord")
-@XmlType(name = "QueryResultAdminUserRecordType")
-public class QueryResultAdminUserRecord extends QueryResultRecord {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   @Override
-   public Builder<?> toBuilder() {
-      return builder().fromQueryResultAdminUserRecord(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-
-   public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
-      private String name;
-      private String org;
-      private String fullName;
-      private Boolean isEnabled;
-      private Integer numberOfDeployedVMs;
-      private Integer deployedVMQuota;
-      private Integer numberOfStoredVMs;
-      private Integer storedVMQuota;
-      private Boolean isLdapUser;
-      private Integer deployedVMQuotaRank;
-      private Integer storedVMQuotaRank;
-
-      /**
-       * @see QueryResultAdminUserRecord#getName()
-       */
-      public B name(String val) {
-         this.name = val;
-         return self();
-      }
-
-      /**
-       * @see QueryResultAdminUserRecord#get()
-       */
-      public B org(String val) {
-         this.org = val;
-         return self();
-      }
-
-      /**
-       * @see QueryResultAdminUserRecord#getFullName()
-       */
-      public B fullName(String val) {
-         this.fullName = val;
-         return self();
-      }
-
-      /**
-       * @see QueryResultAdminUserRecord#isEnabled()
-       */
-      public B isEnabled(Boolean val) {
-         this.isEnabled = val;
-         return self();
-      }
-
-      /**
-       * @see QueryResultAdminUserRecord#getNumberOfDeployedVMs()
-       */
-      public B numberOfDeployedVMs(Integer val) {
-         this.numberOfDeployedVMs = val;
-         return self();
-      }
-
-      /**
-       * @see QueryResultAdminUserRecord#getDeployedVMQuota()
-       */
-      public B deployedVMQuota(Integer val) {
-         this.deployedVMQuota = val;
-         return self();
-      }
-
-      /**
-       * @see QueryResultAdminUserRecord#getNumberOfStoredVMs()
-       */
-      public B numberOfStoredVMs(Integer val) {
-         this.numberOfStoredVMs = val;
-         return self();
-      }
-
-      /**
-       * @see QueryResultAdminUserRecord#getStoredVMQuota()
-       */
-      public B storedVMQuota(Integer val) {
-         this.storedVMQuota = val;
-         return self();
-      }
-
-      /**
-       * @see QueryResultAdminUserRecord#isLdapUser()
-       */
-      public B isLdapUser(Boolean val) {
-         this.isLdapUser = val;
-         return self();
-      }
-
-      /**
-       * @see QueryResultAdminUserRecord#getDeployedVMQuotaRank()
-       */
-      public B deployedVMQuotaRank(Integer val) {
-         this.deployedVMQuotaRank = val;
-         return self();
-      }
-
-      /**
-       * @see QueryResultAdminUserRecord#getStoredVMQuotaRank()
-       */
-      public B storedVMQuotaRank(Integer val) {
-         this.storedVMQuotaRank = val;
-         return self();
-      }
-
-      @Override
-      public QueryResultAdminUserRecord build() {
-         return new QueryResultAdminUserRecord(this);
-      }
-
-      public B fromQueryResultAdminUserRecord(QueryResultAdminUserRecord in) {
-         return fromQueryResultRecordType(in)
-                  .name(in.getName())
-                  .org(in.get())
-                  .fullName(in.getFullName())
-                  .isEnabled(in.isEnabled())
-                  .numberOfDeployedVMs(in.getNumberOfDeployedVMs())
-                  .deployedVMQuota(in.getDeployedVMQuota())
-                  .numberOfStoredVMs(in.getNumberOfStoredVMs())
-                  .storedVMQuota(in.getStoredVMQuota())
-                  .isLdapUser(in.isLdapUser())
-                  .deployedVMQuotaRank(in.getDeployedVMQuotaRank())
-                  .storedVMQuotaRank(in.getStoredVMQuotaRank());
-      }
-
-   }
-
-   @XmlAttribute
-   private String name;
-   @XmlAttribute
-   private String org;
-   @XmlAttribute
-   private String fullName;
-   @XmlAttribute
-   private Boolean isEnabled;
-   @XmlAttribute
-   private Integer numberOfDeployedVMs;
-   @XmlAttribute
-   private Integer deployedVMQuota;
-   @XmlAttribute
-   private Integer numberOfStoredVMs;
-   @XmlAttribute
-   private Integer storedVMQuota;
-   @XmlAttribute
-   private Boolean isLdapUser;
-   @XmlAttribute
-   private Integer deployedVMQuotaRank;
-   @XmlAttribute
-   private Integer storedVMQuotaRank;
-
-   protected QueryResultAdminUserRecord(Builder<?> builder) {
-      super(builder);
-      this.name = builder.name;
-      this.org = builder.org;
-      this.fullName = builder.fullName;
-      this.isEnabled = builder.isEnabled;
-      this.numberOfDeployedVMs = builder.numberOfDeployedVMs;
-      this.deployedVMQuota = builder.deployedVMQuota;
-      this.numberOfStoredVMs = builder.numberOfStoredVMs;
-      this.storedVMQuota = builder.storedVMQuota;
-      this.isLdapUser = builder.isLdapUser;
-      this.deployedVMQuotaRank = builder.deployedVMQuotaRank;
-      this.storedVMQuotaRank = builder.storedVMQuotaRank;
-   }
-
-   protected QueryResultAdminUserRecord() {
-      // for JAXB
-   }
-
-   /**
-    * name
-    */
-   public String getName() {
-      return name;
-   }
-
-   /**
-    * Organization reference or id
-    */
-   public String get() {
-      return org;
-   }
-
-   /**
-    * Full name
-    */
-   public String getFullName() {
-      return fullName;
-   }
-
-   /**
-    * Shows whether it is enabled
-    */
-   public Boolean isEnabled() {
-      return isEnabled;
-   }
-
-   /**
-    * Number of deployed VMs
-    */
-   public Integer getNumberOfDeployedVMs() {
-      return numberOfDeployedVMs;
-   }
-
-   /**
-    * Deployed VM quota
-    */
-   public Integer getDeployedVMQuota() {
-      return deployedVMQuota;
-   }
-
-   /**
-    * Number of stored VMs
-    */
-   public Integer getNumberOfStoredVMs() {
-      return numberOfStoredVMs;
-   }
-
-   /**
-    * Stored VM Quota
-    */
-   public Integer getStoredVMQuota() {
-      return storedVMQuota;
-   }
-
-   /**
-    * Shows if the user was imported from LDAP
-    */
-   public Boolean isLdapUser() {
-      return isLdapUser;
-   }
-
-   /**
-    * Deployed VM quota rank
-    */
-   public Integer getDeployedVMQuotaRank() {
-      return deployedVMQuotaRank;
-   }
-
-   /**
-    * Stored VM Quota rank
-    */
-   public Integer getStoredVMQuotaRank() {
-      return storedVMQuotaRank;
-   }
-
-   @Override
-   public boolean equals(Object o) {
-      if (this == o)
-         return true;
-      if (o == null || getClass() != o.getClass())
-         return false;
-      QueryResultAdminUserRecord that = QueryResultAdminUserRecord.class.cast(o);
-
-      return super.equals(that) && equal(name, that.name) && equal(org, that.org) && equal(fullName, that.fullName) 
-                && equal(isEnabled, that.isEnabled) && equal(numberOfDeployedVMs, that.numberOfDeployedVMs) 
-                && equal(deployedVMQuota, that.deployedVMQuota) && equal(numberOfStoredVMs, that.numberOfStoredVMs) 
-                && equal(storedVMQuota, that.storedVMQuota) && equal(isLdapUser, that.isLdapUser) 
-                && equal(deployedVMQuotaRank, that.deployedVMQuotaRank) && equal(storedVMQuotaRank, that.storedVMQuotaRank);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(super.hashCode(), name, org, fullName, isEnabled, numberOfDeployedVMs, deployedVMQuota, numberOfStoredVMs, storedVMQuota, isLdapUser, deployedVMQuotaRank, storedVMQuotaRank);
-   }
-   @Override
-   public ToStringHelper string() {
-      return super.string().add("name", name).add("org", org).add("fullName", fullName).add("isEnabled", isEnabled)
-                              .add("numberOfDeployedVMs", numberOfDeployedVMs).add("deployedVMQuota", deployedVMQuota)
-                              .add("numberOfStoredVMs", numberOfStoredVMs).add("storedVMQuota", storedVMQuota)
-                              .add("isLdapUser", isLdapUser).add("deployedVMQuotaRank", deployedVMQuotaRank)
-                              .add("storedVMQuotaRank", storedVMQuotaRank);
-   }
-}