From e50dd9f2eb8ec7fad502212553766249e7a61c5f Mon Sep 17 00:00:00 2001
From: danikov <dan.lobianco@cloudsoftcorp.com>
Date: Tue, 14 Feb 2012 12:12:33 +0000
Subject: [PATCH] wire up clients

---
 .../director/v1_5/VCloudDirectorAsyncClient.java     | 12 ++++++++++++
 .../vcloud/director/v1_5/VCloudDirectorClient.java   | 12 ++++++++++++
 .../director/v1_5/VCloudDirectorMediaType.java       |  2 +-
 .../v1_5/config/VCloudDirectorRestClientModule.java  |  3 +++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorAsyncClient.java
index cf1c90c09d..a66919ce12 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorAsyncClient.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorAsyncClient.java
@@ -21,12 +21,18 @@ package org.jclouds.vcloud.director.v1_5;
 import org.jclouds.ovf.Network;
 import org.jclouds.rest.annotations.Delegate;
 import org.jclouds.vcloud.director.v1_5.domain.Org;
+import org.jclouds.vcloud.director.v1_5.domain.Catalog;
+import org.jclouds.vcloud.director.v1_5.domain.Media;
+import org.jclouds.vcloud.director.v1_5.domain.Org;
 import org.jclouds.vcloud.director.v1_5.domain.Session;
+import org.jclouds.vcloud.director.v1_5.domain.Task;
+import org.jclouds.vcloud.director.v1_5.domain.Vdc;
 import org.jclouds.vcloud.director.v1_5.features.CatalogAsyncClient;
 import org.jclouds.vcloud.director.v1_5.features.NetworkAsyncClient;
 import org.jclouds.vcloud.director.v1_5.features.OrgAsyncClient;
 import org.jclouds.vcloud.director.v1_5.features.QueryAsyncClient;
 import org.jclouds.vcloud.director.v1_5.features.TaskAsyncClient;
+import org.jclouds.vcloud.director.v1_5.features.VdcAsyncClient;
 
 import com.google.inject.Provides;
 
@@ -80,4 +86,10 @@ public interface VCloudDirectorAsyncClient {
     */
    @Delegate
    CatalogAsyncClient getMediaClient();
+   
+   /**
+    * @return asynchronous access to {@link Vdc} features
+    */
+   @Delegate
+   VdcAsyncClient getVdcClient();
 }
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClient.java
index 89c53a663b..7649998ed6 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClient.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClient.java
@@ -24,13 +24,19 @@ import org.jclouds.concurrent.Timeout;
 import org.jclouds.ovf.Network;
 import org.jclouds.rest.annotations.Delegate;
 import org.jclouds.vcloud.director.v1_5.domain.Org;
+import org.jclouds.vcloud.director.v1_5.domain.Catalog;
+import org.jclouds.vcloud.director.v1_5.domain.Media;
+import org.jclouds.vcloud.director.v1_5.domain.Org;
 import org.jclouds.vcloud.director.v1_5.domain.Session;
+import org.jclouds.vcloud.director.v1_5.domain.Task;
+import org.jclouds.vcloud.director.v1_5.domain.Vdc;
 import org.jclouds.vcloud.director.v1_5.features.CatalogClient;
 import org.jclouds.vcloud.director.v1_5.features.MediaClient;
 import org.jclouds.vcloud.director.v1_5.features.NetworkClient;
 import org.jclouds.vcloud.director.v1_5.features.OrgClient;
 import org.jclouds.vcloud.director.v1_5.features.QueryClient;
 import org.jclouds.vcloud.director.v1_5.features.TaskClient;
+import org.jclouds.vcloud.director.v1_5.features.VdcClient;
 
 import com.google.inject.Provides;
 
@@ -83,4 +89,10 @@ public interface VCloudDirectorClient {
     */
    @Delegate
    MediaClient getMediaClient();
+
+   /**
+    * @return synchronous access to {@link Vdc} features
+    */
+   @Delegate
+   VdcClient getVdcClient();
 }
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorMediaType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorMediaType.java
index aca63b8e36..910ac1ab70 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorMediaType.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorMediaType.java
@@ -71,7 +71,7 @@ public class VCloudDirectorMediaType {
    public static final String OWNER = "application/vnd.vmware.vcloud.owner+xml";
    
    public static final String VDC = "application/vnd.vmware.vcloud.vdc+xml";
-   
+
    public static final String ADMIN_USER = "application/vnd.vmware.admin.user+xml";
 
    public static final String QUERY_RESULT_RECORDS = "application/vnd.vmware.vcloud.query.records+xml";
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/config/VCloudDirectorRestClientModule.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/config/VCloudDirectorRestClientModule.java
index 6dd7be580f..ef9c121fd8 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/config/VCloudDirectorRestClientModule.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/config/VCloudDirectorRestClientModule.java
@@ -54,6 +54,8 @@ import org.jclouds.vcloud.director.v1_5.features.QueryAsyncClient;
 import org.jclouds.vcloud.director.v1_5.features.QueryClient;
 import org.jclouds.vcloud.director.v1_5.features.TaskAsyncClient;
 import org.jclouds.vcloud.director.v1_5.features.TaskClient;
+import org.jclouds.vcloud.director.v1_5.features.VdcAsyncClient;
+import org.jclouds.vcloud.director.v1_5.features.VdcClient;
 import org.jclouds.vcloud.director.v1_5.functions.LoginUserInOrgWithPassword;
 import org.jclouds.vcloud.director.v1_5.handlers.InvalidateSessionAndRetryOn401AndLogoutOnClose;
 import org.jclouds.vcloud.director.v1_5.handlers.VCloudDirectorErrorHandler;
@@ -87,6 +89,7 @@ public class VCloudDirectorRestClientModule extends RestClientModule<VCloudDirec
             .put(QueryClient.class, QueryAsyncClient.class)
             .put(MediaClient.class, MediaAsyncClient.class)
             .put(TaskClient.class, TaskAsyncClient.class)
+            .put(VdcClient.class, VdcAsyncClient.class)
             .build();
 
    public VCloudDirectorRestClientModule() {