From 148339858c1f0789d1c0a43fd3c3e65367aac749 Mon Sep 17 00:00:00 2001
From: Richard Downer <richard.downer@cloudsoftcorp.com>
Date: Wed, 5 Oct 2011 13:38:05 +0100
Subject: [PATCH 1/3] VAppAsyncClient.deleteVApp requires @Consume(TASK_XML)
 annotation

---
 .../main/java/org/jclouds/vcloud/features/VAppAsyncClient.java   | 1 +
 1 file changed, 1 insertion(+)

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 11d76287fc..d21c46f1b2 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
@@ -214,6 +214,7 @@ public interface VAppAsyncClient {
     * @see VAppClient#deleteVApp
     */
    @DELETE
+   @Consumes(TASK_XML)
    @ExceptionParser(ReturnVoidOnNotFoundOr404.class)
    @XMLResponseParser(TaskHandler.class)
    ListenableFuture<? extends Task> deleteVApp(@EndpointParam URI href);

From 7f9973e037f1e8b5387f4ac258bae082440bc862 Mon Sep 17 00:00:00 2001
From: Richard Downer <richard.downer@cloudsoftcorp.com>
Date: Wed, 5 Oct 2011 14:20:05 +0100
Subject: [PATCH 2/3] VAppAsyncClient.deleteVApp (deprecated API) requires
 @Consume(TASK_XML) annotation

---
 .../src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java      | 1 +
 1 file changed, 1 insertion(+)

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 f0d2a5c4b6..6e978a7479 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java
@@ -616,6 +616,7 @@ public interface VCloudAsyncClient {
     */
    @Deprecated
    @DELETE
+   @Consumes(TASK_XML)
    @ExceptionParser(ReturnVoidOnNotFoundOr404.class)
    @XMLResponseParser(TaskHandler.class)
    ListenableFuture<? extends Task> deleteVApp(@EndpointParam URI id);

From bc99e9e7ee7786795dc6ca88baeda3769f21bf54 Mon Sep 17 00:00:00 2001
From: Richard Downer <richard.downer@cloudsoftcorp.com>
Date: Wed, 5 Oct 2011 16:22:43 +0100
Subject: [PATCH 3/3] Update unit tests for deleteVApp

---
 .../src/test/java/org/jclouds/vcloud/VCloudAsyncClientTest.java | 2 +-
 .../java/org/jclouds/vcloud/features/VAppAsyncClientTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudAsyncClientTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudAsyncClientTest.java
index 690233bbe6..d45a40752e 100644
--- a/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudAsyncClientTest.java
+++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudAsyncClientTest.java
@@ -678,7 +678,7 @@ public class VCloudAsyncClientTest extends BaseVCloudAsyncClientTest<VCloudAsync
                .create("https://vcenterprise.bluelock.com/api/v1.0/vApp/1"));
 
       assertRequestLineEquals(request, "DELETE https://vcenterprise.bluelock.com/api/v1.0/vApp/1 HTTP/1.1");
-      assertNonPayloadHeadersEqual(request, "");
+      assertNonPayloadHeadersEqual(request, "Accept: application/vnd.vmware.vcloud.task+xml\n");
       assertPayloadEquals(request, null, null, false);
 
       assertResponseParserClassEquals(method, request, ParseSax.class);
diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/features/VAppAsyncClientTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/features/VAppAsyncClientTest.java
index ff6e576abe..92cfa24402 100644
--- a/apis/vcloud/src/test/java/org/jclouds/vcloud/features/VAppAsyncClientTest.java
+++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/features/VAppAsyncClientTest.java
@@ -225,7 +225,7 @@ public class VAppAsyncClientTest extends BaseVCloudAsyncClientTest<VAppAsyncClie
                .create("https://vcenterprise.bluelock.com/api/v1.0/vApp/1"));
 
       assertRequestLineEquals(request, "DELETE https://vcenterprise.bluelock.com/api/v1.0/vApp/1 HTTP/1.1");
-      assertNonPayloadHeadersEqual(request, "");
+      assertNonPayloadHeadersEqual(request, "Accept: application/vnd.vmware.vcloud.task+xml\n");
       assertPayloadEquals(request, null, null, false);
 
       assertResponseParserClassEquals(method, request, ParseSax.class);