You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ab...@apache.org on 2013/08/29 21:53:43 UTC

[2/2] git commit: Deprecate vcloud/Terremark async interfaces and *Client classes

Deprecate vcloud/Terremark async interfaces and *Client classes


Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/6add9da5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/6add9da5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/6add9da5

Branch: refs/heads/1.6.x
Commit: 6add9da5aa392b26f42566da0e47a25ff546a956
Parents: f3e43b3
Author: Andrew Bayer <an...@gmail.com>
Authored: Tue Aug 27 12:57:15 2013 -0700
Committer: Andrew Bayer <an...@gmail.com>
Committed: Thu Aug 29 11:28:42 2013 -0700

----------------------------------------------------------------------
 .../main/java/org/jclouds/vcloud/VCloudApi.java | 27 +++++++++++++
 .../java/org/jclouds/vcloud/VCloudAsyncApi.java | 35 +++++++++++++++++
 .../org/jclouds/vcloud/VCloudAsyncClient.java   |  2 +-
 .../java/org/jclouds/vcloud/VCloudClient.java   |  4 +-
 .../org/jclouds/vcloud/VCloudVersionsApi.java   | 20 ++++++++++
 .../jclouds/vcloud/VCloudVersionsAsyncApi.java  | 29 ++++++++++++++
 .../vcloud/VCloudVersionsAsyncClient.java       |  4 +-
 .../jclouds/vcloud/VCloudVersionsClient.java    |  5 +++
 .../vcloud/config/VCloudRestClientModule.java   | 40 ++++++++++++++++----
 .../org/jclouds/vcloud/features/CatalogApi.java | 28 ++++++++++++++
 .../vcloud/features/CatalogAsyncApi.java        | 33 ++++++++++++++++
 .../vcloud/features/CatalogAsyncClient.java     |  4 +-
 .../jclouds/vcloud/features/CatalogClient.java  |  4 +-
 .../org/jclouds/vcloud/features/NetworkApi.java | 25 ++++++++++++
 .../vcloud/features/NetworkAsyncApi.java        | 33 ++++++++++++++++
 .../vcloud/features/NetworkAsyncClient.java     |  4 +-
 .../jclouds/vcloud/features/NetworkClient.java  |  2 +
 .../org/jclouds/vcloud/features/OrgApi.java     | 26 +++++++++++++
 .../jclouds/vcloud/features/OrgAsyncApi.java    | 33 ++++++++++++++++
 .../jclouds/vcloud/features/OrgAsyncClient.java |  4 +-
 .../org/jclouds/vcloud/features/OrgClient.java  |  4 +-
 .../org/jclouds/vcloud/features/TaskApi.java    | 26 +++++++++++++
 .../jclouds/vcloud/features/TaskAsyncApi.java   | 32 ++++++++++++++++
 .../vcloud/features/TaskAsyncClient.java        |  4 +-
 .../org/jclouds/vcloud/features/TaskClient.java |  4 +-
 .../org/jclouds/vcloud/features/VAppApi.java    | 27 +++++++++++++
 .../jclouds/vcloud/features/VAppAsyncApi.java   | 32 ++++++++++++++++
 .../vcloud/features/VAppAsyncClient.java        |  4 +-
 .../org/jclouds/vcloud/features/VAppClient.java |  4 +-
 .../vcloud/features/VAppTemplateApi.java        | 27 +++++++++++++
 .../vcloud/features/VAppTemplateAsyncApi.java   | 32 ++++++++++++++++
 .../features/VAppTemplateAsyncClient.java       |  4 +-
 .../vcloud/features/VAppTemplateClient.java     |  4 +-
 .../org/jclouds/vcloud/features/VDCApi.java     | 26 +++++++++++++
 .../jclouds/vcloud/features/VDCAsyncApi.java    | 32 ++++++++++++++++
 .../jclouds/vcloud/features/VDCAsyncClient.java |  4 +-
 .../org/jclouds/vcloud/features/VDCClient.java  |  4 +-
 .../java/org/jclouds/vcloud/features/VmApi.java | 26 +++++++++++++
 .../org/jclouds/vcloud/features/VmAsyncApi.java | 32 ++++++++++++++++
 .../jclouds/vcloud/features/VmAsyncClient.java  |  4 +-
 .../org/jclouds/vcloud/features/VmClient.java   |  4 +-
 .../jclouds/vcloud/internal/VCloudLoginApi.java | 20 ++++++++++
 .../vcloud/internal/VCloudLoginAsyncApi.java    | 35 +++++++++++++++++
 .../vcloud/internal/VCloudLoginAsyncClient.java |  4 +-
 .../vcloud/internal/VCloudLoginClient.java      |  4 ++
 .../trmk/vcloud_0_8/TerremarkVCloudApi.java     | 29 ++++++++++++++
 .../vcloud_0_8/TerremarkVCloudAsyncApi.java     | 35 +++++++++++++++++
 .../vcloud_0_8/TerremarkVCloudAsyncClient.java  |  4 +-
 .../trmk/vcloud_0_8/TerremarkVCloudClient.java  |  4 +-
 .../config/TerremarkVCloudRestClientModule.java |  6 +++
 .../internal/TerremarkVCloudLoginApi.java       | 20 ++++++++++
 .../internal/TerremarkVCloudLoginAsyncApi.java  | 35 +++++++++++++++++
 .../TerremarkVCloudLoginAsyncClient.java        |  4 +-
 .../internal/TerremarkVCloudLoginClient.java    |  5 +++
 .../internal/TerremarkVCloudVersionsApi.java    | 20 ++++++++++
 .../TerremarkVCloudVersionsAsyncApi.java        | 29 ++++++++++++++
 .../TerremarkVCloudVersionsAsyncClient.java     |  4 +-
 .../internal/TerremarkVCloudVersionsClient.java |  6 +++
 .../jclouds/trmk/ecloud/TerremarkECloudApi.java | 29 ++++++++++++++
 .../trmk/ecloud/TerremarkECloudAsyncApi.java    | 37 ++++++++++++++++++
 .../trmk/ecloud/TerremarkECloudAsyncClient.java |  3 +-
 .../trmk/ecloud/TerremarkECloudClient.java      |  4 +-
 .../config/TerremarkECloudRestClientModule.java | 10 ++++-
 .../features/DataCenterOperationsApi.java       | 31 +++++++++++++++
 .../features/DataCenterOperationsAsyncApi.java  | 35 +++++++++++++++++
 .../DataCenterOperationsAsyncClient.java        |  4 +-
 .../features/DataCenterOperationsClient.java    |  4 +-
 .../trmk/ecloud/features/TagOperationsApi.java  | 27 +++++++++++++
 .../ecloud/features/TagOperationsAsyncApi.java  | 35 +++++++++++++++++
 .../features/TagOperationsAsyncClient.java      |  4 +-
 .../ecloud/features/TagOperationsClient.java    |  4 +-
 .../TerremarkVCloudExpressApi.java              | 28 ++++++++++++++
 .../TerremarkVCloudExpressAsyncApi.java         | 35 +++++++++++++++++
 .../TerremarkVCloudExpressAsyncClient.java      |  5 ++-
 .../TerremarkVCloudExpressClient.java           |  4 +-
 75 files changed, 1219 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudApi.java
new file mode 100644
index 0000000..1a678c6
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudApi.java
@@ -0,0 +1,27 @@
+/*
+ * 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;
+
+/**
+ * Provides access to VCloud resources via their REST API.
+ * <p/>
+ *
+ * @see <a href="http://communities.vmware.com/community/developer/forums/vcloudapi" />
+ * @author Adrian Cole
+ */
+public interface VCloudApi extends VCloudClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncApi.java
new file mode 100644
index 0000000..8ab5d4f
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncApi.java
@@ -0,0 +1,35 @@
+/*
+ * 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;
+
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.vcloud.filters.AddVCloudAuthorizationAndCookieToRequest;
+
+/**
+ * Provides access to VCloud resources via their REST API.
+ * <p/>
+ *
+ * @see <a href= "https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx"
+ *      />
+ * @author Adrian Cole
+ * @deprecated please use {@code org.jclouds.ContextBuilder#buildApi(VCloudApi.class)} as
+ *             {@link VCloudAsyncClient} interface will be removed in jclouds 1.7.
+ */
+@Deprecated
+@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
+public interface VCloudAsyncApi extends VCloudAsyncClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java
index 4820d8e..1dfee06 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java
@@ -37,7 +37,7 @@ import org.jclouds.vcloud.filters.AddVCloudAuthorizationAndCookieToRequest;
  * @see <a href= "https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx"
  *      />
  * @author Adrian Cole
- * @deprecated please use {@code org.jclouds.ContextBuilder#buildApi(VCloudClient.class)} as
+ * @deprecated please use {@code org.jclouds.ContextBuilder#buildApi(VCloudApi.class)} as
  *             {@link VCloudAsyncClient} interface will be removed in jclouds 1.7.
  */
 @Deprecated

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudClient.java
index b37e1b1..ee3f906 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudClient.java
@@ -31,10 +31,12 @@ import org.jclouds.vcloud.features.VmClient;
 /**
  * Provides access to VCloud resources via their REST API.
  * <p/>
- * 
+ *
+ * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0.
  * @see <a href="http://communities.vmware.com/community/developer/forums/vcloudapi" />
  * @author Adrian Cole
  */
+@Deprecated
 public interface VCloudClient extends Closeable {
    /**
     * Provides asynchronous access to VApp Template features.

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsApi.java
new file mode 100644
index 0000000..c3e2794
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsApi.java
@@ -0,0 +1,20 @@
+/*
+ * 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;
+
+public interface VCloudVersionsApi extends VCloudVersionsClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsAsyncApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsAsyncApi.java
new file mode 100644
index 0000000..071d825
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsAsyncApi.java
@@ -0,0 +1,29 @@
+/*
+ * 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;
+
+/**
+ * Establishes a context with a VCloud endpoint.
+ * <p/>
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
+ * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx" />
+ * @author Adrian Cole
+ */
+@Deprecated
+public interface VCloudVersionsAsyncApi extends VCloudVersionsAsyncClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsAsyncClient.java
index 53212c9..a3d0e97 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsAsyncClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsAsyncClient.java
@@ -31,10 +31,12 @@ import com.google.common.util.concurrent.ListenableFuture;
 /**
  * Establishes a context with a VCloud endpoint.
  * <p/>
- * 
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
  * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx" />
  * @author Adrian Cole
  */
+@Deprecated
 public interface VCloudVersionsAsyncClient extends Closeable {
 
    /**

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsClient.java
index 17a210c..cee618d 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudVersionsClient.java
@@ -19,6 +19,11 @@ package org.jclouds.vcloud;
 import java.io.Closeable;
 import java.net.URI;
 import java.util.SortedMap;
+
+/**
+ * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0.
+ */
+@Deprecated
 public interface VCloudVersionsClient extends Closeable {
 
    SortedMap<String, URI> getSupportedVersions();

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java
index 71af24d..80e4498 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java
@@ -73,20 +73,36 @@ import org.jclouds.vcloud.domain.VDC;
 import org.jclouds.vcloud.domain.network.FenceMode;
 import org.jclouds.vcloud.endpoints.Network;
 import org.jclouds.vcloud.endpoints.OrgList;
+import org.jclouds.vcloud.features.CatalogApi;
+import org.jclouds.vcloud.features.CatalogAsyncApi;
 import org.jclouds.vcloud.features.CatalogAsyncClient;
 import org.jclouds.vcloud.features.CatalogClient;
+import org.jclouds.vcloud.features.NetworkApi;
+import org.jclouds.vcloud.features.NetworkAsyncApi;
 import org.jclouds.vcloud.features.NetworkAsyncClient;
 import org.jclouds.vcloud.features.NetworkClient;
+import org.jclouds.vcloud.features.OrgApi;
+import org.jclouds.vcloud.features.OrgAsyncApi;
 import org.jclouds.vcloud.features.OrgAsyncClient;
 import org.jclouds.vcloud.features.OrgClient;
+import org.jclouds.vcloud.features.TaskApi;
+import org.jclouds.vcloud.features.TaskAsyncApi;
 import org.jclouds.vcloud.features.TaskAsyncClient;
 import org.jclouds.vcloud.features.TaskClient;
+import org.jclouds.vcloud.features.VAppApi;
+import org.jclouds.vcloud.features.VAppAsyncApi;
 import org.jclouds.vcloud.features.VAppAsyncClient;
 import org.jclouds.vcloud.features.VAppClient;
+import org.jclouds.vcloud.features.VAppTemplateApi;
+import org.jclouds.vcloud.features.VAppTemplateAsyncApi;
 import org.jclouds.vcloud.features.VAppTemplateAsyncClient;
 import org.jclouds.vcloud.features.VAppTemplateClient;
+import org.jclouds.vcloud.features.VDCApi;
+import org.jclouds.vcloud.features.VDCAsyncApi;
 import org.jclouds.vcloud.features.VDCAsyncClient;
 import org.jclouds.vcloud.features.VDCClient;
+import org.jclouds.vcloud.features.VmApi;
+import org.jclouds.vcloud.features.VmAsyncApi;
 import org.jclouds.vcloud.features.VmAsyncClient;
 import org.jclouds.vcloud.features.VmClient;
 import org.jclouds.vcloud.functions.CatalogItemsInCatalog;
@@ -132,14 +148,22 @@ import com.google.inject.TypeLiteral;
 public class VCloudRestClientModule extends RestClientModule<VCloudClient, VCloudAsyncClient> {
 
    public static final Map<Class<?>, Class<?>> DELEGATE_MAP = ImmutableMap.<Class<?>, Class<?>> builder()//
-            .put(VAppTemplateClient.class, VAppTemplateAsyncClient.class)//
-            .put(VAppClient.class, VAppAsyncClient.class)//
-            .put(VmClient.class, VmAsyncClient.class)//
-            .put(CatalogClient.class, CatalogAsyncClient.class)//
-            .put(TaskClient.class, TaskAsyncClient.class)//
-            .put(VDCClient.class, VDCAsyncClient.class)//
-            .put(NetworkClient.class, NetworkAsyncClient.class)//
-            .put(OrgClient.class, OrgAsyncClient.class)//
+           .put(VAppTemplateClient.class, VAppTemplateAsyncClient.class)//
+           .put(VAppClient.class, VAppAsyncClient.class)//
+           .put(VmClient.class, VmAsyncClient.class)//
+           .put(CatalogClient.class, CatalogAsyncClient.class)//
+           .put(TaskClient.class, TaskAsyncClient.class)//
+           .put(VDCClient.class, VDCAsyncClient.class)//
+           .put(NetworkClient.class, NetworkAsyncClient.class)//
+           .put(OrgClient.class, OrgAsyncClient.class)//
+           .put(VAppTemplateApi.class, VAppTemplateAsyncApi.class)//
+           .put(VAppApi.class, VAppAsyncApi.class)//
+           .put(VmApi.class, VmAsyncApi.class)//
+           .put(CatalogApi.class, CatalogAsyncApi.class)//
+           .put(TaskApi.class, TaskAsyncApi.class)//
+           .put(VDCApi.class, VDCAsyncApi.class)//
+           .put(NetworkApi.class, NetworkAsyncApi.class)//
+           .put(OrgApi.class, OrgAsyncApi.class)//
             .build();
 
    public VCloudRestClientModule() {

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogApi.java
new file mode 100644
index 0000000..4d4b085
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogApi.java
@@ -0,0 +1,28 @@
+/*
+ * 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.features;
+
+/**
+ * Provides access to Catalog functionality in vCloud
+ * <p/>
+ *
+ * @see <a href="http://communities.vmware.com/community/developer/forums/vcloudapi" />
+ * @author Adrian Cole
+ */
+public interface CatalogApi extends CatalogClient {
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogAsyncApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogAsyncApi.java
new file mode 100644
index 0000000..5340db6
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogAsyncApi.java
@@ -0,0 +1,33 @@
+/*
+ * 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.features;
+
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.vcloud.filters.AddVCloudAuthorizationAndCookieToRequest;
+
+/**
+ * Provides access to Catalog functionality in vCloud
+ * <p/>
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
+public interface CatalogAsyncApi extends CatalogAsyncClient {
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogAsyncClient.java
index 05682c4..d907fff 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogAsyncClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogAsyncClient.java
@@ -52,9 +52,11 @@ import com.google.common.util.concurrent.ListenableFuture;
 /**
  * Provides access to Catalog functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
  * @author Adrian Cole
  */
+@Deprecated
 @RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
 public interface CatalogAsyncClient {
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogClient.java
index 0e234a3..deaab1d 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogClient.java
@@ -25,10 +25,12 @@ import org.jclouds.vcloud.options.CatalogItemOptions;
 /**
  * Provides access to Catalog functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0.
  * @see <a href="http://communities.vmware.com/community/developer/forums/vcloudapi" />
  * @author Adrian Cole
  */
+@Deprecated
 public interface CatalogClient {
 
    Catalog getCatalog(URI catalogId);

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkApi.java
new file mode 100644
index 0000000..b8f286a
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkApi.java
@@ -0,0 +1,25 @@
+/*
+ * 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.features;
+
+/**
+ * Provides access to Network functionality in vCloud
+ * <p/>
+ * @author Adrian Cole
+ */
+public interface NetworkApi extends NetworkClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkAsyncApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkAsyncApi.java
new file mode 100644
index 0000000..422c2df
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkAsyncApi.java
@@ -0,0 +1,33 @@
+/*
+ * 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.features;
+
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.vcloud.filters.AddVCloudAuthorizationAndCookieToRequest;
+
+/**
+ * Provides access to Network functionality in vCloud
+ * <p/>
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
+public interface NetworkAsyncApi extends NetworkAsyncClient {
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkAsyncClient.java
index 4045e5d..c9e92e7 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkAsyncClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkAsyncClient.java
@@ -41,9 +41,11 @@ import com.google.common.util.concurrent.ListenableFuture;
 /**
  * Provides access to Network functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
  * @author Adrian Cole
  */
+@Deprecated
 @RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
 public interface NetworkAsyncClient {
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkClient.java
index 2890c81..0694665 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkClient.java
@@ -23,8 +23,10 @@ import org.jclouds.vcloud.domain.network.OrgNetwork;
 /**
  * Provides access to Network functionality in vCloud
  * <p/>
+ * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0.
  * @author Adrian Cole
  */
+@Deprecated
 public interface  NetworkClient {
 
    OrgNetwork findNetworkInOrgVDCNamed(@Nullable String orgName, @Nullable String catalogName, String networkName);

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgApi.java
new file mode 100644
index 0000000..fd44070
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgApi.java
@@ -0,0 +1,26 @@
+/*
+ * 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.features;
+
+/**
+ * Provides access to Org functionality in vCloud
+ * <p/>
+ *
+ * @author Adrian Cole
+ */
+public interface OrgApi extends OrgClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgAsyncApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgAsyncApi.java
new file mode 100644
index 0000000..915157c
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgAsyncApi.java
@@ -0,0 +1,33 @@
+/*
+ * 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.features;
+
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.vcloud.filters.AddVCloudAuthorizationAndCookieToRequest;
+
+/**
+ * Provides access to Org functionality in vCloud
+ * <p/>
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
+public interface OrgAsyncApi extends OrgAsyncClient {
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgAsyncClient.java
index cc69b74..5c5dfe6 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgAsyncClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgAsyncClient.java
@@ -45,9 +45,11 @@ import com.google.common.util.concurrent.ListenableFuture;
 /**
  * Provides access to Org functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
  * @author Adrian Cole
  */
+@Deprecated
 @RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
 public interface OrgAsyncClient {
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgClient.java
index 356a70c..a18106f 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgClient.java
@@ -25,9 +25,11 @@ import org.jclouds.vcloud.domain.ReferenceType;
 /**
  * Provides access to Org functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0.
  * @author Adrian Cole
  */
+@Deprecated
 public interface OrgClient {
 
    /**

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskApi.java
new file mode 100644
index 0000000..d395af4
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskApi.java
@@ -0,0 +1,26 @@
+/*
+ * 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.features;
+
+/**
+ * Provides access to Task functionality in vCloud
+ * <p/>
+ *
+ * @author Adrian Cole
+ */
+public interface TaskApi extends TaskClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskAsyncApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskAsyncApi.java
new file mode 100644
index 0000000..eb43453
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskAsyncApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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.features;
+
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.vcloud.filters.AddVCloudAuthorizationAndCookieToRequest;
+
+/**
+ * Provides access to Task functionality in vCloud
+ * <p/>
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
+public interface TaskAsyncApi extends TaskAsyncClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskAsyncClient.java
index 375f113..f61579e 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskAsyncClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskAsyncClient.java
@@ -44,9 +44,11 @@ import com.google.common.util.concurrent.ListenableFuture;
 /**
  * Provides access to Task functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
  * @author Adrian Cole
  */
+@Deprecated
 @RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
 public interface TaskAsyncClient {
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskClient.java
index 67c9743..2cde113 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskClient.java
@@ -23,9 +23,11 @@ import org.jclouds.vcloud.domain.TasksList;
 /**
  * Provides access to Task functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0.
  * @author Adrian Cole
  */
+@Deprecated
 public interface TaskClient {
 
    TasksList getTasksList(URI tasksListId);

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppApi.java
new file mode 100644
index 0000000..cf4b979
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppApi.java
@@ -0,0 +1,27 @@
+/*
+ * 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.features;
+
+/**
+ * Provides access to VApp functionality in vCloud
+ * <p/>
+ *
+ * @see <a href="http://communities.vmware.com/community/developer/forums/vcloudapi" />
+ * @author Adrian Cole
+ */
+public interface VAppApi extends VAppClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppAsyncApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppAsyncApi.java
new file mode 100644
index 0000000..f61502e
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppAsyncApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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.features;
+
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.vcloud.filters.AddVCloudAuthorizationAndCookieToRequest;
+
+/**
+ * Provides access to VApp functionality in vCloud
+ * <p/>
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
+public interface VAppAsyncApi extends VAppAsyncClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppAsyncClient.java
index bd332d6..21157fa 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppAsyncClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppAsyncClient.java
@@ -58,9 +58,11 @@ import com.google.common.util.concurrent.ListenableFuture;
 /**
  * Provides access to VApp functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
  * @author Adrian Cole
  */
+@Deprecated
 @RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
 public interface VAppAsyncClient {
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppClient.java
index 98204cd..8f4aba2 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppClient.java
@@ -25,10 +25,12 @@ import org.jclouds.vcloud.options.CloneVAppOptions;
 /**
  * Provides access to VApp functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0.
  * @see <a href="http://communities.vmware.com/community/developer/forums/vcloudapi" />
  * @author Adrian Cole
  */
+@Deprecated
 public interface VAppClient {
    VApp findVAppInOrgVDCNamed(@Nullable String orgName, @Nullable String catalogName, String vAppName);
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateApi.java
new file mode 100644
index 0000000..a0a7de7
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateApi.java
@@ -0,0 +1,27 @@
+/*
+ * 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.features;
+
+/**
+ * Provides access to VApp Template functionality in vCloud
+ * <p/>
+ *
+ * @see <a href="http://communities.vmware.com/community/developer/forums/vcloudapi" />
+ * @author Adrian Cole
+ */
+public interface VAppTemplateApi extends VAppTemplateClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateAsyncApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateAsyncApi.java
new file mode 100644
index 0000000..8f1a595
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateAsyncApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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.features;
+
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.vcloud.filters.AddVCloudAuthorizationAndCookieToRequest;
+
+/**
+ * Provides access to VAppTemplate functionality in vCloud
+ * <p/>
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
+public interface VAppTemplateAsyncApi extends VAppTemplateAsyncClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateAsyncClient.java
index 3ed2e28..e07c129 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateAsyncClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateAsyncClient.java
@@ -64,9 +64,11 @@ import com.google.common.util.concurrent.ListenableFuture;
 /**
  * Provides access to VAppTemplate functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
  * @author Adrian Cole
  */
+@Deprecated
 @RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
 public interface VAppTemplateAsyncClient {
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateClient.java
index 49d0061..d5a0817 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateClient.java
@@ -29,10 +29,12 @@ import org.jclouds.vcloud.options.InstantiateVAppTemplateOptions;
 /**
  * Provides access to VApp Template functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0.
  * @see <a href="http://communities.vmware.com/community/developer/forums/vcloudapi" />
  * @author Adrian Cole
  */
+@Deprecated
 public interface VAppTemplateClient {
    /**
     * returns the vapp template corresponding to a catalog item in the catalog associated with the

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCApi.java
new file mode 100644
index 0000000..885a3d3
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCApi.java
@@ -0,0 +1,26 @@
+/*
+ * 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.features;
+
+/**
+ * Provides access to VDC functionality in vCloud
+ * <p/>
+ *
+ * @author Adrian Cole
+ */
+public interface VDCApi extends VDCClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCAsyncApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCAsyncApi.java
new file mode 100644
index 0000000..77852e3
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCAsyncApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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.features;
+
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.vcloud.filters.AddVCloudAuthorizationAndCookieToRequest;
+
+/**
+ * Provides access to VDC functionality in vCloud
+ * <p/>
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
+public interface VDCAsyncApi extends VDCAsyncClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCAsyncClient.java
index e003325..d7671ca 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCAsyncClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCAsyncClient.java
@@ -41,9 +41,11 @@ import com.google.common.util.concurrent.ListenableFuture;
 /**
  * Provides access to VDC functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
  * @author Adrian Cole
  */
+@Deprecated
 @RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
 public interface VDCAsyncClient {
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCClient.java
index 5fb4fe1..d2915a5 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCClient.java
@@ -22,9 +22,11 @@ import org.jclouds.vcloud.domain.VDC;
 /**
  * Provides access to VDC functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0.
  * @author Adrian Cole
  */
+@Deprecated
 public interface VDCClient {
    VDC getVDC(URI vdc);
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmApi.java
new file mode 100644
index 0000000..dc74db5
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmApi.java
@@ -0,0 +1,26 @@
+/*
+ * 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.features;
+
+/**
+ * Provides access to VM functionality in vCloud
+ * <p/>
+ *
+ * @author Adrian Cole
+ */
+public interface VmApi extends VmClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmAsyncApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmAsyncApi.java
new file mode 100644
index 0000000..cebb1b7
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmAsyncApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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.features;
+
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.vcloud.filters.AddVCloudAuthorizationAndCookieToRequest;
+
+/**
+ * Provides access to Vm functionality in vCloud
+ * <p/>
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
+public interface VmAsyncApi extends VmAsyncClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmAsyncClient.java
index 6b945f9..70916f6 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmAsyncClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmAsyncClient.java
@@ -61,9 +61,11 @@ import com.google.common.util.concurrent.ListenableFuture;
 /**
  * Provides access to Vm functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
  * @author Adrian Cole
  */
+@Deprecated
 @RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
 public interface VmAsyncClient {
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmClient.java
index 9e77a19..5c9a1f1 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VmClient.java
@@ -26,9 +26,11 @@ import org.jclouds.vcloud.domain.Vm;
 /**
  * Provides access to VM functionality in vCloud
  * <p/>
- * 
+ *
+ * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0.
  * @author Adrian Cole
  */
+@Deprecated
 public interface VmClient {
 
    Vm getVm(URI vApp);

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginApi.java
new file mode 100644
index 0000000..547ec02
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginApi.java
@@ -0,0 +1,20 @@
+/*
+ * 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.internal;
+
+public interface VCloudLoginApi extends VCloudLoginClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginAsyncApi.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginAsyncApi.java
new file mode 100644
index 0000000..5c983f4
--- /dev/null
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginAsyncApi.java
@@ -0,0 +1,35 @@
+/*
+ * 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.internal;
+
+import org.jclouds.http.filters.BasicAuthentication;
+import org.jclouds.rest.annotations.Endpoint;
+import org.jclouds.rest.annotations.RequestFilters;
+
+/**
+ * Establishes a context with a VCloud endpoint.
+ * <p/>
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
+ * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@Endpoint(org.jclouds.vcloud.endpoints.VCloudLogin.class)
+@RequestFilters(BasicAuthentication.class)
+public interface VCloudLoginAsyncApi extends VCloudLoginAsyncClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginAsyncClient.java
index 2cd6631..862bd19 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginAsyncClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginAsyncClient.java
@@ -34,10 +34,12 @@ import com.google.common.util.concurrent.ListenableFuture;
 /**
  * Establishes a context with a VCloud endpoint.
  * <p/>
- * 
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
  * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx" />
  * @author Adrian Cole
  */
+@Deprecated
 @Endpoint(org.jclouds.vcloud.endpoints.VCloudLogin.class)
 @RequestFilters(BasicAuthentication.class)
 public interface VCloudLoginAsyncClient extends Closeable {

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginClient.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginClient.java
index 20a3a34..781be93 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/internal/VCloudLoginClient.java
@@ -20,6 +20,10 @@ import java.io.Closeable;
 
 import org.jclouds.vcloud.domain.VCloudSession;
 
+/**
+ * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0.
+ */
+@Deprecated
 public interface VCloudLoginClient extends Closeable {
 
    VCloudSession login();

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudApi.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudApi.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudApi.java
new file mode 100644
index 0000000..d0722a2
--- /dev/null
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudApi.java
@@ -0,0 +1,29 @@
+/*
+ * 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;
+
+/**
+ * Provides access to VCloud resources via their REST API.
+ * <p/>
+ *
+ * @see <a href=
+ *      "https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx"
+ *      />
+ * @author Adrian Cole
+ */
+public interface TerremarkVCloudApi extends TerremarkVCloudClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudAsyncApi.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudAsyncApi.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudAsyncApi.java
new file mode 100644
index 0000000..239602c
--- /dev/null
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudAsyncApi.java
@@ -0,0 +1,35 @@
+/*
+ * 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;
+
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie;
+
+/**
+ * Provides access to VCloud resources via their REST API.
+ * <p/>
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
+ * @see <a href=
+ *      "https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx"
+ *      />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(SetVCloudTokenCookie.class)
+public interface TerremarkVCloudAsyncApi extends TerremarkVCloudAsyncClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudAsyncClient.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudAsyncClient.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudAsyncClient.java
index 4f4555c..b93967b 100644
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudAsyncClient.java
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudAsyncClient.java
@@ -116,12 +116,14 @@ import com.google.inject.Provides;
 /**
  * Provides access to VCloud resources via their REST API.
  * <p/>
- * 
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
  * @see <a href=
  *      "https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx"
  *      />
  * @author Adrian Cole
  */
+@Deprecated
 @RequestFilters(SetVCloudTokenCookie.class)
 public interface TerremarkVCloudAsyncClient extends Closeable {
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudClient.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudClient.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudClient.java
index 75f44f0..4d146f5 100644
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudClient.java
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudClient.java
@@ -48,12 +48,14 @@ import com.google.inject.Provides;
 /**
  * Provides access to VCloud resources via their REST API.
  * <p/>
- * 
+ *
+ * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0.
  * @see <a href=
  *      "https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx"
  *      />
  * @author Adrian Cole
  */
+@Deprecated
 public interface TerremarkVCloudClient extends Closeable {
    Catalog getCatalog(URI catalogId);
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java
index 8c012f8..20bcc60 100644
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java
@@ -72,8 +72,12 @@ import org.jclouds.trmk.vcloud_0_8.functions.OrgsForLocations;
 import org.jclouds.trmk.vcloud_0_8.functions.OrgsForNames;
 import org.jclouds.trmk.vcloud_0_8.functions.VAppTemplatesForCatalogItems;
 import org.jclouds.trmk.vcloud_0_8.handlers.ParseTerremarkVCloudErrorFromHttpResponse;
+import org.jclouds.trmk.vcloud_0_8.internal.TerremarkVCloudLoginApi;
+import org.jclouds.trmk.vcloud_0_8.internal.TerremarkVCloudLoginAsyncApi;
 import org.jclouds.trmk.vcloud_0_8.internal.TerremarkVCloudLoginAsyncClient;
 import org.jclouds.trmk.vcloud_0_8.internal.TerremarkVCloudLoginClient;
+import org.jclouds.trmk.vcloud_0_8.internal.TerremarkVCloudVersionsApi;
+import org.jclouds.trmk.vcloud_0_8.internal.TerremarkVCloudVersionsAsyncApi;
 import org.jclouds.trmk.vcloud_0_8.internal.TerremarkVCloudVersionsAsyncClient;
 import org.jclouds.trmk.vcloud_0_8.internal.TerremarkVCloudVersionsClient;
 import org.jclouds.trmk.vcloud_0_8.location.DefaultVDC;
@@ -134,6 +138,8 @@ public class TerremarkVCloudRestClientModule<S, A> extends RestClientModule<S, A
       });
       bindSyncToAsyncHttpApi(binder(), TerremarkVCloudVersionsClient.class, TerremarkVCloudVersionsAsyncClient.class);
       bindSyncToAsyncHttpApi(binder(), TerremarkVCloudLoginClient.class, TerremarkVCloudLoginAsyncClient.class);
+      bindSyncToAsyncHttpApi(binder(), TerremarkVCloudVersionsApi.class, TerremarkVCloudVersionsAsyncApi.class);
+      bindSyncToAsyncHttpApi(binder(), TerremarkVCloudLoginApi.class, TerremarkVCloudLoginAsyncApi.class);
    }
 
    @Provides

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginApi.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginApi.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginApi.java
new file mode 100644
index 0000000..6e43687
--- /dev/null
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginApi.java
@@ -0,0 +1,20 @@
+/*
+ * 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.internal;
+
+public interface TerremarkVCloudLoginApi extends TerremarkVCloudLoginClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginAsyncApi.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginAsyncApi.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginAsyncApi.java
new file mode 100644
index 0000000..054332f
--- /dev/null
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginAsyncApi.java
@@ -0,0 +1,35 @@
+/*
+ * 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.internal;
+
+import org.jclouds.http.filters.BasicAuthentication;
+import org.jclouds.rest.annotations.Endpoint;
+import org.jclouds.rest.annotations.RequestFilters;
+
+/**
+ * Establishes a context with a VCloud endpoint.
+ * <p/>
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
+ * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@Endpoint(org.jclouds.trmk.vcloud_0_8.endpoints.VCloudLogin.class)
+@RequestFilters(BasicAuthentication.class)
+public interface TerremarkVCloudLoginAsyncApi extends TerremarkVCloudLoginAsyncClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginAsyncClient.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginAsyncClient.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginAsyncClient.java
index f21bb7f..6618fae 100644
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginAsyncClient.java
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginAsyncClient.java
@@ -34,10 +34,12 @@ import com.google.common.util.concurrent.ListenableFuture;
 /**
  * Establishes a context with a VCloud endpoint.
  * <p/>
- * 
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
  * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx" />
  * @author Adrian Cole
  */
+@Deprecated
 @Endpoint(org.jclouds.trmk.vcloud_0_8.endpoints.VCloudLogin.class)
 @RequestFilters(BasicAuthentication.class)
 public interface TerremarkVCloudLoginAsyncClient extends Closeable {

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginClient.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginClient.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginClient.java
index 9596956..d1460b1 100644
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginClient.java
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginClient.java
@@ -20,6 +20,11 @@ import java.io.Closeable;
 
 import org.jclouds.trmk.vcloud_0_8.domain.VCloudSession;
 
+/**
+ * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0.
+ *
+ */
+@Deprecated
 public interface TerremarkVCloudLoginClient extends Closeable {
 
    VCloudSession login();

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsApi.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsApi.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsApi.java
new file mode 100644
index 0000000..b69ce2b
--- /dev/null
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsApi.java
@@ -0,0 +1,20 @@
+/*
+ * 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.internal;
+
+public interface TerremarkVCloudVersionsApi extends TerremarkVCloudVersionsClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsAsyncApi.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsAsyncApi.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsAsyncApi.java
new file mode 100644
index 0000000..26feafc
--- /dev/null
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsAsyncApi.java
@@ -0,0 +1,29 @@
+/*
+ * 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.internal;
+
+/**
+ * Establishes a context with a VCloud endpoint.
+ * <p/>
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
+ * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx" />
+ * @author Adrian Cole
+ */
+@Deprecated
+public interface TerremarkVCloudVersionsAsyncApi extends TerremarkVCloudVersionsAsyncClient {
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsAsyncClient.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsAsyncClient.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsAsyncClient.java
index dfe8e8c..61b32da 100644
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsAsyncClient.java
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsAsyncClient.java
@@ -31,10 +31,12 @@ import com.google.common.util.concurrent.ListenableFuture;
 /**
  * Establishes a context with a VCloud endpoint.
  * <p/>
- * 
+ *
+ * @deprecated  The async interface will be removed in jclouds 1.7.
  * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx" />
  * @author Adrian Cole
  */
+@Deprecated
 public interface TerremarkVCloudVersionsAsyncClient extends Closeable {
 
    /**

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsClient.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsClient.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsClient.java
index 0e386b4..7a735d9 100644
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsClient.java
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsClient.java
@@ -19,6 +19,12 @@ package org.jclouds.trmk.vcloud_0_8.internal;
 import java.io.Closeable;
 import java.net.URI;
 import java.util.SortedMap;
+
+/**
+ * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0.
+ *
+ */
+@Deprecated
 public interface TerremarkVCloudVersionsClient extends Closeable {
 
    SortedMap<String, URI> getSupportedVersions();

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApi.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApi.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApi.java
new file mode 100644
index 0000000..19a6b80
--- /dev/null
+++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApi.java
@@ -0,0 +1,29 @@
+/*
+ * 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.ecloud;
+
+/**
+ * Provides access to VCloud resources via their REST API.
+ * <p/>
+ *
+ * @see <a href=
+ *      "http://support.theenterprisecloud.com/kb/default.asp?id=645&Lang=1&SID="
+ *      />
+ * @author Adrian Cole
+ */
+public interface TerremarkECloudApi extends TerremarkECloudClient {
+}