From aaa22ffe175370fd0c1b92ba6d9321e18c3aeb78 Mon Sep 17 00:00:00 2001
From: danikov <dan.lobianco@cloudsoftcorp.com>
Date: Mon, 5 Mar 2012 18:49:09 +0000
Subject: [PATCH] wire up adminCatalog client

---
 .../vcloud/director/v1_5/VCloudDirectorAsyncClient.java  | 6 ++++++
 .../vcloud/director/v1_5/VCloudDirectorClient.java       | 9 ++++++++-
 .../v1_5/config/VCloudDirectorRestClientModule.java      | 1 +
 3 files changed, 15 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 40bbac8771..a7515639a3 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
@@ -26,6 +26,7 @@ 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.domain.ovf.Network;
+import org.jclouds.vcloud.director.v1_5.features.AdminCatalogAsyncClient;
 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;
@@ -106,4 +107,9 @@ public interface VCloudDirectorAsyncClient {
    @Delegate
    VAppTemplateAsyncClient getVAppTemplateClient();
    
+   /**
+    * @return asynchronous access to {@link Catalog} features
+    */
+   @Delegate
+   AdminCatalogAsyncClient getAdminCatalogClient();
 }
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 15d4195af1..294b49b5a8 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
@@ -29,6 +29,7 @@ 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.domain.ovf.Network;
+import org.jclouds.vcloud.director.v1_5.features.AdminCatalogClient;
 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;
@@ -84,7 +85,7 @@ public interface VCloudDirectorClient {
     */
    @Delegate
    CatalogClient getCatalogClient();
-
+   
    /**
     * @return synchronous access to {@link Media} features
     */
@@ -108,5 +109,11 @@ public interface VCloudDirectorClient {
     */
    @Delegate
    VAppTemplateClient getVAppTemplateClient();
+   
+   /**
+    * @return synchronous access to {@link Catalog} features
+    */
+   @Delegate
+   AdminCatalogClient getAdminCatalogClient();
 
 }
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 7163767131..e5c7a0da58 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
@@ -85,6 +85,7 @@ public class VCloudDirectorRestClientModule extends RestClientModule<VCloudDirec
             .put(UploadClient.class, UploadAsyncClient.class)
             .put(MetadataClient.Readable.class, MetadataAsyncClient.Readable.class)
             .put(MetadataClient.Writeable.class, MetadataAsyncClient.Writable.class)
+            .put(AdminCatalogClient.class, AdminCatalogAsyncClient.class)
             .build();
 
    public VCloudDirectorRestClientModule() {