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 2013/09/30 18:15:32 UTC
[12/17] JCLOUDS-304. Remove broken terremark providers
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogImpl.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogImpl.java
deleted file mode 100644
index 9eb7cdd..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogImpl.java
+++ /dev/null
@@ -1,131 +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.trmk.vcloud_0_8.domain.internal;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.trmk.vcloud_0_8.domain.Catalog;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-
-/**
- * Locations of resources in vCloud
- *
- * @author Adrian Cole
- *
- */
-public class CatalogImpl extends LinkedHashMap<String, ReferenceType> implements Catalog {
-
- private final String name;
- private final String type;
- private final URI href;
- @Nullable
- private final String description;
-
- public CatalogImpl(String name, String type, URI href, @Nullable String description,
- Map<String, ReferenceType> contents) {
- this.name = checkNotNull(name, "name");
- this.type = checkNotNull(type, "type");
- this.description = description;
- this.href = checkNotNull(href, "href");
- putAll(checkNotNull(contents, "contents"));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public URI getHref() {
- return href;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName() {
- return name;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getType() {
- return type;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result + ((description == null) ? 0 : description.hashCode());
- result = prime * result + ((href == null) ? 0 : href.hashCode());
- result = prime * result + ((name == null) ? 0 : name.hashCode());
- result = prime * result + ((type == null) ? 0 : type.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (!super.equals(obj))
- return false;
- if (getClass() != obj.getClass())
- return false;
- CatalogImpl other = (CatalogImpl) obj;
- if (description == null) {
- if (other.description != null)
- return false;
- } else if (!description.equals(other.description))
- return false;
- if (href == null) {
- if (other.href != null)
- return false;
- } else if (!href.equals(other.href))
- return false;
- if (name == null) {
- if (other.name != null)
- return false;
- } else if (!name.equals(other.name))
- return false;
- if (type == null) {
- if (other.type != null)
- return false;
- } else if (!type.equals(other.type))
- return false;
- return true;
- }
-
- @Override
- public int compareTo(ReferenceType o) {
- return (this == o) ? 0 : getHref().compareTo(o.getHref());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogItemImpl.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogItemImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogItemImpl.java
deleted file mode 100644
index 0743835..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogItemImpl.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.trmk.vcloud_0_8.domain.internal;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Map;
-
-import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType;
-import org.jclouds.trmk.vcloud_0_8.domain.CatalogItem;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-
-import com.google.common.collect.Maps;
-
-/**
- *
- * @author Adrian Cole
- *
- */
-public class CatalogItemImpl extends ReferenceTypeImpl implements CatalogItem {
-
- protected final String description;
- protected final ReferenceType entity;
- protected final Map<String, String> properties = Maps.newLinkedHashMap();
- private final ReferenceType computeOptions;
- private final ReferenceType customizationOptions;
-
- public CatalogItemImpl(String name, URI id, String description, ReferenceType computeOptions,
- ReferenceType customizationOptions, ReferenceType entity, Map<String, String> properties) {
- super(name, TerremarkVCloudMediaType.CATALOGITEM_XML, id);
- this.description = description;
- this.entity = checkNotNull(entity, "entity");
- this.properties.putAll(checkNotNull(properties, "properties"));
- this.computeOptions = computeOptions;
- this.customizationOptions = customizationOptions;
- }
-
- @Override
- public String getType() {
- return TerremarkVCloudMediaType.CATALOGITEM_XML;
- }
-
- public ReferenceType getEntity() {
- return entity;
- }
-
- @Override
- public String getDescription() {
- return description;
- }
-
- public Map<String, String> getProperties() {
- return properties;
- }
-
- @Override
- public ReferenceType getComputeOptions() {
- return computeOptions;
- }
-
- @Override
- public ReferenceType getCustomizationOptions() {
- return customizationOptions;
- }
-
- @Override
- public String toString() {
- return "[id=" + getHref() + ", name=" + getName() + ", type=" + getType() + ", description=" + getDescription()
- + ", entity=" + entity + ", computeOptions=" + computeOptions + ", customizationOptions="
- + customizationOptions + ", properties=" + properties + "]";
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result + ((description == null) ? 0 : description.hashCode());
- result = prime * result + ((entity == null) ? 0 : entity.hashCode());
- result = prime * result + ((properties == null) ? 0 : properties.hashCode());
- result = prime * result + ((computeOptions == null) ? 0 : computeOptions.hashCode());
- result = prime * result + ((customizationOptions == null) ? 0 : customizationOptions.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (!super.equals(obj))
- return false;
- if (getClass() != obj.getClass())
- return false;
- CatalogItemImpl other = (CatalogItemImpl) obj;
- if (description == null) {
- if (other.description != null)
- return false;
- } else if (!description.equals(other.description))
- return false;
- if (entity == null) {
- if (other.entity != null)
- return false;
- } else if (!entity.equals(other.entity))
- return false;
- if (properties == null) {
- if (other.properties != null)
- return false;
- } else if (!properties.equals(other.properties))
- return false;
- if (computeOptions == null) {
- if (other.computeOptions != null)
- return false;
- } else if (!computeOptions.equals(other.computeOptions))
- return false;
- if (customizationOptions == null) {
- if (other.customizationOptions != null)
- return false;
- } else if (!customizationOptions.equals(other.customizationOptions))
- return false;
- return true;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/ErrorImpl.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/ErrorImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/ErrorImpl.java
deleted file mode 100644
index 859b2e3..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/ErrorImpl.java
+++ /dev/null
@@ -1,119 +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.trmk.vcloud_0_8.domain.internal;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.trmk.vcloud_0_8.domain.VCloudError;
-
-/**
- *
- * @author Adrian Cole
- *
- */
-public class ErrorImpl implements VCloudError {
- private final String message;
- private final int majorErrorCode;
- private final MinorCode minorErrorCode;
- @Nullable
- private final String vendorSpecificErrorCode;
- @Nullable
- private final String stackTrace;
-
- public ErrorImpl(String message, int majorErrorCode, @Nullable MinorCode minorErrorCode,
- @Nullable String vendorSpecificErrorCode, @Nullable String stackTrace) {
- this.message = checkNotNull(message, "message");
- this.majorErrorCode = majorErrorCode;
- this.minorErrorCode = minorErrorCode; // check null after 0.8 is gone
- this.vendorSpecificErrorCode = vendorSpecificErrorCode;
- this.stackTrace = stackTrace;
- }
-
- public String getMessage() {
- return message;
- }
-
- public int getMajorErrorCode() {
- return majorErrorCode;
- }
-
- public MinorCode getMinorErrorCode() {
- return minorErrorCode;
- }
-
- public String getVendorSpecificErrorCode() {
- return vendorSpecificErrorCode;
- }
-
- public String getStackTrace() {
- return stackTrace;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + majorErrorCode;
- result = prime * result + ((message == null) ? 0 : message.hashCode());
- result = prime * result + ((minorErrorCode == null) ? 0 : minorErrorCode.hashCode());
- result = prime * result + ((stackTrace == null) ? 0 : stackTrace.hashCode());
- result = prime * result + ((vendorSpecificErrorCode == null) ? 0 : vendorSpecificErrorCode.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- ErrorImpl other = (ErrorImpl) obj;
- if (majorErrorCode != other.majorErrorCode)
- return false;
- if (message == null) {
- if (other.message != null)
- return false;
- } else if (!message.equals(other.message))
- return false;
- if (minorErrorCode == null) {
- if (other.minorErrorCode != null)
- return false;
- } else if (!minorErrorCode.equals(other.minorErrorCode))
- return false;
- if (stackTrace == null) {
- if (other.stackTrace != null)
- return false;
- } else if (!stackTrace.equals(other.stackTrace))
- return false;
- if (vendorSpecificErrorCode == null) {
- if (other.vendorSpecificErrorCode != null)
- return false;
- } else if (!vendorSpecificErrorCode.equals(other.vendorSpecificErrorCode))
- return false;
- return true;
- }
-
- @Override
- public String toString() {
- return "[majorErrorCode=" + majorErrorCode + ", message=" + message + ", minorErrorCode=" + minorErrorCode
- + ", stackTrace=" + stackTrace + ", vendorSpecificErrorCode=" + vendorSpecificErrorCode + "]";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/NetworkImpl.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/NetworkImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/NetworkImpl.java
deleted file mode 100644
index 6173050..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/NetworkImpl.java
+++ /dev/null
@@ -1,107 +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.trmk.vcloud_0_8.domain.internal;
-
-import java.net.URI;
-
-import org.jclouds.trmk.vcloud_0_8.domain.FenceMode;
-import org.jclouds.trmk.vcloud_0_8.domain.Network;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-
-/**
- * Locations of resources in vCloud
- *
- * @author Adrian Cole
- *
- */
-public class NetworkImpl extends ReferenceTypeImpl implements Network {
-
- protected final String description;
- protected final String gateway;
- protected final String netmask;
- protected final FenceMode fenceMode;
- protected final ReferenceType networkExtension;
- protected final ReferenceType ips;
-
- public NetworkImpl(String name, String type, URI id, String description, String gateway, String netmask,
- FenceMode fenceMode, ReferenceType networkExtension, ReferenceType ips) {
- super(name, type, id);
- this.description = description;
- this.gateway = gateway;
- this.netmask = netmask;
- this.fenceMode = fenceMode;
- this.networkExtension = networkExtension;
- this.ips = ips;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getDescription() {
- return description;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getGateway() {
- return gateway;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getNetmask() {
- return netmask;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public FenceMode getFenceMode() {
- return fenceMode;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ReferenceType getIps() {
- return ips;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ReferenceType getNetworkExtension() {
- return networkExtension;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int compareTo(ReferenceType o) {
- return (this == o) ? 0 : getHref().compareTo(o.getHref());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/OrgImpl.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/OrgImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/OrgImpl.java
deleted file mode 100644
index c58e273..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/OrgImpl.java
+++ /dev/null
@@ -1,139 +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.trmk.vcloud_0_8.domain.internal;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Map;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.trmk.vcloud_0_8.domain.Org;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-
-import com.google.common.collect.ImmutableMap;
-
-/**
- * Locations of resources in vCloud
- *
- * @author Adrian Cole
- *
- */
-public class OrgImpl extends ReferenceTypeImpl implements Org {
- @Nullable
- private final String description;
- private final Map<String, ReferenceType> catalogs;
- private final Map<String, ReferenceType> vdcs;
- private final ReferenceType keys;
- private final ImmutableMap<String, ReferenceType> tasksLists;
-
- public OrgImpl(String name, String type, URI id, String description, Map<String, ReferenceType> catalogs,
- Map<String, ReferenceType> vdcs, Map<String, ReferenceType> tasksLists, ReferenceType keys) {
- super(name, type, id);
- this.description = description;
- this.catalogs = ImmutableMap.copyOf(checkNotNull(catalogs, "catalogs"));
- this.vdcs = ImmutableMap.copyOf(checkNotNull(vdcs, "vdcs"));
- this.tasksLists = ImmutableMap.copyOf(checkNotNull(tasksLists, "tasksLists"));
- this.keys = checkNotNull(keys, "keys");
- }
-
- @Override
- public String getDescription() {
- return description;
- }
-
- @Override
- public Map<String, ReferenceType> getCatalogs() {
- return catalogs;
- }
-
- @Override
- public Map<String, ReferenceType> getVDCs() {
- return vdcs;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result + ((catalogs == null) ? 0 : catalogs.hashCode());
- result = prime * result + ((description == null) ? 0 : description.hashCode());
- result = prime * result + ((keys == null) ? 0 : keys.hashCode());
- result = prime * result + ((tasksLists == null) ? 0 : tasksLists.hashCode());
- result = prime * result + ((vdcs == null) ? 0 : vdcs.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (!super.equals(obj))
- return false;
- if (getClass() != obj.getClass())
- return false;
- OrgImpl other = (OrgImpl) obj;
- if (catalogs == null) {
- if (other.catalogs != null)
- return false;
- } else if (!catalogs.equals(other.catalogs))
- return false;
- if (description == null) {
- if (other.description != null)
- return false;
- } else if (!description.equals(other.description))
- return false;
- if (keys == null) {
- if (other.keys != null)
- return false;
- } else if (!keys.equals(other.keys))
- return false;
- if (tasksLists == null) {
- if (other.tasksLists != null)
- return false;
- } else if (!tasksLists.equals(other.tasksLists))
- return false;
- if (vdcs == null) {
- if (other.vdcs != null)
- return false;
- } else if (!vdcs.equals(other.vdcs))
- return false;
- return true;
- }
-
- @Override
- public int compareTo(ReferenceType o) {
- return (this == o) ? 0 : getHref().compareTo(o.getHref());
- }
-
- @Override
- public String toString() {
- return "[href=" + getHref() + ", name=" + getName() + ", type=" + getType() + ", description=" + description
- + ", catalogs=" + catalogs + ", tasksLists=" + tasksLists + ", vdcs=" + vdcs + ", keys=" + keys + "]";
- }
-
- @Override
- public Map<String, ReferenceType> getTasksLists() {
- return tasksLists;
- }
-
- @Override
- public ReferenceType getKeys() {
- return keys;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/ReferenceTypeImpl.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/ReferenceTypeImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/ReferenceTypeImpl.java
deleted file mode 100644
index 4de84ed..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/ReferenceTypeImpl.java
+++ /dev/null
@@ -1,101 +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.trmk.vcloud_0_8.domain.internal;
-
-import java.net.URI;
-
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-
-/**
- * Location of a Rest resource
- *
- * @author Adrian Cole
- *
- */
-public class ReferenceTypeImpl implements ReferenceType {
- private final String name;
- private final String type;
- private final URI href;
-
- public ReferenceTypeImpl(String name, String type, URI href) {
- this.name = name;
- this.type = type;
- this.href = href;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public String getType() {
- return type;
- }
-
- @Override
- public URI getHref() {
- return href;
- }
-
- @Override
- public int compareTo(ReferenceType that) {
- return (this == that) ? 0 : getHref().compareTo(that.getHref());
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((href == null) ? 0 : href.hashCode());
- result = prime * result + ((name == null) ? 0 : name.hashCode());
- result = prime * result + ((type == null) ? 0 : type.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- ReferenceTypeImpl other = (ReferenceTypeImpl) obj;
- if (href == null) {
- if (other.href != null)
- return false;
- } else if (!href.equals(other.href))
- return false;
- if (name == null) {
- if (other.name != null)
- return false;
- } else if (!name.equals(other.name))
- return false;
- if (type == null) {
- if (other.type != null)
- return false;
- } else if (!type.equals(other.type))
- return false;
- return true;
- }
-
- @Override
- public String toString() {
- return "[href=" + href + ", name=" + name + ", type=" + type + "]";
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/TaskImpl.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/TaskImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/TaskImpl.java
deleted file mode 100644
index dc872a5..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/TaskImpl.java
+++ /dev/null
@@ -1,164 +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.trmk.vcloud_0_8.domain.internal;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Date;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-import org.jclouds.trmk.vcloud_0_8.domain.Task;
-import org.jclouds.trmk.vcloud_0_8.domain.TaskStatus;
-import org.jclouds.trmk.vcloud_0_8.domain.VCloudError;
-
-/**
- *
- * @author Adrian Cole
- *
- */
-public class TaskImpl extends ReferenceTypeImpl implements Task {
-
- private final String operation;
- private final TaskStatus status;
- private final Date startTime;
- @Nullable
- private final Date endTime;
- @Nullable
- private final Date expiryTime;
- private final ReferenceType owner;
- @Nullable
- private final VCloudError error;
-
- public TaskImpl(URI id, String operation, TaskStatus status, Date startTime, @Nullable Date endTime,
- @Nullable Date expiryTime, ReferenceType owner, VCloudError error) {
- super(null, TerremarkVCloudMediaType.TASK_XML, id);
- this.operation = operation;
- this.status = checkNotNull(status, "status");
- this.startTime = startTime;
- this.endTime = endTime;
- this.expiryTime = expiryTime;
- this.owner = owner;
- this.error = error;
- }
-
- @Override
- public TaskStatus getStatus() {
- return status;
- }
-
- @Override
- public Date getStartTime() {
- return startTime;
- }
-
- @Override
- public ReferenceType getOwner() {
- return owner;
- }
-
- @Override
- public Date getEndTime() {
- return endTime;
- }
-
- @Override
- public VCloudError getError() {
- return error;
- }
-
- @Override
- public String toString() {
- return "TaskImpl [endTime=" + endTime + ", error=" + error + ", expiryTime=" + expiryTime + ", operation="
- + operation + ", owner=" + owner + ", startTime=" + startTime + ", status=" + status + ", getHref()="
- + getHref() + ", getName()=" + getName() + ", getType()=" + getType() + ", toString()="
- + super.toString() + ", getClass()=" + getClass() + "]";
- }
-
- public Date getExpiryTime() {
- return expiryTime;
- }
-
- @Override
- public String getOperation() {
- return operation;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result + ((endTime == null) ? 0 : endTime.hashCode());
- result = prime * result + ((error == null) ? 0 : error.hashCode());
- result = prime * result + ((expiryTime == null) ? 0 : expiryTime.hashCode());
- result = prime * result + ((operation == null) ? 0 : operation.hashCode());
- result = prime * result + ((owner == null) ? 0 : owner.hashCode());
- result = prime * result + ((startTime == null) ? 0 : startTime.hashCode());
- result = prime * result + ((status == null) ? 0 : status.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (!super.equals(obj))
- return false;
- if (getClass() != obj.getClass())
- return false;
- TaskImpl other = (TaskImpl) obj;
- if (endTime == null) {
- if (other.endTime != null)
- return false;
- } else if (!endTime.equals(other.endTime))
- return false;
- if (error == null) {
- if (other.error != null)
- return false;
- } else if (!error.equals(other.error))
- return false;
- if (expiryTime == null) {
- if (other.expiryTime != null)
- return false;
- } else if (!expiryTime.equals(other.expiryTime))
- return false;
- if (operation == null) {
- if (other.operation != null)
- return false;
- } else if (!operation.equals(other.operation))
- return false;
- if (owner == null) {
- if (other.owner != null)
- return false;
- } else if (!owner.equals(other.owner))
- return false;
- if (startTime == null) {
- if (other.startTime != null)
- return false;
- } else if (!startTime.equals(other.startTime))
- return false;
- if (status == null) {
- if (other.status != null)
- return false;
- } else if (!status.equals(other.status))
- return false;
- return true;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/TasksListImpl.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/TasksListImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/TasksListImpl.java
deleted file mode 100644
index ab9db01..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/TasksListImpl.java
+++ /dev/null
@@ -1,81 +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.trmk.vcloud_0_8.domain.internal;
-
-import java.net.URI;
-import java.util.SortedSet;
-
-import org.jclouds.trmk.vcloud_0_8.domain.Task;
-import org.jclouds.trmk.vcloud_0_8.domain.TasksList;
-
-/**
- * Locations of resources in vCloud
- *
- * @author Adrian Cole
- *
- */
-public class TasksListImpl implements TasksList {
- private final SortedSet<Task> tasks;
- private final URI id;
-
- public TasksListImpl(URI id, SortedSet<Task> tasks) {
- this.id = id;
- this.tasks = tasks;
- }
-
- @Override
- public SortedSet<Task> getTasks() {
- return tasks;
- }
-
- @Override
- public URI getLocation() {
- return id;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((id == null) ? 0 : id.hashCode());
- result = prime * result + ((tasks == null) ? 0 : tasks.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- TasksListImpl other = (TasksListImpl) obj;
- if (id == null) {
- if (other.id != null)
- return false;
- } else if (!id.equals(other.id))
- return false;
- if (tasks == null) {
- if (other.tasks != null)
- return false;
- } else if (!tasks.equals(other.tasks))
- return false;
- return true;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VAppImpl.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VAppImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VAppImpl.java
deleted file mode 100644
index cde0816..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VAppImpl.java
+++ /dev/null
@@ -1,234 +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.trmk.vcloud_0_8.domain.internal;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jclouds.cim.ResourceAllocationSettingData;
-import org.jclouds.cim.VirtualSystemSettingData;
-import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-import org.jclouds.trmk.vcloud_0_8.domain.Status;
-import org.jclouds.trmk.vcloud_0_8.domain.VApp;
-
-import com.google.common.collect.ListMultimap;
-
-/**
- *
- * @author Adrian Cole
- *
- */
-public class VAppImpl implements VApp {
- private final String name;
- private final URI href;
- private final ReferenceType vDC;
- private final Set<ReferenceType> extendedInfo;
- private final Status status;
- private final Long size;
- private final ListMultimap<String, String> networkToAddresses;
- private final String operatingSystemDescription;
- private final VirtualSystemSettingData system;
- private final Set<ResourceAllocationSettingData> resourceAllocations;
- private final Integer osType;
-
- public VAppImpl(String name, URI href, Status status, Long size, ReferenceType vDC,
- ListMultimap<String, String> networkToAddresses, Integer osType, String operatingSystemDescription,
- VirtualSystemSettingData system, Set<ResourceAllocationSettingData> resourceAllocations) {
- this(name, href, status, size, vDC, networkToAddresses, osType, operatingSystemDescription, system,
- resourceAllocations, new HashSet<ReferenceType>());
- }
-
- public VAppImpl(String name, URI href, Status status, Long size, ReferenceType vDC,
- ListMultimap<String, String> networkToAddresses, Integer osType, String operatingSystemDescription,
- VirtualSystemSettingData system, Set<ResourceAllocationSettingData> resourceAllocations,
- Set<ReferenceType> extendedInfo) {
- this.name = checkNotNull(name, "name");
- this.href = checkNotNull(href, "href");
- this.status = checkNotNull(status, "status");
- this.size = size;
- this.vDC = vDC;
- this.networkToAddresses = checkNotNull(networkToAddresses, "networkToAddresses");
- this.osType = osType;
- this.operatingSystemDescription = operatingSystemDescription;
- this.system = system;
- this.resourceAllocations = checkNotNull(resourceAllocations, "resourceAllocations");
- this.extendedInfo = extendedInfo;
- }
-
- @Override
- public Status getStatus() {
- return status;
- }
-
- @Override
- public ListMultimap<String, String> getNetworkToAddresses() {
- return networkToAddresses;
- }
-
- @Override
- public Integer getOsType() {
- return osType;
- }
-
- @Override
- public String getOperatingSystemDescription() {
- return operatingSystemDescription;
- }
-
- @Override
- public VirtualSystemSettingData getSystem() {
- return system;
- }
-
- @Override
- public Set<ResourceAllocationSettingData> getResourceAllocations() {
- return resourceAllocations;
- }
-
- @Override
- public ReferenceType getVDC() {
- return vDC;
- }
-
- @Override
- public Set<ReferenceType> getExtendedInfo() {
- return extendedInfo;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((href == null) ? 0 : href.hashCode());
- result = prime * result + ((name == null) ? 0 : name.hashCode());
- result = prime * result + ((networkToAddresses == null) ? 0 : networkToAddresses.hashCode());
- result = prime * result + ((operatingSystemDescription == null) ? 0 : operatingSystemDescription.hashCode());
- result = prime * result + ((resourceAllocations == null) ? 0 : resourceAllocations.hashCode());
- result = prime * result + ((size == null) ? 0 : size.hashCode());
- result = prime * result + ((osType == null) ? 0 : osType.hashCode());
- result = prime * result + ((status == null) ? 0 : status.hashCode());
- result = prime * result + ((system == null) ? 0 : system.hashCode());
- result = prime * result + ((vDC == null) ? 0 : vDC.hashCode());
- result = prime * result + ((extendedInfo == null) ? 0 : extendedInfo.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- VAppImpl other = (VAppImpl) obj;
- if (href == null) {
- if (other.href != null)
- return false;
- } else if (!href.equals(other.href))
- return false;
- if (name == null) {
- if (other.name != null)
- return false;
- } else if (!name.equals(other.name))
- return false;
- if (osType == null) {
- if (other.osType != null)
- return false;
- } else if (!osType.equals(other.osType))
- return false;
- if (networkToAddresses == null) {
- if (other.networkToAddresses != null)
- return false;
- } else if (!networkToAddresses.equals(other.networkToAddresses))
- return false;
- if (operatingSystemDescription == null) {
- if (other.operatingSystemDescription != null)
- return false;
- } else if (!operatingSystemDescription.equals(other.operatingSystemDescription))
- return false;
- if (resourceAllocations == null) {
- if (other.resourceAllocations != null)
- return false;
- } else if (!resourceAllocations.equals(other.resourceAllocations))
- return false;
- if (size == null) {
- if (other.size != null)
- return false;
- } else if (!size.equals(other.size))
- return false;
- if (status == null) {
- if (other.status != null)
- return false;
- } else if (!status.equals(other.status))
- return false;
- if (system == null) {
- if (other.system != null)
- return false;
- } else if (!system.equals(other.system))
- return false;
- if (vDC == null) {
- if (other.vDC != null)
- return false;
- } else if (!vDC.equals(other.vDC))
- return false;
- if (extendedInfo == null) {
- if (other.extendedInfo != null)
- return false;
- } else if (!extendedInfo.equals(other.extendedInfo))
- return false;
- return true;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public URI getHref() {
- return href;
- }
-
- @Override
- public Long getSize() {
- return size;
- }
-
- @Override
- public String toString() {
- return "[href=" + href + ", name=" + name + ", networkToAddresses=" + networkToAddresses + ", osType=" + osType
- + ", operatingSystemDescription=" + operatingSystemDescription + ", resourceAllocationByType="
- + resourceAllocations + ", size=" + size + ", status=" + status + ", system=" + system + ", vDC=" + vDC
- + ", extendedInfo=" + extendedInfo + "]";
- }
-
- @Override
- public String getType() {
- return TerremarkVCloudMediaType.VAPP_XML;
- }
-
- @Override
- public int compareTo(ReferenceType o) {
- return (this == o) ? 0 : getHref().compareTo(o.getHref());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VAppTemplateImpl.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VAppTemplateImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VAppTemplateImpl.java
deleted file mode 100644
index 25b5a17..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VAppTemplateImpl.java
+++ /dev/null
@@ -1,87 +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.trmk.vcloud_0_8.domain.internal;
-
-import java.net.URI;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType;
-import org.jclouds.trmk.vcloud_0_8.domain.Status;
-import org.jclouds.trmk.vcloud_0_8.domain.VAppTemplate;
-
-/**
- *
- * @author Adrian Cole
- *
- */
-public class VAppTemplateImpl extends ReferenceTypeImpl implements VAppTemplate {
-
- private final String description;
- private final Status status;
-
- public VAppTemplateImpl(String name, URI id, @Nullable String description, @Nullable Status status) {
- super(name, TerremarkVCloudMediaType.VAPPTEMPLATE_XML, id);
- this.description = description;
- this.status = status;
- }
-
- @Override
- public String getDescription() {
- return description;
- }
-
- public Status getStatus() {
- return status;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result + ((description == null) ? 0 : description.hashCode());
- result = prime * result + ((status == null) ? 0 : status.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (!super.equals(obj))
- return false;
- if (getClass() != obj.getClass())
- return false;
- VAppTemplateImpl other = (VAppTemplateImpl) obj;
- if (description == null) {
- if (other.description != null)
- return false;
- } else if (!description.equals(other.description))
- return false;
- if (status == null) {
- if (other.status != null)
- return false;
- } else if (!status.equals(other.status))
- return false;
- return true;
- }
-
- @Override
- public String toString() {
- return "VAppTemplateImpl [description=" + description + ", status=" + status + "]";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VDCImpl.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VDCImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VDCImpl.java
deleted file mode 100644
index c39eae4..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VDCImpl.java
+++ /dev/null
@@ -1,168 +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.trmk.vcloud_0_8.domain.internal;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Map;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-import org.jclouds.trmk.vcloud_0_8.domain.VDC;
-
-import com.google.common.collect.ImmutableMap;
-
-/**
- * Locations of resources in vCloud
- *
- * @author Adrian Cole
- *
- */
-public class VDCImpl extends ReferenceTypeImpl implements VDC {
-
- @Nullable
- private final String description;
- private final ReferenceType catalog;
- private final ReferenceType publicIps;
- private final ReferenceType internetServices;
- private final Map<String, ReferenceType> resourceEntities;
- private final Map<String, ReferenceType> availableNetworks;
-
- public VDCImpl(String name, String type, URI href, @Nullable String description, ReferenceType catalog,
- ReferenceType publicIps, ReferenceType internetServices, Map<String, ReferenceType> resourceEntities,
- Map<String, ReferenceType> availableNetworks) {
- super(name, type, href);
- this.description = description;
- this.catalog = checkNotNull(catalog, "catalog");
- this.publicIps = checkNotNull(publicIps, "publicIps");
- this.internetServices = checkNotNull(internetServices, "internetServices");
- this.resourceEntities = ImmutableMap.copyOf(checkNotNull(resourceEntities, "resourceEntities"));
- this.availableNetworks = ImmutableMap.copyOf(checkNotNull(availableNetworks, "availableNetworks"));
- }
-
- /**
- * @InheritDoc
- */
- @Override
- public String getDescription() {
- return description;
- }
-
- /**
- * @InheritDoc
- */
- @Override
- public ReferenceType getCatalog() {
- return catalog;
- }
-
- /**
- * @InheritDoc
- */
- @Override
- public ReferenceType getPublicIps() {
- return publicIps;
- }
-
- /**
- * @InheritDoc
- */
- @Override
- public ReferenceType getInternetServices() {
- return internetServices;
- }
-
- /**
- * @InheritDoc
- */
- @Override
- public Map<String, ReferenceType> getResourceEntities() {
- return resourceEntities;
- }
-
- /**
- * @InheritDoc
- */
- @Override
- public Map<String, ReferenceType> getAvailableNetworks() {
- return availableNetworks;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result + ((availableNetworks == null) ? 0 : availableNetworks.hashCode());
- result = prime * result + ((catalog == null) ? 0 : catalog.hashCode());
- result = prime * result + ((description == null) ? 0 : description.hashCode());
- result = prime * result + ((internetServices == null) ? 0 : internetServices.hashCode());
- result = prime * result + ((publicIps == null) ? 0 : publicIps.hashCode());
- result = prime * result + ((resourceEntities == null) ? 0 : resourceEntities.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (!super.equals(obj))
- return false;
- if (getClass() != obj.getClass())
- return false;
- VDCImpl other = (VDCImpl) obj;
- if (availableNetworks == null) {
- if (other.availableNetworks != null)
- return false;
- } else if (!availableNetworks.equals(other.availableNetworks))
- return false;
- if (catalog == null) {
- if (other.catalog != null)
- return false;
- } else if (!catalog.equals(other.catalog))
- return false;
- if (description == null) {
- if (other.description != null)
- return false;
- } else if (!description.equals(other.description))
- return false;
- if (internetServices == null) {
- if (other.internetServices != null)
- return false;
- } else if (!internetServices.equals(other.internetServices))
- return false;
- if (publicIps == null) {
- if (other.publicIps != null)
- return false;
- } else if (!publicIps.equals(other.publicIps))
- return false;
- if (resourceEntities == null) {
- if (other.resourceEntities != null)
- return false;
- } else if (!resourceEntities.equals(other.resourceEntities))
- return false;
- return true;
- }
-
- @Override
- public String toString() {
- return "[name=" + getName() + ", href=" + getHref() + ", description=" + description + ", catalog=" + catalog
- + ", publicIps=" + publicIps + ", internetServices=" + internetServices + ", resourceEntities="
- + resourceEntities + ", availableNetworks=" + availableNetworks + "]";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Catalog.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Catalog.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Catalog.java
deleted file mode 100644
index 57eb985..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Catalog.java
+++ /dev/null
@@ -1,37 +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.trmk.vcloud_0_8.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Related to a VCloud Catalog.
- *
- * @author Adrian Cole
- *
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface Catalog {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/DataCenters.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/DataCenters.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/DataCenters.java
deleted file mode 100644
index 9b8a927..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/DataCenters.java
+++ /dev/null
@@ -1,37 +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.trmk.vcloud_0_8.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Related to Terremark Data Centers List.
- *
- * @author Adrian Cole
- *
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface DataCenters {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/InternetServices.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/InternetServices.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/InternetServices.java
deleted file mode 100644
index 67c38ae..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/InternetServices.java
+++ /dev/null
@@ -1,37 +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.trmk.vcloud_0_8.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Related to Terremark Internet Services.
- *
- * @author Adrian Cole
- *
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface InternetServices {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Keys.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Keys.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Keys.java
deleted file mode 100644
index e4e9b34..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Keys.java
+++ /dev/null
@@ -1,37 +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.trmk.vcloud_0_8.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Related to Terremark SSH Keys List.
- *
- * @author Adrian Cole
- *
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface Keys {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Network.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Network.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Network.java
deleted file mode 100644
index 6fa18a9..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Network.java
+++ /dev/null
@@ -1,37 +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.trmk.vcloud_0_8.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Related to a VCloud Network.
- *
- * @author Adrian Cole
- *
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface Network {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Org.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Org.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Org.java
deleted file mode 100644
index ab23cac..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Org.java
+++ /dev/null
@@ -1,37 +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.trmk.vcloud_0_8.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Related to a VCloud express Org.
- *
- * @author Adrian Cole
- *
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface Org {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/OrgList.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/OrgList.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/OrgList.java
deleted file mode 100644
index 7959d32..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/OrgList.java
+++ /dev/null
@@ -1,37 +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.trmk.vcloud_0_8.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Related to a VCloud express Org List.
- *
- * @author Adrian Cole
- *
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface OrgList {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/PublicIPs.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/PublicIPs.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/PublicIPs.java
deleted file mode 100644
index d20fd31..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/PublicIPs.java
+++ /dev/null
@@ -1,37 +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.trmk.vcloud_0_8.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Related to Terremark Public IPs.
- *
- * @author Adrian Cole
- *
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface PublicIPs {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Tags.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Tags.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Tags.java
deleted file mode 100644
index d5ddefc..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/Tags.java
+++ /dev/null
@@ -1,37 +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.trmk.vcloud_0_8.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Related to Terremark Device Tags.
- *
- * @author Adrian Cole
- *
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface Tags {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/TasksList.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/TasksList.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/TasksList.java
deleted file mode 100644
index 930cd8f..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/TasksList.java
+++ /dev/null
@@ -1,37 +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.trmk.vcloud_0_8.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Related to a VCloud express Task List.
- *
- * @author Adrian Cole
- *
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface TasksList {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/VAppCatalog.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/VAppCatalog.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/VAppCatalog.java
deleted file mode 100644
index 7bae2c4..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/VAppCatalog.java
+++ /dev/null
@@ -1,37 +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.trmk.vcloud_0_8.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Related to Terremark vApp Catalog
- *
- * @author Adrian Cole
- *
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface VAppCatalog {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/VCloudLogin.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/VCloudLogin.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/VCloudLogin.java
deleted file mode 100644
index 3c83794..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/VCloudLogin.java
+++ /dev/null
@@ -1,38 +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.trmk.vcloud_0_8.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Represents a component related to vCloud.
- *
- * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx" />
- * @author Adrian Cole
- *
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface VCloudLogin {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/VDC.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/VDC.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/VDC.java
deleted file mode 100644
index 472b280..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/endpoints/VDC.java
+++ /dev/null
@@ -1,37 +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.trmk.vcloud_0_8.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Related to a VCloud express Catalog.
- *
- * @author Adrian Cole
- *
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface VDC {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/filters/SetVCloudTokenCookie.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/filters/SetVCloudTokenCookie.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/filters/SetVCloudTokenCookie.java
deleted file mode 100644
index 76201b7..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/filters/SetVCloudTokenCookie.java
+++ /dev/null
@@ -1,49 +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.trmk.vcloud_0_8.filters;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-import javax.ws.rs.core.HttpHeaders;
-
-import org.jclouds.http.HttpException;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpRequestFilter;
-import org.jclouds.trmk.vcloud_0_8.VCloudToken;
-
-/**
- * Adds the VCloud Token to the request as a cookie
- *
- * @author Adrian Cole
- *
- */
-@Singleton
-public class SetVCloudTokenCookie implements HttpRequestFilter {
- private Provider<String> vcloudTokenProvider;
-
- @Inject
- public SetVCloudTokenCookie(@VCloudToken Provider<String> authTokenProvider) {
- this.vcloudTokenProvider = authTokenProvider;
- }
-
- @Override
- public HttpRequest filter(HttpRequest request) throws HttpException {
- return request.toBuilder().replaceHeader(HttpHeaders.COOKIE, "vcloud-token=" + vcloudTokenProvider.get()).build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/AllCatalogItemsInCatalog.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/AllCatalogItemsInCatalog.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/AllCatalogItemsInCatalog.java
deleted file mode 100644
index dc3b7c2..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/AllCatalogItemsInCatalog.java
+++ /dev/null
@@ -1,64 +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.trmk.vcloud_0_8.functions;
-
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.transform;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.logging.Logger;
-import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudApi;
-import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType;
-import org.jclouds.trmk.vcloud_0_8.domain.Catalog;
-import org.jclouds.trmk.vcloud_0_8.domain.CatalogItem;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class AllCatalogItemsInCatalog implements Function<Catalog, Iterable<? extends CatalogItem>> {
- @Resource
- public Logger logger = Logger.NULL;
-
- private final TerremarkVCloudApi aclient;
-
- @Inject
- AllCatalogItemsInCatalog(TerremarkVCloudApi aclient) {
- this.aclient = aclient;
- }
-
- @Override
- public Iterable<? extends CatalogItem> apply(Catalog from) {
- return transform(filter(from.values(), new Predicate<ReferenceType>() {
- public boolean apply(ReferenceType input) {
- return input.getType().equals(TerremarkVCloudMediaType.CATALOGITEM_XML);
- }
- }), new Function<ReferenceType, CatalogItem>() {
- public CatalogItem apply(ReferenceType from) {
- return aclient.getCatalogItem(from.getHref());
- }
- });
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/AllCatalogItemsInOrg.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/AllCatalogItemsInOrg.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/AllCatalogItemsInOrg.java
deleted file mode 100644
index 2d393a9..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/AllCatalogItemsInOrg.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloud_0_8.functions;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.logging.Logger;
-import org.jclouds.trmk.vcloud_0_8.domain.Catalog;
-import org.jclouds.trmk.vcloud_0_8.domain.CatalogItem;
-import org.jclouds.trmk.vcloud_0_8.domain.Org;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class AllCatalogItemsInOrg implements Function<Org, Iterable<? extends CatalogItem>> {
-
- @Resource
- public Logger logger = Logger.NULL;
-
- private final Function<Org, Iterable<? extends Catalog>> allCatalogsInOrg;
-
- private final Function<Catalog, Iterable<? extends CatalogItem>> allCatalogItemsInCatalog;
-
- @Inject
- AllCatalogItemsInOrg(Function<Org, Iterable<? extends Catalog>> allCatalogsInOrg,
- Function<Catalog, Iterable<? extends CatalogItem>> allCatalogItemsInCatalog) {
- this.allCatalogsInOrg = allCatalogsInOrg;
- this.allCatalogItemsInCatalog = allCatalogItemsInCatalog;
- }
-
- @Override
- public Iterable<? extends CatalogItem> apply(Org from) {
- return Iterables.concat(Iterables.transform(allCatalogsInOrg.apply(from),
- new Function<Catalog, Iterable<? extends CatalogItem>>() {
- @Override
- public Iterable<? extends CatalogItem> apply(Catalog from) {
- return allCatalogItemsInCatalog.apply(from);
- }
-
- }));
- }
-}