You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/08/21 09:09:17 UTC

[04/52] [abbrv] [partial] stratos git commit: Merging jclouds GCE fix with upstream - resolving conflicts

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-carrenza-with-default-namespace.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-carrenza-with-default-namespace.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-carrenza-with-default-namespace.xml
deleted file mode 100644
index 88fec20..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-carrenza-with-default-namespace.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CatalogItem xmlns="http://www.vmware.com/vcloud/v1" name="ubuntu10.10x64" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://myvdc.carrenza.net/api/v1.0/catalogItem/ecd4d3a0-0d12-4195-a6d2-14cdf9f925a3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://myvdc.carrenza.net/api/v1.0/schema/master.xsd">
-    <Link rel="up" type="application/vnd.vmware.vcloud.catalog+xml" href="https://myvdc.carrenza.net/api/v1.0/catalog/5d2c147a-d26d-487a-9a05-577ee175186b"/>
-    <Link rel="edit" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://myvdc.carrenza.net/api/v1.0/catalogItem/ecd4d3a0-0d12-4195-a6d2-14cdf9f925a3"/>
-    <Link rel="remove" href="https://myvdc.carrenza.net/api/v1.0/catalogItem/ecd4d3a0-0d12-4195-a6d2-14cdf9f925a3"/>
-    <Description> </Description>
-    <Entity type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="ubuntu10.10x64" href="https://myvdc.carrenza.net/api/v1.0/vAppTemplate/vappTemplate-123766ea-2b55-482c-8adf-735ab1952834"/>
-</CatalogItem>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-carrenza-with-vcloud-namespace.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-carrenza-with-vcloud-namespace.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-carrenza-with-vcloud-namespace.xml
deleted file mode 100644
index 917c143..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-carrenza-with-vcloud-namespace.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vcloud:CatalogItem xmlns:vcloud="http://www.vmware.com/vcloud/v1" name="ubuntu10.10x64" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://myvdc.carrenza.net/api/v1.0/catalogItem/ecd4d3a0-0d12-4195-a6d2-14cdf9f925a3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://myvdc.carrenza.net/api/v1.0/schema/master.xsd">
-    <vcloud:Link rel="up" type="application/vnd.vmware.vcloud.catalog+xml" href="https://myvdc.carrenza.net/api/v1.0/catalog/5d2c147a-d26d-487a-9a05-577ee175186b"/>
-    <vcloud:Link rel="edit" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://myvdc.carrenza.net/api/v1.0/catalogItem/ecd4d3a0-0d12-4195-a6d2-14cdf9f925a3"/>
-    <vcloud:Link rel="remove" href="https://myvdc.carrenza.net/api/v1.0/catalogItem/ecd4d3a0-0d12-4195-a6d2-14cdf9f925a3"/>
-    <vcloud:Description> </vcloud:Description>
-    <vcloud:Entity type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="ubuntu10.10x64" href="https://myvdc.carrenza.net/api/v1.0/vAppTemplate/vappTemplate-123766ea-2b55-482c-8adf-735ab1952834"/>
-</vcloud:CatalogItem>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-hosting.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-hosting.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-hosting.xml
deleted file mode 100644
index 6f88d04..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-hosting.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CatalogItem
- href="https://vcloud.safesecureweb.com/api/v0.8/catalogItem/2"
- name="Windows 2008 Datacenter 64 Bit"
- xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 catalogItem.xsd"
- xmlns="http://www.vmware.com/vcloud/v0.8"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Description>Windows 2008 Datacenter 64 Bit</Description>
-  <Entity href="https://vcloud.safesecureweb.com/api/v0.8/vAppTemplate/2"
-        type="application/vnd.vmware.vcloud.vAppTemplate+xml"
-        name="Windows 2008 Datacenter 64 Bit" />
-  <Property key="Foo">Bar</Property>
-  <Property key="Hello">World</Property>
-</CatalogItem>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-terremark.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-terremark.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-terremark.xml
deleted file mode 100644
index feb8b82..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem-terremark.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<CatalogItem
-    href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/22"
-    type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows Web Server 2008 R2 (64-bit)"
-    xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Link rel="down"
-        href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/22/options/compute"
-        type="application/xml" name="Compute Options" />
-    <Link rel="down"
-        href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/22/options/customization"
-        type="application/xml" name="Customization Options" />
-    <Entity
-        href="https://services.vcloudexpress.terremark.com/api/v0.8/vAppTemplate/22"
-        type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows Web Server 2008 R2 (64-bit)" />
-    <Property key="LicensingCost">0</Property>
-</CatalogItem>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem1.0-vcd15.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem1.0-vcd15.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem1.0-vcd15.xml
deleted file mode 100644
index b344071..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/catalogItem1.0-vcd15.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CatalogItem xmlns="http://www.vmware.com/vcloud/v1" name="UbuntuServer-x64-2GB" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://zone.myvcloud.com/api/v1.0/catalogItem/ceb369f7-1d07-4e32-9dbd-ebb5aa6ca55c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 https://zone.myvcloud.com/api/v1.0/schema/master.xsd">
-    <Link rel="up" type="application/vnd.vmware.vcloud.catalog+xml" href="https://zone.myvcloud.com/api/v1.0/catalog/3155f393-1e1d-4572-8c9c-d76f72ddb658"/>
-    <Link rel="edit" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://zone.myvcloud.com/api/v1.0/catalogItem/ceb369f7-1d07-4e32-9dbd-ebb5aa6ca55c"/>
-    <Link rel="remove" href="https://zone.myvcloud.com/api/v1.0/catalogItem/ceb369f7-1d07-4e32-9dbd-ebb5aa6ca55c"/>
-    <Description> </Description>
-    <Entity type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="UbuntuServer-x64-2GB" href="https://zone.myvcloud.com/api/v1.0/vAppTemplate/vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728"/>
-</CatalogItem>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVApp-default.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVApp-default.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVApp-default.xml
deleted file mode 100644
index 0e8ba8d..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVApp-default.xml
+++ /dev/null
@@ -1 +0,0 @@
-<CloneVAppParams xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" deploy="false" name="my-vapp" powerOn="false" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Source href="https://vcenterprise.bluelock.com/api/v1.0/vapp/4181" type="application/vnd.vmware.vcloud.vApp+xml"/></CloneVAppParams>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVApp.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVApp.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVApp.xml
deleted file mode 100644
index b6cd733..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVApp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<CloneVAppParams xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" deploy="true" name="new-linux-server" powerOn="true" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Description>The description of the new vApp</Description><Source href="https://vcenterprise.bluelock.com/api/v1.0/vapp/201" type="application/vnd.vmware.vcloud.vApp+xml"/></CloneVAppParams>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVAppTemplate-default.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVAppTemplate-default.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVAppTemplate-default.xml
deleted file mode 100644
index 00b11e7..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVAppTemplate-default.xml
+++ /dev/null
@@ -1 +0,0 @@
-<CloneVAppTemplateParams xmlns="http://vcloud.safesecureweb.com/ns/vcloud.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="my-vapptemplate" xsi:schemaLocation="http://vcloud.safesecureweb.com/ns/vcloud.xsd http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Source href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/4181" type="application/vnd.vmware.vcloud.vAppTemplate+xml"/></CloneVAppTemplateParams>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVAppTemplate.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVAppTemplate.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVAppTemplate.xml
deleted file mode 100644
index e612b98..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/copyVAppTemplate.xml
+++ /dev/null
@@ -1 +0,0 @@
-<CloneVAppTemplateParams xmlns="http://vcloud.safesecureweb.com/ns/vcloud.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="new-linux-server" xsi:schemaLocation="http://vcloud.safesecureweb.com/ns/vcloud.xsd http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Description>The description of the new vAppTemplate</Description><Source href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/201" type="application/vnd.vmware.vcloud.vAppTemplate+xml"/></CloneVAppTemplateParams>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/cpuItem.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/cpuItem.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/cpuItem.xml
deleted file mode 100644
index d5e437b..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/cpuItem.xml
+++ /dev/null
@@ -1 +0,0 @@
-<Item xmlns="http://www.vmware.com/vcloud/v1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"><rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits><rasd:Description>Number of Virtual CPUs</rasd:Description><rasd:ElementName>2 virtual CPU(s)</rasd:ElementName><rasd:InstanceID>4</rasd:InstanceID><rasd:ResourceType>3</rasd:ResourceType><rasd:VirtualQuantity>2</rasd:VirtualQuantity><rasd:Weight>0</rasd:Weight></Item>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/guestCustomization.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/guestCustomization.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/guestCustomization.xml
deleted file mode 100644
index 644720f..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/guestCustomization.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<GuestCustomizationSection
-                type="application/vnd.vmware.vcloud.guestCustomizationSection+xml"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/guestCustomizationSection/"
-                ovf:required="false">
-                <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
-                <Enabled>true</Enabled>
-                <ChangeSid>false</ChangeSid>
-                <VirtualMachineId>2087535248</VirtualMachineId>
-                <JoinDomainEnabled>false</JoinDomainEnabled>
-                <UseOrgSettings>false</UseOrgSettings>
-                <AdminPasswordEnabled>true</AdminPasswordEnabled>
-                <AdminPasswordAuto>true</AdminPasswordAuto>
-                <ResetPasswordRequired>false</ResetPasswordRequired>
-                <CustomizationScript>cat &gt; /root/foo.txt&lt;&lt;EOF
-I '"love"' {asc|!}*&amp;
-EOF
-</CustomizationScript>
-                <ComputerName>RHEL5</ComputerName>
-                <Link rel="edit"
-                    type="application/vnd.vmware.vcloud.guestCustomizationSection+xml"
-                    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/guestCustomizationSection/" />
-</GuestCustomizationSection>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/guestCustomizationSection.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/guestCustomizationSection.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/guestCustomizationSection.xml
deleted file mode 100644
index 2fadb53..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/guestCustomizationSection.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<GuestCustomizationSection xmlns="http://www.vmware.com/vcloud/v1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" href="http://vcloud.example.com/api/v1.0/vApp/vm-12/guestCustomizationSection" ovf:required="false" type="application/vnd.vmware.vcloud.guestCustomizationSection+xml"><ovf:Info>Specifies Guest OS Customization Settings</ovf:Info><CustomizationScript>cat &gt; /tmp/foo.txt&lt;&lt;EOF
-I love candy
-EOF</CustomizationScript></GuestCustomizationSection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiatedvapp.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiatedvapp.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiatedvapp.xml
deleted file mode 100644
index 9d98c2d..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiatedvapp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VApp xmlns="http://www.vmware.com/vcloud/v1" deployed="false" status="0" name="vcds-a47" type="application/vnd.vmware.vcloud.vApp+xml" href="https://zone01.bluelock.com/api/v1.0/vApp/vapp-dba20113-1a4a-4ec9-a5ad-52dc69ee0825" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://zone01.bluelock.com/api/v1.0/schema/master.xsd">
-    <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://zone01.bluelock.com/api/v1.0/vApp/vapp-dba20113-1a4a-4ec9-a5ad-52dc69ee0825/controlAccess/"/>
-    <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://zone01.bluelock.com/api/v1.0/vdc/9db4ee77-33e7-4b83-96be-eee9925eaa9b"/>
-    <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" href="https://zone01.bluelock.com/api/v1.0/vApp/vapp-dba20113-1a4a-4ec9-a5ad-52dc69ee0825/owner"/>
-    <Description>OS-Ubuntu10.04_x64</Description>
-    <Tasks>
-        <Task status="running" startTime="2012-07-11T20:37:49.521-04:00" operation="Creating Virtual Application vcds-a47(dba20113-1a4a-4ec9-a5ad-52dc69ee0825)" expiryTime="2012-08-25T20:37:49.521-04:00" type="application/vnd.vmware.vcloud.task+xml" href="https://zone01.bluelock.com/api/v1.0/task/fee48ffc-8ba2-452e-a57f-ada0cd2eda31">
-            <Link rel="task:cancel" href="https://zone01.bluelock.com/api/v1.0/task/fee48ffc-8ba2-452e-a57f-ada0cd2eda31/action/cancel"/>
-            <Owner type="application/vnd.vmware.vcloud.vApp+xml" name="vcds-a47" href="https://zone01.bluelock.com/api/v1.0/vApp/vapp-dba20113-1a4a-4ec9-a5ad-52dc69ee0825"/>
-        </Task>
-    </Tasks>
-</VApp>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiationparams-description.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiationparams-description.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiationparams-description.xml
deleted file mode 100644
index 6728290..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiationparams-description.xml
+++ /dev/null
@@ -1 +0,0 @@
-<InstantiateVAppTemplateParams xmlns="http://www.vmware.com/vcloud/v1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" deploy="true" name="my-vapp" powerOn="true"><Description>my foo</Description><InstantiationParams><NetworkConfigSection><ovf:Info>Configuration parameters for logical networks</ovf:Info><NetworkConfig networkName="vAppNet-vApp Internal"><Configuration><ParentNetwork href="https://vcenterprise.bluelock.com/api/v1.0/network/1990"/><FenceMode>bridged</FenceMode></Configuration></NetworkConfig></NetworkConfigSection></InstantiationParams><Source href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/3"/><AllEULAsAccepted>true</AllEULAsAccepted></InstantiateVAppTemplateParams>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiationparams-network.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiationparams-network.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiationparams-network.xml
deleted file mode 100644
index e3bcb58..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiationparams-network.xml
+++ /dev/null
@@ -1 +0,0 @@
-<InstantiateVAppTemplateParams xmlns="http://www.vmware.com/vcloud/v1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" deploy="true" name="my-vapp" powerOn="true"><InstantiationParams><NetworkConfigSection><ovf:Info>Configuration parameters for logical networks</ovf:Info><NetworkConfig networkName="aloha"><Configuration><ParentNetwork href="https://vcenterprise.bluelock.com/api/v1.0/network/1991"/><FenceMode>natRouted</FenceMode></Configuration></NetworkConfig></NetworkConfigSection></InstantiationParams><Source href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/3"/><AllEULAsAccepted>true</AllEULAsAccepted></InstantiateVAppTemplateParams>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiationparams.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiationparams.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiationparams.xml
deleted file mode 100644
index 9df9961..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/instantiationparams.xml
+++ /dev/null
@@ -1 +0,0 @@
-<InstantiateVAppTemplateParams xmlns="http://www.vmware.com/vcloud/v1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" deploy="true" name="my-vapp" powerOn="true"><InstantiationParams><NetworkConfigSection><ovf:Info>Configuration parameters for logical networks</ovf:Info><NetworkConfig networkName="vAppNet-vApp Internal"><Configuration><ParentNetwork href="https://vcenterprise.bluelock.com/api/v1.0/network/1990"/><FenceMode>bridged</FenceMode></Configuration></NetworkConfig></NetworkConfigSection></InstantiationParams><Source href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/3"/><AllEULAsAccepted>true</AllEULAsAccepted></InstantiateVAppTemplateParams>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/log4j.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/log4j.xml
deleted file mode 100644
index 63810d3..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-    <!--
-        For more configuration infromation and examples see the Apache
-        Log4j website: http://logging.apache.org/log4j/
-    -->
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
-    debug="false">
-
-    <!-- A time/date based rolling appender -->
-    <appender name="WIREFILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="target/test-data/jclouds-wire.log" />
-        <param name="Append" value="true" />
-
-        <!-- Rollover at midnight each day -->
-        <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
-        <param name="Threshold" value="TRACE" />
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
-            <!--
-                The full pattern: Date MS Priority [Category]
-                (Thread:NDC) Message\n <param name="ConversionPattern"
-                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-            -->
-        </layout>
-    </appender>
-
-    <!-- A time/date based rolling appender -->
-    <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="target/test-data/jclouds.log" />
-        <param name="Append" value="true" />
-
-        <!-- Rollover at midnight each day -->
-        <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
-        <param name="Threshold" value="TRACE" />
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
-            <!--
-                The full pattern: Date MS Priority [Category]
-                (Thread:NDC) Message\n <param name="ConversionPattern"
-                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-            -->
-        </layout>
-    </appender>
-    
-    <!-- A time/date based rolling appender -->
-    <appender name="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="target/test-data/jclouds-compute.log" />
-        <param name="Append" value="true" />
-
-        <!-- Rollover at midnight each day -->
-        <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
-        <param name="Threshold" value="TRACE" />
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
-            <!--
-                The full pattern: Date MS Priority [Category]
-                (Thread:NDC) Message\n <param name="ConversionPattern"
-                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-            -->
-        </layout>
-    </appender>
-
-    <!-- A time/date based rolling appender -->
-    <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="target/test-data/jclouds-ssh.log" />
-        <param name="Append" value="true" />
-
-        <!-- Rollover at midnight each day -->
-        <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
-        <param name="Threshold" value="TRACE" />
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
-            <!--
-                The full pattern: Date MS Priority [Category]
-                (Thread:NDC) Message\n <param name="ConversionPattern"
-                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-            -->
-        </layout>
-    </appender>
-
-    <appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="COMPUTEFILE" />
-    </appender>
-    
-    <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="SSHFILE" />
-    </appender>
-
-    <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="FILE" />
-    </appender>
-
-    <appender name="ASYNCWIRE" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="WIREFILE" />
-    </appender>
-
-    <!-- ================ -->
-    <!-- Limit categories -->
-    <!-- ================ -->
-
-    <category name="org.jclouds">
-        <priority value="DEBUG" />
-        <appender-ref ref="ASYNC" />
-    </category>
-
-    <category name="jclouds.headers">
-        <priority value="DEBUG" />
-        <appender-ref ref="ASYNCWIRE" />
-    </category>
-    
-    <category name="jclouds.ssh">
-        <priority value="DEBUG" />
-        <appender-ref ref="ASYNCSSH" />
-    </category>
-    
-    <category name="jclouds.wire">
-        <priority value="DEBUG" />
-        <appender-ref ref="ASYNCWIRE" />
-    </category>
-
-    <category name="jclouds.compute">
-        <priority value="TRACE" />
-        <appender-ref ref="ASYNCCOMPUTE" />
-    </category>
-    <!-- ======================= -->
-    <!-- Setup the Root category -->
-    <!-- ======================= -->
-
-    <root>
-        <priority value="WARN" />
-    </root>
-
-</log4j:configuration>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/memoryItem.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/memoryItem.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/memoryItem.xml
deleted file mode 100644
index df35b83..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/memoryItem.xml
+++ /dev/null
@@ -1 +0,0 @@
-<Item xmlns="http://www.vmware.com/vcloud/v1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"><rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits><rasd:Description>Memory Size</rasd:Description><rasd:ElementName>512 MB of memory</rasd:ElementName><rasd:InstanceID>5</rasd:InstanceID><rasd:Reservation>0</rasd:Reservation><rasd:ResourceType>4</rasd:ResourceType><rasd:VirtualQuantity>512</rasd:VirtualQuantity><rasd:Weight>0</rasd:Weight></Item>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/moveVApp.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/moveVApp.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/moveVApp.xml
deleted file mode 100644
index 919d136..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/moveVApp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<CloneVAppParams xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" deploy="true" name="new-linux-server" powerOn="true" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Description>The description of the new vApp</Description><Source href="https://vcenterprise.bluelock.com/api/v1.0/vapp/201" type="application/vnd.vmware.vcloud.vApp+xml"/><IsSourceDelete>true</IsSourceDelete></CloneVAppParams>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/moveVAppTemplate.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/moveVAppTemplate.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/moveVAppTemplate.xml
deleted file mode 100644
index 2f72f2b..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/moveVAppTemplate.xml
+++ /dev/null
@@ -1 +0,0 @@
-<CloneVAppTemplateParams xmlns="http://vcloud.safesecureweb.com/ns/vcloud.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="new-linux-server" xsi:schemaLocation="http://vcloud.safesecureweb.com/ns/vcloud.xsd http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Description>The description of the new vAppTemplate</Description><Source href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/201" type="application/vnd.vmware.vcloud.vAppTemplate+xml"/><IsSourceDelete>true</IsSourceDelete></CloneVAppTemplateParams>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/networkconnection.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/networkconnection.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/networkconnection.xml
deleted file mode 100644
index 5400fc7..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/networkconnection.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<NetworkConnection network="internet01">
-    <NetworkConnectionIndex>0</NetworkConnectionIndex>
-    <IpAddress>174.47.101.164</IpAddress>
-    <IsConnected>true</IsConnected>
-    <MACAddress>00:50:56:01:01:f2</MACAddress>
-    <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
-</NetworkConnection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/networkconnectionsection.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/networkconnectionsection.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/networkconnectionsection.xml
deleted file mode 100644
index 9550ef6..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/networkconnectionsection.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<NetworkConnectionSection
-    type="application/vnd.vmware.vcloud.networkConnectionSection+xml"
-    href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/networkConnectionSection/"
-    ovf:required="false">
-    <ovf:Info>Specifies the available VM network connections</ovf:Info>
-    <PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
-    <NetworkConnection network="internet01">
-        <NetworkConnectionIndex>0</NetworkConnectionIndex>
-        <IpAddress>174.47.101.164</IpAddress>
-        <IsConnected>true</IsConnected>
-        <MACAddress>00:50:56:01:01:f2</MACAddress>
-        <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
-    </NetworkConnection>
-    <Link rel="edit"
-        type="application/vnd.vmware.vcloud.networkConnectionSection+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/networkConnectionSection/" />
-</NetworkConnectionSection>
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org-1.0.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org-1.0.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org-1.0.xml
deleted file mode 100644
index af9803f..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org-1.0.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Org name="ExampleOrg" type="application/vnd.vmware.vcloud.org+xml"
-	href="http://vcloud.example.com/api/v1.0/org/5" >
-	<Link type="application/vnd.vmware.vcloud.catalog+xml" rel="down"
-		href="http://vcloud.example.com/api/v1.0/catalog/32" name="Main Catalog" />
-	<Link type="application/vnd.vmware.vcloud.controlAccess+xml" rel="down"
-		href="http://vcloud.example.com/api/v1.0/catalog/32/controlAccess" />
-	<Link type="application/vnd.vmware.vcloud.controlAccess+xml" rel="controlAccess"
-		href="http://vcloud.example.com/api/v1.0/catalog/32/action/controlAccess" />
-	<Link type="application/vnd.vmware.vcloud.catalog+xml" rel="down"
-		href="http://vcloud.example.com/api/v1.0/catalog/37" name="Shared Catalog" />
-	<Link type="application/vnd.vmware.vcloud.controlAccess+xml" rel="down"
-		href="http://vcloud.example.com/api/v1.0/catalog/37/controlAccess" />
-	<Link type="application/vnd.vmware.vcloud.controlAccess+xml" rel="controlAccess"
-		href="http://vcloud.example.com/api/v1.0/catalog/37/action/controlAccess" />
-	<Link type="application/vnd.vmware.vcloud.vdc+xml" rel="down"
-		href="http://vcloud.example.com/api/v1.0/vdc/5" name="ExampleVdc01" />
-	<Link type="application/vnd.vmware.vcloud.tasksList+xml" rel="down"
-		href="http://vcloud.example.com/api/v1.0/tasksList/5" />
-	<Link type="application/vnd.vmware.vcloud.network+xml" rel="down"
-		href="http://vcloud.example.com/api/v1.0/network/14" name="TestNetwork" />
-	<Link type="application/vnd.vmware.vcloud.network+xml" rel="down"
-		href="http://vcloud.example.com/api/v1.0/network/54" name="ProductionNetwork" />
-	<Description>Example Corp's Primary Organization.</Description>
-</Org>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org-hosting.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org-hosting.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org-hosting.xml
deleted file mode 100644
index 3bd9842..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org-hosting.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Org href="https://vcloud.safesecureweb.com/api/v0.8/org/188849"
-    name="Customer 188849" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8/organization.xsd"
-    xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <Link rel="down" href="https://vcloud.safesecureweb.com/api/v0.8/catalog/1"
-        type="application/vnd.vmware.vcloud.catalog+xml" name="HMS Shared Catalog" />
-    <Link rel="down"
-        href="https://vcloud.safesecureweb.com/api/v0.8/vdc/188849"
-        type="application/vnd.vmware.vcloud.vdc+xml" name="188849 Virtual DataCenter" />
-    <Link rel="down"
-        href="https://vcloud.safesecureweb.com/api/v0.8/tasksList/188849"
-        type="application/vnd.vmware.vcloud.tasksList+xml" name="188849 Task List" />
-</Org>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org-savvis.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org-savvis.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org-savvis.xml
deleted file mode 100644
index c2517c7..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org-savvis.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vApp:Org xmlns:vApp="http://www.vmware.com/vcloud/v0.8"
-    xmlns:common="http://schemas.dmtf.org/wbem/wscim/1/common"
-    xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
-    xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-    xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-    name="607968.0">
-    <vApp:Link
-        href="https://api.symphonyVPDC.savvis.net/rest/api/v0.8/org/607968.0/vdc/2826"
-        name="GravDataCenter1(Saved)" rel="down"
-        type="application/vnd.vmware.vcloud.vdc+xml" />
-    <vApp:Description>Gravitant Inc</vApp:Description>
-</vApp:Org>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org.xml
deleted file mode 100644
index 1728721..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<Org href="https://services.vcloudexpress.terremark.com/api/v0.8/org/48" name="adrian@jclouds.org" xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-     <Link rel="down" href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/32" type="application/vnd.vmware.vcloud.vdc+xml" name="Miami Environment 1"/>
-     <Link rel="down" href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/32/catalog" type="application/vnd.vmware.vcloud.catalog+xml" name="Miami Environment 1 Catalog"/>
-     <Link rel="down" href="https://services.vcloudexpress.terremark.com/api/v0.8/tasksList/32" type="application/vnd.vmware.vcloud.tasksList+xml" name="Miami Environment 1 Tasks List"/>
-</Org>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org1.0-vcd15.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org1.0-vcd15.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org1.0-vcd15.xml
deleted file mode 100644
index d0ca5b7..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/org1.0-vcd15.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Org xmlns="http://www.vmware.com/vcloud/v1" name="jclouds" type="application/vnd.vmware.vcloud.org+xml" href="https://zone.myvcloud.com/api/v1.0/org/c076f90a-397a-49fa-89b8-b294c1599cd0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 https://zone.myvcloud.com/api/v1.0/schema/master.xsd">
-    <Link rel="down" type="application/vnd.vmware.vcloud.vdc+xml" name="orgVDC-jclouds-Tier1-PAYG" href="https://zone.myvcloud.com/api/v1.0/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"/>
-    <Link rel="down" type="application/vnd.vmware.vcloud.tasksList+xml" href="https://zone.myvcloud.com/api/v1.0/tasksList/c076f90a-397a-49fa-89b8-b294c1599cd0"/>
-    <Link rel="down" type="application/vnd.vmware.vcloud.catalog+xml" name="jclouds" href="https://zone.myvcloud.com/api/v1.0/catalog/3155f393-1e1d-4572-8c9c-d76f72ddb658"/>
-    <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://zone.myvcloud.com/api/v1.0/org/c076f90a-397a-49fa-89b8-b294c1599cd0/catalog/3155f393-1e1d-4572-8c9c-d76f72ddb658/controlAccess/"/>
-    <Link rel="controlAccess" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://zone.myvcloud.com/api/v1.0/org/c076f90a-397a-49fa-89b8-b294c1599cd0/catalog/3155f393-1e1d-4572-8c9c-d76f72ddb658/action/controlAccess"/>
-    <Link rel="down" type="application/vnd.vmware.vcloud.network+xml" name="orgNet-jclouds-External" href="https://zone.myvcloud.com/api/v1.0/network/b466c0c5-8a5c-4335-b703-a2e2e6b5f3e1"/>
-    <Description>Customer jclouds</Description>
-    <FullName>jclouds</FullName>
-</Org>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orgList1.0-vcd15.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orgList1.0-vcd15.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orgList1.0-vcd15.xml
deleted file mode 100644
index 40f3cbe..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orgList1.0-vcd15.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OrgList xmlns="http://www.vmware.com/vcloud/v1" type="application/vnd.vmware.vcloud.orgList+xml" href="https://zone.myvcloud.com/api/v1.0/org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 https://zone.myvcloud.com/api/v1.0/schema/master.xsd">
-    <Org type="application/vnd.vmware.vcloud.org+xml" name="jclouds" href="https://zone.myvcloud.com/api/v1.0/org/c076f90a-397a-49fa-89b8-b294c1599cd0"/>
-</OrgList>   
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orglist-savvis.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orglist-savvis.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orglist-savvis.xml
deleted file mode 100644
index 4de503b..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orglist-savvis.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vApp:OrgList xmlns:vApp="http://www.vmware.com/vcloud/v0.8">
-<vApp:Org name="SAVVISStation Integration Testing" type="application/vnd.vmware.vcloud.org+xml" href="https://api.sandbox.symphonyvpdc.savvis.net/rest/api/v0.8/org/100000.0"/>
-</vApp:OrgList>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orglist.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orglist.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orglist.xml
deleted file mode 100644
index e6117b3..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orglist.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<OrgList xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<Org href="https://services.vcloudexpress.terremark.com/api/v0.8/org/48" type="application/vnd.vmware.vcloud.org+xml" name="adrian@jclouds.org"/>
-</OrgList>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orgnetwork-bridged.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orgnetwork-bridged.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orgnetwork-bridged.xml
deleted file mode 100644
index cb2a0d3..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orgnetwork-bridged.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OrgNetwork xmlns="http://www.vmware.com/vcloud/v1" name="internet01" type="application/vnd.vmware.vcloud.network+xml" href="https://vcenterprise.bluelock.com/api/v1.0/network/758634723" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://vcenterprise.bluelock.com/api/v1.0/schema/master.xsd">
-    <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" href="https://vcenterprise.bluelock.com/api/v1.0/org/9566014"/>
-    <Description/>
-    <Configuration>
-        <IpScope>
-            <IsInherited>true</IsInherited>
-            <Gateway>174.47.101.161</Gateway>
-            <Netmask>255.255.255.224</Netmask>
-            <Dns1>24.172.173.113</Dns1>
-            <IpRanges>
-                <IpRange>
-                    <StartAddress>174.47.101.164</StartAddress>
-                    <EndAddress>174.47.101.190</EndAddress>
-                </IpRange>
-            </IpRanges>
-        </IpScope>
-        <FenceMode>bridged</FenceMode>
-    </Configuration>
-</OrgNetwork>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orgnetwork-isolated.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orgnetwork-isolated.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orgnetwork-isolated.xml
deleted file mode 100644
index ac3a66a..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/orgnetwork-isolated.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OrgNetwork xmlns="http://www.vmware.com/vcloud/v1" name="isolation01" type="application/vnd.vmware.vcloud.network+xml" href="https://vcenterprise.bluelock.com/api/v1.0/network/990419644" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://vcenterprise.bluelock.com/api/v1.0/schema/master.xsd">
-    <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" href="https://vcenterprise.bluelock.com/api/v1.0/org/9566014"/>
-    <Description/>
-    <Configuration>
-        <IpScope>
-            <IsInherited>false</IsInherited>
-            <Gateway>192.168.15.1</Gateway>
-            <Netmask>255.255.255.0</Netmask>
-            <Dns1>23.172.173.113</Dns1>
-            <IpRanges>
-                <IpRange>
-                    <StartAddress>192.168.15.100</StartAddress>
-                    <EndAddress>192.168.15.199</EndAddress>
-                </IpRange>
-            </IpRanges>
-        </IpScope>
-        <FenceMode>isolated</FenceMode>
-        <Features>
-            <DhcpService>
-                <IsEnabled>false</IsEnabled>
-                <DefaultLeaseTime>3600</DefaultLeaseTime>
-                <MaxLeaseTime>7200</MaxLeaseTime>
-                <IpRange>
-                    <StartAddress>192.168.15.2</StartAddress>
-                    <EndAddress>192.168.15.99</EndAddress>
-                </IpRange>
-            </DhcpService>
-        </Features>
-    </Configuration>
-</OrgNetwork>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/os.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/os.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/os.xml
deleted file mode 100644
index 3196a27..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/os.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<ovf:OperatingSystemSection xmlns:vcloud="http://www.vmware.com/vcloud/v1"
-    xmlns:vmw="http://www.vmware.com/schema/ovf" ovf:id="80"
-    vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/operatingSystemSection/"
-    vcloud:type="application/vnd.vmware.vcloud.operatingSystemSection+xml"
-    vmw:osType="rhel5_64Guest">
-    <ovf:Info>Specifies the operating system installed</ovf:Info>
-    <ovf:Description>Red Hat Enterprise Linux 5 (64-bit)</ovf:Description>
-    <Link rel="edit"
-        type="application/vnd.vmware.vcloud.operatingSystemSection+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/operatingSystemSection/" />
-</ovf:OperatingSystemSection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/ovf-multi-vm.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/ovf-multi-vm.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/ovf-multi-vm.xml
deleted file mode 100644
index fa4bb37..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/ovf-multi-vm.xml
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ovf:Envelope xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:vcloud="http://www.vmware.com/vcloud/v1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_VirtualSystemSettingData.xsd http://schemas.dmtf.org/ovf/envelope/1 http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd http://www.vmware.com/vcloud/v1 http://zone.myvcloud.com/api/v1.0/schema/master.xsd">
-    <ovf:References/>
-    <ovf:NetworkSection>
-        <ovf:Info>The list of logical networks</ovf:Info>
-        <ovf:Network ovf:name="vapp net">
-            <ovf:Description/>
-        </ovf:Network>
-    </ovf:NetworkSection>
-    <vcloud:NetworkConfigSection ovf:required="false">
-        <ovf:Info>The configuration parameters for logical networks</ovf:Info>
-        <vcloud:NetworkConfig networkName="vapp net">
-            <vcloud:Description/>
-            <vcloud:Configuration>                
-                <vcloud:IpScope>
-                    <vcloud:IsInherited>false</vcloud:IsInherited>
-                    <vcloud:Gateway>192.168.2.1</vcloud:Gateway>
-                    <vcloud:Netmask>255.255.255.0</vcloud:Netmask>
-                    <vcloud:Dns1>195.225.219.131</vcloud:Dns1>
-                    <vcloud:IpRanges>
-                        <vcloud:IpRange>
-                            <vcloud:StartAddress>192.168.2.100</vcloud:StartAddress>
-                            <vcloud:EndAddress>192.168.2.199</vcloud:EndAddress>
-                        </vcloud:IpRange>
-                    </vcloud:IpRanges>
-                </vcloud:IpScope>
-                <vcloud:FenceMode>isolated</vcloud:FenceMode>
-                <vcloud:Features>
-                    <vcloud:DhcpService>
-                        <vcloud:IsEnabled>false</vcloud:IsEnabled>
-                        <vcloud:DefaultLeaseTime>7200</vcloud:DefaultLeaseTime>
-                        <vcloud:MaxLeaseTime>7200</vcloud:MaxLeaseTime>
-                        <vcloud:IpRange/>
-                    </vcloud:DhcpService>
-                </vcloud:Features>
-            </vcloud:Configuration>
-            <vcloud:IsDeployed>false</vcloud:IsDeployed>
-        </vcloud:NetworkConfig>
-    </vcloud:NetworkConfigSection>
-    <vcloud:LeaseSettingsSection ovf:required="false">
-        <ovf:Info>Lease settings section</ovf:Info>
-        <vcloud:DeploymentLeaseInSeconds>0</vcloud:DeploymentLeaseInSeconds>
-        <vcloud:StorageLeaseInSeconds>0</vcloud:StorageLeaseInSeconds>
-    </vcloud:LeaseSettingsSection>
-    <vcloud:CustomizationSection ovf:required="false">
-        <ovf:Info>VApp template customization section</ovf:Info>
-        <vcloud:CustomizeOnInstantiate>true</vcloud:CustomizeOnInstantiate>
-    </vcloud:CustomizationSection>
-    <ovf:VirtualSystemCollection ovf:id="centos-web/db-5.5">
-        <ovf:Info>A collection of virtual machines: </ovf:Info>
-        <ovf:Name>centos-web/db-5.5</ovf:Name>
-        <ovf:StartupSection>
-            <ovf:Info>VApp startup section</ovf:Info>
-            <ovf:Item ovf:stopDelay="0" ovf:stopAction="powerOff" ovf:startDelay="0" ovf:startAction="powerOn" ovf:order="0" ovf:id="centos-web"/>
-            <ovf:Item ovf:stopDelay="0" ovf:stopAction="powerOff" ovf:startDelay="0" ovf:startAction="powerOn" ovf:order="0" ovf:id="centos-db"/>
-        </ovf:StartupSection>
-        <ovf:VirtualSystem ovf:id="centos-db">
-            <ovf:Info>A virtual machine: </ovf:Info>
-            <ovf:Name>centos-db</ovf:Name>
-            <ovf:OperatingSystemSection xmlns:vmw="http://www.vmware.com/schema/ovf" ovf:id="100" vmw:osType="other26xLinux64Guest">
-                <ovf:Info>Specifies the operating system installed</ovf:Info>
-                <ovf:Description>Other 2.6x Linux (64-bit)</ovf:Description>
-            </ovf:OperatingSystemSection>
-            <ovf:VirtualHardwareSection>
-                <ovf:Info>Virtual hardware requirements</ovf:Info>
-                <ovf:System>
-                    <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
-                    <vssd:InstanceID>0</vssd:InstanceID>
-                    <vssd:VirtualSystemIdentifier>centos-db</vssd:VirtualSystemIdentifier>
-                    <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
-                </ovf:System>
-                <ovf:Item>
-                    <rasd:Address>00:50:56:01:06:81</rasd:Address>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
-                    <rasd:Connection vcloud:ipAddress="192.168.2.100" vcloud:primaryNetworkConnection="true" vcloud:ipAddressingMode="POOL">vapp net</rasd:Connection>
-
-                    <rasd:Description>PCNet32 ethernet adapter</rasd:Description>
-                    <rasd:ElementName>Network adapter 0</rasd:ElementName>
-                    <rasd:InstanceID>1</rasd:InstanceID>
-                    <rasd:ResourceSubType>PCNet32</rasd:ResourceSubType>
-                    <rasd:ResourceType>10</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:Address>0</rasd:Address>
-                    <rasd:Description>SCSI Controller</rasd:Description>
-                    <rasd:ElementName>SCSI Controller 0</rasd:ElementName>
-                    <rasd:InstanceID>2</rasd:InstanceID>
-                    <rasd:ResourceSubType>lsilogic</rasd:ResourceSubType>
-                    <rasd:ResourceType>6</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:Description>Hard disk</rasd:Description>
-                    <rasd:ElementName>Hard disk 1</rasd:ElementName>
-                    <rasd:HostResource vcloud:capacity="8192" vcloud:busType="6" vcloud:busSubType="lsilogic"/>
-                    <rasd:InstanceID>2000</rasd:InstanceID>
-                    <rasd:Parent>2</rasd:Parent>
-                    <rasd:ResourceType>17</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:Address>0</rasd:Address>
-                    <rasd:Description>IDE Controller</rasd:Description>
-                    <rasd:ElementName>IDE Controller 0</rasd:ElementName>
-                    <rasd:InstanceID>3</rasd:InstanceID>
-                    <rasd:ResourceType>5</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
-                    <rasd:Description>CD/DVD Drive</rasd:Description>
-                    <rasd:ElementName>CD/DVD Drive 1</rasd:ElementName>
-                    <rasd:HostResource/>
-                    <rasd:InstanceID>3000</rasd:InstanceID>
-                    <rasd:Parent>3</rasd:Parent>
-                    <rasd:ResourceType>15</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
-                    <rasd:Description>Floppy Drive</rasd:Description>
-                    <rasd:ElementName>Floppy Drive 1</rasd:ElementName>
-                    <rasd:HostResource/>
-                    <rasd:InstanceID>8000</rasd:InstanceID>
-                    <rasd:ResourceType>14</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
-                    <rasd:Description>Number of Virtual CPUs</rasd:Description>
-                    <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>
-                    <rasd:InstanceID>4</rasd:InstanceID>
-                    <rasd:Reservation>0</rasd:Reservation>
-                    <rasd:ResourceType>3</rasd:ResourceType>
-                    <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
-                    <rasd:Weight>0</rasd:Weight>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
-                    <rasd:Description>Memory Size</rasd:Description>
-                    <rasd:ElementName>2048 MB of memory</rasd:ElementName>
-                    <rasd:InstanceID>5</rasd:InstanceID>
-                    <rasd:Reservation>0</rasd:Reservation>
-                    <rasd:ResourceType>4</rasd:ResourceType>
-                    <rasd:VirtualQuantity>2048</rasd:VirtualQuantity>
-                    <rasd:Weight>0</rasd:Weight>
-                </ovf:Item>
-            </ovf:VirtualHardwareSection>
-            <vcloud:NetworkConnectionSection ovf:required="false">
-                <ovf:Info>Specifies the available VM network connections</ovf:Info>
-                <vcloud:PrimaryNetworkConnectionIndex>0</vcloud:PrimaryNetworkConnectionIndex>
-                <vcloud:NetworkConnection network="vapp net">
-                    <vcloud:NetworkConnectionIndex>0</vcloud:NetworkConnectionIndex>
-                    <vcloud:IpAddress>192.168.2.100</vcloud:IpAddress>
-                    <vcloud:IsConnected>true</vcloud:IsConnected>
-                    <vcloud:MACAddress>00:50:56:01:06:81</vcloud:MACAddress>
-                    <vcloud:IpAddressAllocationMode>POOL</vcloud:IpAddressAllocationMode>
-                </vcloud:NetworkConnection>
-            </vcloud:NetworkConnectionSection>
-            <vcloud:GuestCustomizationSection ovf:required="false">
-                <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
-                <vcloud:Enabled>true</vcloud:Enabled>
-                <vcloud:ChangeSid>false</vcloud:ChangeSid>
-                <vcloud:JoinDomainEnabled>false</vcloud:JoinDomainEnabled>
-                <vcloud:UseOrgSettings>false</vcloud:UseOrgSettings>
-                <vcloud:AdminPasswordEnabled>false</vcloud:AdminPasswordEnabled>
-                <vcloud:AdminPasswordAuto>true</vcloud:AdminPasswordAuto>
-                <vcloud:ResetPasswordRequired>false</vcloud:ResetPasswordRequired>
-                <vcloud:ComputerName>centos-db</vcloud:ComputerName>
-            </vcloud:GuestCustomizationSection>
-        </ovf:VirtualSystem>
-        <ovf:VirtualSystem ovf:id="centos-web">
-            <ovf:Info>A virtual machine: </ovf:Info>
-            <ovf:Name>centos-web</ovf:Name>
-            <ovf:OperatingSystemSection xmlns:vmw="http://www.vmware.com/schema/ovf" ovf:id="100" vmw:osType="other26xLinux64Guest">
-                <ovf:Info>Specifies the operating system installed</ovf:Info>
-                <ovf:Description>Other 2.6x Linux (64-bit)</ovf:Description>
-            </ovf:OperatingSystemSection>
-            <ovf:VirtualHardwareSection>
-                <ovf:Info>Virtual hardware requirements</ovf:Info>
-                <ovf:System>
-                    <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
-                    <vssd:InstanceID>0</vssd:InstanceID>
-                    <vssd:VirtualSystemIdentifier>centos-web</vssd:VirtualSystemIdentifier>
-                    <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
-                </ovf:System>
-                <ovf:Item>
-                    <rasd:Address>00:50:56:01:06:82</rasd:Address>                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
-                    <rasd:Connection vcloud:ipAddress="192.168.2.101" vcloud:primaryNetworkConnection="true" vcloud:ipAddressingMode="POOL">vapp net</rasd:Connection>
-
-                    <rasd:Description>PCNet32 ethernet adapter</rasd:Description>
-                    <rasd:ElementName>Network adapter 0</rasd:ElementName>
-                    <rasd:InstanceID>1</rasd:InstanceID>
-                    <rasd:ResourceSubType>PCNet32</rasd:ResourceSubType>
-                    <rasd:ResourceType>10</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:Address>0</rasd:Address>
-                    <rasd:Description>SCSI Controller</rasd:Description>
-                    <rasd:ElementName>SCSI Controller 0</rasd:ElementName>
-                    <rasd:InstanceID>2</rasd:InstanceID>
-                    <rasd:ResourceSubType>lsilogic</rasd:ResourceSubType>
-                    <rasd:ResourceType>6</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:Description>Hard disk</rasd:Description>
-                    <rasd:ElementName>Hard disk 1</rasd:ElementName>
-                    <rasd:HostResource vcloud:capacity="8192" vcloud:busType="6" vcloud:busSubType="lsilogic"/>
-                    <rasd:InstanceID>2000</rasd:InstanceID>
-                    <rasd:Parent>2</rasd:Parent>
-                    <rasd:ResourceType>17</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:Address>0</rasd:Address>
-                    <rasd:Description>IDE Controller</rasd:Description>
-                    <rasd:ElementName>IDE Controller 0</rasd:ElementName>
-                    <rasd:InstanceID>3</rasd:InstanceID>
-                    <rasd:ResourceType>5</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
-                    <rasd:Description>CD/DVD Drive</rasd:Description>
-                    <rasd:ElementName>CD/DVD Drive 1</rasd:ElementName>
-                    <rasd:HostResource/>
-                    <rasd:InstanceID>3000</rasd:InstanceID>
-                    <rasd:Parent>3</rasd:Parent>
-                    <rasd:ResourceType>15</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                    <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
-                    <rasd:Description>Floppy Drive</rasd:Description>
-                    <rasd:ElementName>Floppy Drive 1</rasd:ElementName>
-                    <rasd:HostResource/>
-                    <rasd:InstanceID>8000</rasd:InstanceID>
-                    <rasd:ResourceType>14</rasd:ResourceType>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
-                    <rasd:Description>Number of Virtual CPUs</rasd:Description>
-                    <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>
-                    <rasd:InstanceID>4</rasd:InstanceID>
-                    <rasd:Reservation>0</rasd:Reservation>
-                    <rasd:ResourceType>3</rasd:ResourceType>
-                    <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
-                    <rasd:Weight>0</rasd:Weight>
-                </ovf:Item>
-                <ovf:Item>
-                    <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
-                    <rasd:Description>Memory Size</rasd:Description>
-                    <rasd:ElementName>2048 MB of memory</rasd:ElementName>
-                    <rasd:InstanceID>5</rasd:InstanceID>
-                    <rasd:Reservation>0</rasd:Reservation>
-                    <rasd:ResourceType>4</rasd:ResourceType>
-                    <rasd:VirtualQuantity>2048</rasd:VirtualQuantity>
-                    <rasd:Weight>0</rasd:Weight>
-                </ovf:Item>
-            </ovf:VirtualHardwareSection>
-            <vcloud:NetworkConnectionSection ovf:required="false">
-                <ovf:Info>Specifies the available VM network connections</ovf:Info>
-                <vcloud:PrimaryNetworkConnectionIndex>0</vcloud:PrimaryNetworkConnectionIndex>
-                <vcloud:NetworkConnection network="vapp net">
-                    <vcloud:NetworkConnectionIndex>0</vcloud:NetworkConnectionIndex>
-                    <vcloud:IpAddress>192.168.2.101</vcloud:IpAddress>
-                    <vcloud:IsConnected>true</vcloud:IsConnected>
-                    <vcloud:MACAddress>00:50:56:01:06:82</vcloud:MACAddress>
-                    <vcloud:IpAddressAllocationMode>POOL</vcloud:IpAddressAllocationMode>
-                </vcloud:NetworkConnection>
-            </vcloud:NetworkConnectionSection>
-            <vcloud:GuestCustomizationSection ovf:required="false">
-                <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
-                <vcloud:Enabled>true</vcloud:Enabled>
-                <vcloud:ChangeSid>false</vcloud:ChangeSid>
-                <vcloud:JoinDomainEnabled>false</vcloud:JoinDomainEnabled>
-                <vcloud:UseOrgSettings>false</vcloud:UseOrgSettings>
-                <vcloud:AdminPasswordEnabled>false</vcloud:AdminPasswordEnabled>
-                <vcloud:AdminPasswordAuto>true</vcloud:AdminPasswordAuto>
-                <vcloud:ResetPasswordRequired>false</vcloud:ResetPasswordRequired>
-                <vcloud:ComputerName>centos-web</vcloud:ComputerName>
-            </vcloud:GuestCustomizationSection>
-        </ovf:VirtualSystem>
-    </ovf:VirtualSystemCollection>
-</ovf:Envelope>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/ovf-ubuntu64.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/ovf-ubuntu64.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/ovf-ubuntu64.xml
deleted file mode 100644
index 7679573..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/ovf-ubuntu64.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ovf:Envelope xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:vcloud="http://www.vmware.com/vcloud/v1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_VirtualSystemSettingData.xsd http://schemas.dmtf.org/ovf/envelope/1 http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd http://www.vmware.com/vcloud/v1 https://zone.myvcloud.com/api/v1.0/schema/master.xsd">
-    <ovf:References/>
-    <ovf:NetworkSection>
-        <ovf:Info>The list of logical networks</ovf:Info>
-        <ovf:Network ovf:name="none">
-            <ovf:Description>This is a special place-holder used for disconnected network interfaces.</ovf:Description>
-        </ovf:Network>
-    </ovf:NetworkSection>
-    <vcloud:NetworkConfigSection ovf:required="false">
-        <ovf:Info>The configuration parameters for logical networks</ovf:Info>
-        <vcloud:NetworkConfig networkName="none">
-            <vcloud:Description>This is a special place-holder used for disconnected network interfaces.</vcloud:Description>
-            <vcloud:Configuration>
-                <vcloud:IpScope>
-                    <vcloud:IsInherited>false</vcloud:IsInherited>
-                    <vcloud:Gateway>196.254.254.254</vcloud:Gateway>
-                    <vcloud:Netmask>255.255.0.0</vcloud:Netmask>
-                    <vcloud:Dns1>196.254.254.254</vcloud:Dns1>
-                </vcloud:IpScope>
-                <vcloud:FenceMode>isolated</vcloud:FenceMode>
-            </vcloud:Configuration>
-            <vcloud:IsDeployed>false</vcloud:IsDeployed>
-        </vcloud:NetworkConfig>
-    </vcloud:NetworkConfigSection>
-    <vcloud:LeaseSettingsSection ovf:required="false">
-        <ovf:Info>Lease settings section</ovf:Info>
-        <vcloud:DeploymentLeaseInSeconds>0</vcloud:DeploymentLeaseInSeconds>
-        <vcloud:StorageLeaseInSeconds>5184000</vcloud:StorageLeaseInSeconds>
-        <vcloud:StorageLeaseExpiration>2012-03-12T17:40:44.491-06:00</vcloud:StorageLeaseExpiration>
-    </vcloud:LeaseSettingsSection>
-    <vcloud:CustomizationSection ovf:required="false">
-        <ovf:Info>VApp template customization section</ovf:Info>
-        <vcloud:CustomizeOnInstantiate>true</vcloud:CustomizeOnInstantiate>
-    </vcloud:CustomizationSection>
-    <ovf:VirtualSystem ovf:id="UbuntuServer-x64-2GB">
-        <ovf:Info>A virtual machine: </ovf:Info>
-        <ovf:Name>UbuntuServer-x64-2GB</ovf:Name>
-        <ovf:OperatingSystemSection xmlns:vmw="http://www.vmware.com/schema/ovf" ovf:id="94" vmw:osType="ubuntu64Guest">
-            <ovf:Info>Specifies the operating system installed</ovf:Info>
-            <ovf:Description>Ubuntu Linux (64-bit)</ovf:Description>
-        </ovf:OperatingSystemSection>
-        <ovf:VirtualHardwareSection>
-            <ovf:Info>Virtual hardware requirements</ovf:Info>
-            <ovf:System>
-                <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
-                <vssd:InstanceID>0</vssd:InstanceID>
-                <vssd:VirtualSystemIdentifier>UbuntuServer-x64-2GB</vssd:VirtualSystemIdentifier>
-                <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
-            </ovf:System>
-            <ovf:Item>
-                <rasd:Address>00:50:56:01:02:9f</rasd:Address>
-                <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
-                <rasd:Connection vcloud:primaryNetworkConnection="true" vcloud:ipAddressingMode="NONE">none</rasd:Connection>
-                <rasd:Description>PCNet32 ethernet adapter</rasd:Description>
-                <rasd:ElementName>Network adapter 0</rasd:ElementName>
-                <rasd:InstanceID>1</rasd:InstanceID>
-                <rasd:ResourceSubType>PCNet32</rasd:ResourceSubType>
-                <rasd:ResourceType>10</rasd:ResourceType>
-            </ovf:Item>
-            <ovf:Item>
-                <rasd:Address>0</rasd:Address>
-                <rasd:Description>SCSI Controller</rasd:Description>
-                <rasd:ElementName>SCSI Controller 0</rasd:ElementName>
-                <rasd:InstanceID>2</rasd:InstanceID>
-                <rasd:ResourceSubType>lsilogic</rasd:ResourceSubType>
-                <rasd:ResourceType>6</rasd:ResourceType>
-            </ovf:Item>
-            <ovf:Item>
-                <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                <rasd:Description>Hard disk</rasd:Description>
-                <rasd:ElementName>Hard disk 1</rasd:ElementName>
-                <rasd:HostResource vcloud:capacity="2048" vcloud:busType="6" vcloud:busSubType="lsilogic"/>
-                <rasd:InstanceID>2000</rasd:InstanceID>
-                <rasd:Parent>2</rasd:Parent>
-                <rasd:ResourceType>17</rasd:ResourceType>
-            </ovf:Item>
-            <ovf:Item>
-                <rasd:Address>0</rasd:Address>
-                <rasd:Description>IDE Controller</rasd:Description>
-                <rasd:ElementName>IDE Controller 0</rasd:ElementName>
-                <rasd:InstanceID>3</rasd:InstanceID>
-                <rasd:ResourceType>5</rasd:ResourceType>
-            </ovf:Item>
-            <ovf:Item>
-                <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
-                <rasd:Description>CD/DVD Drive</rasd:Description>
-                <rasd:ElementName>CD/DVD Drive 1</rasd:ElementName>
-                <rasd:HostResource/>
-                <rasd:InstanceID>3000</rasd:InstanceID>
-                <rasd:Parent>3</rasd:Parent>
-                <rasd:ResourceType>15</rasd:ResourceType>
-            </ovf:Item>
-            <ovf:Item>
-                <rasd:AddressOnParent>0</rasd:AddressOnParent>
-                <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
-                <rasd:Description>Floppy Drive</rasd:Description>
-                <rasd:ElementName>Floppy Drive 1</rasd:ElementName>
-                <rasd:HostResource/>
-                <rasd:InstanceID>8000</rasd:InstanceID>
-                <rasd:ResourceType>14</rasd:ResourceType>
-            </ovf:Item>
-            <ovf:Item>
-                <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
-                <rasd:Description>Number of Virtual CPUs</rasd:Description>
-                <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>
-                <rasd:InstanceID>4</rasd:InstanceID>
-                <rasd:Reservation>0</rasd:Reservation>
-                <rasd:ResourceType>3</rasd:ResourceType>
-                <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
-                <rasd:Weight>0</rasd:Weight>
-            </ovf:Item>
-            <ovf:Item>
-                <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
-                <rasd:Description>Memory Size</rasd:Description>
-                <rasd:ElementName>256 MB of memory</rasd:ElementName>
-                <rasd:InstanceID>5</rasd:InstanceID>
-                <rasd:Reservation>0</rasd:Reservation>
-                <rasd:ResourceType>4</rasd:ResourceType>
-                <rasd:VirtualQuantity>256</rasd:VirtualQuantity>
-                <rasd:Weight>0</rasd:Weight>
-            </ovf:Item>
-        </ovf:VirtualHardwareSection>
-        <vcloud:NetworkConnectionSection ovf:required="false">
-            <ovf:Info>Specifies the available VM network connections</ovf:Info>
-            <vcloud:PrimaryNetworkConnectionIndex>0</vcloud:PrimaryNetworkConnectionIndex>
-            <vcloud:NetworkConnection network="none">
-                <vcloud:NetworkConnectionIndex>0</vcloud:NetworkConnectionIndex>
-                <vcloud:IsConnected>false</vcloud:IsConnected>
-                <vcloud:MACAddress>00:50:56:01:02:9f</vcloud:MACAddress>
-                <vcloud:IpAddressAllocationMode>NONE</vcloud:IpAddressAllocationMode>
-            </vcloud:NetworkConnection>
-        </vcloud:NetworkConnectionSection>
-        <vcloud:GuestCustomizationSection ovf:required="false">
-            <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
-            <vcloud:Enabled>true</vcloud:Enabled>
-            <vcloud:ChangeSid>false</vcloud:ChangeSid>
-            <vcloud:JoinDomainEnabled>false</vcloud:JoinDomainEnabled>
-            <vcloud:UseOrgSettings>false</vcloud:UseOrgSettings>
-            <vcloud:AdminPasswordEnabled>true</vcloud:AdminPasswordEnabled>
-            <vcloud:AdminPasswordAuto>true</vcloud:AdminPasswordAuto>
-            <vcloud:ResetPasswordRequired>false</vcloud:ResetPasswordRequired>
-            <vcloud:ComputerName>UbuntuServer</vcloud:ComputerName>
-        </vcloud:GuestCustomizationSection>
-    </ovf:VirtualSystem>
-</ovf:Envelope>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-1.0.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-1.0.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-1.0.xml
deleted file mode 100644
index 20fde3f..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-1.0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task status="running" startTime="2010-08-23T02:09:52.443-04:00"
-    operation="Creating Virtual Application vApp_acole_2(607806320)"
-    expiryTime="2010-11-21T02:09:52.443-05:00" endTime="9999-12-31T23:59:59.999-05:00"
-    type="application/vnd.vmware.vcloud.task+xml"
-    href="https://vcenterprise.bluelock.com/api/v1.0/task/3cc08ir8oczbze3n1a3">
-    <Owner type="application/vnd.vmware.vcloud.vApp+xml" name="vApp_acole_2"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320" />
-</Task>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-error.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-error.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-error.xml
deleted file mode 100644
index 77147f8..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-error.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Task href="http://10.150.4.49/api/v0.8/task/23" type="application/vnd.vmware.vcloud.task+xml"
-	status="error" startTime="2009-12-07T19:05:02" endTime="2009-12-10T14:40:32">
-	<Owner href="http://10.150.4.49/api/v0.8/org/1" type="application/vnd.vmware.vcloud.org+xml"
-		name="APIOrg" />
-	<Result href="http://10.150.4.49/api/v0.8/vapp/1" type="application/vnd.vmware.vcloud.vApp+xml"
-		name="testapp1" />
-	<Error message="Error processing job" majorErrorCode="500"
-		minorErrorCode=" Error in runDailySummaries date used:2009-12-09 19:40:30.577326+00:00" />
-</Task>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-hosting.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-hosting.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-hosting.xml
deleted file mode 100644
index f4af4a2..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-hosting.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task href="https://vcloud.safesecureweb.com/api/v0.8/task/97806" xmlns="http://www.vmware.com/vcloud/v0.8"
-    xmlns:common="http://www.vmware.com/vcloud/common"
-    xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8/task
-        https://vcloud.safesecureweb.com/ns/vcloud/task-1.0.xsd
-        http://www.vmware.com/vcloud/common
-        https://vcloud.safesecureweb.com/ns/vcloud/common-1.0.xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        status="success" startTime="2010-01-14T20:04:51Z" endTime="2010-01-14T20:05:02Z" expiryTime="2010-01-15T20:05:02Z">
-
-    <Owner href="https://vcloud.safesecureweb.com/api/v0.8/vapp/188849-96" type="application/vnd.vmware.vcloud.vApp+xml" name="188849-96" />
-</Task>

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-self.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-self.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-self.xml
deleted file mode 100644
index 4a17424..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-self.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:common="http://www/vmware.com/vcloud/common"
-    xsi:schemaLocation="http://www/vmware.com/vcloud/task
-        https://vcloud.safesecureweb.com/ns/vcloud/task-1.0.xsd
-        http://www.vmware.com/vcloud/common
-        https://vcloud.safesecureweb.com/ns/vcloud/common-1.0.xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" status="queued">
-    <Link rel="self"
-        href="https://vcloud.safesecureweb.com/api/v0.8/task/d188849-78"
-        type="application/vnd.vmware.vcloud.task+xml" />
-</Task>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-vcd15.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-vcd15.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-vcd15.xml
deleted file mode 100644
index 452287d..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task-vcd15.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vcloud:Task xmlns:vcloud="http://www.vmware.com/vcloud/v1" status="running" startTime="2012-03-15T22:47:02.058-06:00" operation="Updating Virtual Machine UbuntuServer-x64-2GB(c9004a47-5e21-4cf1-860c-670d8965b24a)" expiryTime="2012-06-13T22:47:02.058-06:00" type="application/vnd.vmware.vcloud.task+xml" href="https://mycloud.greenhousedata.com/api/v1.0/task/77a33fd4-3401-423c-8167-6711fc51ee9a" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1 http://mycloud.greenhousedata.com/api/v1.0/schema/master.xsd">
-    <vcloud:Link rel="task:cancel" href="https://mycloud.greenhousedata.com/api/v1.0/task/77a33fd4-3401-423c-8167-6711fc51ee9a/action/cancel"/>
-    <vcloud:Owner type="application/vnd.vmware.vcloud.vm+xml" name="UbuntuServer-x64-2GB" href="https://mycloud.greenhousedata.com/api/v1.0/vApp/vm-c9004a47-5e21-4cf1-860c-670d8965b24a"/>
-</vcloud:Task>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task.xml
deleted file mode 100644
index bd0514e..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/task.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Task href="https://services.vcloudexpress.terremark.com/api/v0.8/task/3299"
-    status="success" startTime="2009-08-24T21:29:32.983Z" endTime="2009-08-24T21:29:44.65Z">
-    <Owner href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/1"
-        type="application/vnd.vmware.vcloud.vdc+xml" name="VDC Name" />
-    <Result
-        href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/4012"
-        type="application/vnd.vmware.vcloud.vApp+xml" name="Server1" />
-</Task>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/taskslist-hosting.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/taskslist-hosting.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/taskslist-hosting.xml
deleted file mode 100644
index 1511d13..0000000
--- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/test/resources/taskslist-hosting.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tasks xmlns="http://www.vmware.com/vcloud/tasks" xmlns:common="http://www.vmware.com/vcloud/v0.8"
-    xmlns:task="http://www.vmware.com/vcloud/task"
-    xsi:schemaLocation="http://www.vmware.com/vcloud/tasks
-        https://vcloud.safesecureweb.com/ns/vcloud/tasks-1.0.xsd
-        http://www.vmware.com/vcloud/v0.8
-        https://vcloud.safesecureweb.com/ns/vcloud/common-1.0.xsd
-        http://www.vmware.com/vcloud/task
-        https://vcloud.safesecureweb.com/ns/vcloud/task-1.0.xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <Link rel="self"
-        href="https://vcloud.safesecureweb.com/api/v0.8/tasksList/188849"
-        type="application/vnd.vmware.vcloud.tasksList+xml" />
-</tasks>
\ No newline at end of file