You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2013/09/30 18:15:25 UTC

[05/17] JCLOUDS-304. Remove broken terremark providers

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/configureVApp.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/configureVApp.xml b/common/trmk/src/test/resources/configureVApp.xml
deleted file mode 100644
index b397e6e..0000000
--- a/common/trmk/src/test/resources/configureVApp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<VApp xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="eduardo" size="4194304" status="2" type="application/vnd.vmware.vcloud.vApp+xml" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Section xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:q2="http://www.vmware.com/vcloud/v1" xsi:type="VirtualHardwareSection_Type"><Info>Virtual Hardware</Info><Item><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</VirtualQuantity></Item><Item><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</InstanceID><ResourceType xmlns="http://schemas
 .dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1024</VirtualQuantity></Item><Item><AddressOnParent xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</AddressOnParent><HostResource xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1048576</HostResource><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">209152</VirtualQuantity></Item></Section></VApp>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/configureVApp4.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/configureVApp4.xml b/common/trmk/src/test/resources/configureVApp4.xml
deleted file mode 100644
index 6ffd225..0000000
--- a/common/trmk/src/test/resources/configureVApp4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<VApp xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="eduardo" size="4194304" status="2" type="application/vnd.vmware.vcloud.vApp+xml" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Section xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:q2="http://www.vmware.com/vcloud/v1" xsi:type="VirtualHardwareSection_Type"><Info>Virtual Hardware</Info><Item><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4</VirtualQuantity></Item><Item><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</InstanceID><ResourceType xmlns="http://schemas
 .dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1024</VirtualQuantity></Item><Item><AddressOnParent xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</AddressOnParent><HostResource xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1048576</HostResource><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">209152</VirtualQuantity></Item></Section></VApp>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/configureVAppAll.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/configureVAppAll.xml b/common/trmk/src/test/resources/configureVAppAll.xml
deleted file mode 100644
index de299fe..0000000
--- a/common/trmk/src/test/resources/configureVAppAll.xml
+++ /dev/null
@@ -1 +0,0 @@
-<VApp xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="eduardo" size="4194304" status="2" type="application/vnd.vmware.vcloud.vApp+xml" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><Section xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:q2="http://www.vmware.com/vcloud/v1" xsi:type="VirtualHardwareSection_Type"><Info>Virtual Hardware</Info><Item><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</VirtualQuantity></Item><Item><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</InstanceID><ResourceType xmlns="http://schemas
 .dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1536</VirtualQuantity></Item><Item><AddressOnParent xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</AddressOnParent><HostResource xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1048576</HostResource><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">209152</VirtualQuantity></Item><Item><AddressOnParent xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">-1</AddressOnP
 arent><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">26214400</VirtualQuantity></Item><Item><AddressOnParent xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">-1</AddressOnParent><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">26214400</VirtualQuantity></Item></Section></VApp>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/datacenter.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/datacenter.xml b/common/trmk/src/test/resources/datacenter.xml
deleted file mode 100644
index aba474e..0000000
--- a/common/trmk/src/test/resources/datacenter.xml
+++ /dev/null
@@ -1,9 +0,0 @@
- <DataCenter>
-
-    <Code>MIA</Code>
-
-    <Id>1</Id>
-
-    <Name>Terremark - Miami</Name>
-
-</DataCenter>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/datacenters.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/datacenters.xml b/common/trmk/src/test/resources/datacenters.xml
deleted file mode 100644
index 34aee40..0000000
--- a/common/trmk/src/test/resources/datacenters.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<DataCenterList xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
-
-  <DataCenter>
-
-    <Code>MIA</Code>
-
-    <Id>1</Id>
-
-    <Name>Terremark - Miami</Name>
-
-  </DataCenter>
-
-  <DataCenter>
-
-    <Code>CUA</Code>
-
-    <Id>3670</Id>
-
-    <Name>Terremark - Culpeper</Name>
-
-  </DataCenter>
-
-</DataCenterList>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/ec_description.txt
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/ec_description.txt b/common/trmk/src/test/resources/ec_description.txt
deleted file mode 100644
index 0f5cd16..0000000
--- a/common/trmk/src/test/resources/ec_description.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-username: ecloud
-password: TmrkCl0ud1s#1!
-
-This template consists of a base Ubuntu Server 10.04 installation. Additional software is available via apt. Updates are available via Software Updater.
-
-The hostname and base IP will be set as part of the server creation process based on user input.

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/ft_description.txt
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/ft_description.txt b/common/trmk/src/test/resources/ft_description.txt
deleted file mode 100644
index 66977da..0000000
--- a/common/trmk/src/test/resources/ft_description.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Manager UI URL: https://<Public Manager IP>:8000 
-Username: vpncubed 
-Password: vpncubed 
-Documentation Download Link: http://www.cohesiveft.com/dnld/VPN-Cubed_IPsec-to-Terremark_Free-Edition_2010218.pdf 
-
-For more information: http://www.cohesiveft.com/Cube/VPN/VPN-Cubed_IPsec_to_Cloud/
-
-VPN-Cubed IPsec to Terremark vCloud Express (Free Edition) is a free development/test-only version of the VPN-Cubed overlay network that allows you control of addressing, topology, pro
-tocols, and encrypted communications for your devices deployed to Terremark’s vCloud Express. This template is packaged to work between a data center using IPsec extranet connectivity 
-and Terremark. Your IPsec device connects to an IPsec gateway at Terremark running as a virtual appliance which routes to your VPN-Cubed overlay network subnet in Terremark.  An overla
-y network that you completely control.  Other Terremark resident cloud machine instances "plug into" the overlay network through the use of the OpenVPN software package. 
-
-VPN-Cubed IPsec to Terremark Free Edition creates an overlay network that uses the 172.31.1.x subnet, allows up to 5 client servers connections, and one IPsec tunnel connection. 
-
-Please contact CohesiveFT at Sales@CohesiveFT.com to discuss more robust VPN-Cubed Deployments.

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/get_vapp.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/get_vapp.xml b/common/trmk/src/test/resources/get_vapp.xml
deleted file mode 100644
index 3d2d51b..0000000
--- a/common/trmk/src/test/resources/get_vapp.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<VApp href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/16238"
-    type="application/vnd.vmware.vcloud.vApp+xml" name="centos-53"
-    status="2" size="10485760" xmlns="http://www.vmware.com/vcloud/v0.8"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Link rel="up"
-        href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/32"
-        type="application/vnd.vmware.vcloud.vdc+xml" />
-    <Link rel="down"
-        href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/16238/options/compute"
-        type="application/xml" name="Compute Options" />
-    <Link rel="down"
-        href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/16238/options/customization"
-        type="application/xml" name="Customization Options" />
-    <NetworkConnectionSection xmlns="http://schemas.dmtf.org/ovf/envelope/1">
-        <NetworkConnection Network="Internal"
-            xmlns="http://www.vmware.com/vcloud/v0.8">
-            <IpAddress>10.114.34.132</IpAddress>
-        </NetworkConnection>
-    </NetworkConnectionSection>
-    <OperatingSystemSection d2p1:id="26"
-        xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:d2p1="http://schemas.dmtf.org/ovf/envelope/1">
-        <Info>The kind of installed guest operating system</Info>
-        <Description>Red Hat Enterprise Linux 5 (64-bit)</Description>
-    </OperatingSystemSection>
-    <VirtualHardwareSection xmlns="http://schemas.dmtf.org/ovf/envelope/1">
-        <Info>Virtual Hardware</Info>
-        <System>
-            <AutomaticRecoveryAction xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <AutomaticShutdownAction xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <AutomaticStartupAction xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <AutomaticStartupActionDelay
-                xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <AutomaticStartupActionSequenceNumber
-                xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <Caption xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <ConfigurationDataRoot xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <ConfigurationFile xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <ConfigurationID xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <CreationTime xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <Description xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <ElementName
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">Virtual Hardware Family</ElementName>
-            <InstanceID
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">0</InstanceID>
-            <LogDataRoot xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <RecoveryFile xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <SnapshotDataRoot xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <SuspendDataRoot xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <SwapFileDataRoot xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <VirtualSystemIdentifier
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">centos-53</VirtualSystemIdentifier>
-            <VirtualSystemType
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">vmx-07</VirtualSystemType>
-        </System>
-        <Item>
-            <Address xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AddressOnParent xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AllocationUnits
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">hertz * 10^6</AllocationUnits>
-            <AutomaticAllocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AutomaticDeallocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Caption xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ConsumerVisibility xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Description
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">Number of Virtual CPUs</Description>
-            <ElementName
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1 virtual CPU(s)</ElementName>
-            <InstanceID
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</InstanceID>
-            <Limit xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <MappingBehavior xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <OtherResourceType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Parent xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <PoolID xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Reservation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceSubType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceType
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</ResourceType>
-            <VirtualQuantity
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</VirtualQuantity>
-            <VirtualQuantityUnits
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">count</VirtualQuantityUnits>
-            <Weight xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-        </Item>
-        <Item>
-            <Address xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AddressOnParent xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AllocationUnits
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">byte * 2^20</AllocationUnits>
-            <AutomaticAllocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AutomaticDeallocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Caption xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ConsumerVisibility xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Description
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">Memory Size</Description>
-            <ElementName
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">512MB of memory</ElementName>
-            <InstanceID
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</InstanceID>
-            <Limit xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <MappingBehavior xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <OtherResourceType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Parent xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <PoolID xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Reservation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceSubType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceType
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4</ResourceType>
-            <VirtualQuantity
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">512</VirtualQuantity>
-            <VirtualQuantityUnits
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">byte * 2^20</VirtualQuantityUnits>
-            <Weight xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-        </Item>
-        <Item>
-            <Address
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</Address>
-            <AddressOnParent xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AllocationUnits xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AutomaticAllocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AutomaticDeallocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Caption xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ConsumerVisibility xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Description
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">SCSI Controller</Description>
-            <ElementName
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">SCSI Controller 0</ElementName>
-            <InstanceID
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</InstanceID>
-            <Limit xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <MappingBehavior xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <OtherResourceType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Parent xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <PoolID xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Reservation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceSubType
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">lsilogic</ResourceSubType>
-            <ResourceType
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">6</ResourceType>
-            <VirtualQuantity xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <VirtualQuantityUnits xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Weight xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-        </Item>
-        <Item>
-            <Address xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AddressOnParent
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</AddressOnParent>
-            <AllocationUnits xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AutomaticAllocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AutomaticDeallocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Caption xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ConsumerVisibility xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Description xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ElementName
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">Hard Disk 1</ElementName>
-            <HostResource
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">10485760</HostResource>
-            <InstanceID
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID>
-            <Limit xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <MappingBehavior xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <OtherResourceType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Parent
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</Parent>
-            <PoolID xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Reservation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceSubType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceType
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType>
-            <VirtualQuantity
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">10485760</VirtualQuantity>
-            <VirtualQuantityUnits xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Weight xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-        </Item>
-    </VirtualHardwareSection>
-</VApp>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/get_vapp2disks.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/get_vapp2disks.xml b/common/trmk/src/test/resources/get_vapp2disks.xml
deleted file mode 100644
index e57eeab..0000000
--- a/common/trmk/src/test/resources/get_vapp2disks.xml
+++ /dev/null
@@ -1,297 +0,0 @@
-<VApp href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/15639"
-    type="application/vnd.vmware.vcloud.vApp+xml" name="eduardo" status="2"
-    size="30408704" 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="up"
-        href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/32"
-        type="application/vnd.vmware.vcloud.vdc+xml" />
-    <Link rel="down"
-        href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/15639/options/compute"
-        type="application/xml" name="Compute Options" />
-    <Link rel="down"
-        href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/15639/options/customization"
-        type="application/xml" name="Customization Options" />
-    <Section xsi:type="NetworkConnectionSectionType" xmlns="http://schemas.dmtf.org/ovf/envelope/1"
-        xmlns:q1="http://www.vmware.com/vcloud/v1">
-        <NetworkConnection Network="Internal">
-            <IpAddress>10.114.34.131</IpAddress>
-        </NetworkConnection>
-    </Section>
-    <OperatingSystemSection d2p1:id="45"
-        xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:d2p1="http://schemas.dmtf.org/ovf/envelope/1">
-        <Info>The kind of installed guest operating system</Info>
-        <Description>Ubuntu Linux (32-bit)</Description>
-    </OperatingSystemSection>
-    <Section xsi:type="VirtualHardwareSection_Type" xmlns="http://schemas.dmtf.org/ovf/envelope/1"
-        xmlns:q2="http://www.vmware.com/vcloud/v1">
-        <Info>Virtual Hardware</Info>
-        <System>
-            <AutomaticRecoveryAction xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <AutomaticShutdownAction xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <AutomaticStartupAction xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <AutomaticStartupActionDelay
-                xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <AutomaticStartupActionSequenceNumber
-                xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <Caption xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <ConfigurationDataRoot xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <ConfigurationFile xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <ConfigurationID xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <CreationTime xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <Description xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <ElementName
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">Virtual Hardware Family</ElementName>
-            <InstanceID
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">0</InstanceID>
-            <LogDataRoot xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <RecoveryFile xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <SnapshotDataRoot xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <SuspendDataRoot xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <SwapFileDataRoot xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-            <VirtualSystemIdentifier
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">eduardo</VirtualSystemIdentifier>
-            <VirtualSystemType
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">vmx-07</VirtualSystemType>
-        </System>
-        <Item>
-            <Address xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AddressOnParent xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AllocationUnits
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">hertz * 10^6</AllocationUnits>
-            <AutomaticAllocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AutomaticDeallocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Caption xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ConsumerVisibility xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Description
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">Number of Virtual CPUs</Description>
-            <ElementName
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2 virtual CPU(s)</ElementName>
-            <InstanceID
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</InstanceID>
-            <Limit xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <MappingBehavior xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <OtherResourceType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Parent xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <PoolID xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Reservation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceSubType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceType
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</ResourceType>
-            <VirtualQuantity
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</VirtualQuantity>
-            <VirtualQuantityUnits
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">count</VirtualQuantityUnits>
-            <Weight xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-        </Item>
-        <Item>
-            <Address xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AddressOnParent xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AllocationUnits
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">byte * 2^20</AllocationUnits>
-            <AutomaticAllocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AutomaticDeallocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Caption xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ConsumerVisibility xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Description
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">Memory Size</Description>
-            <ElementName
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1024MB of memory</ElementName>
-            <InstanceID
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</InstanceID>
-            <Limit xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <MappingBehavior xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <OtherResourceType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Parent xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <PoolID xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Reservation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceSubType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceType
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4</ResourceType>
-            <VirtualQuantity
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1024</VirtualQuantity>
-            <VirtualQuantityUnits
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">byte * 2^20</VirtualQuantityUnits>
-            <Weight xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-        </Item>
-        <Item>
-            <Address
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</Address>
-            <AddressOnParent xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AllocationUnits xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AutomaticAllocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AutomaticDeallocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Caption xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ConsumerVisibility xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Description
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">SCSI Controller</Description>
-            <ElementName
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">SCSI Controller 0</ElementName>
-            <InstanceID
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</InstanceID>
-            <Limit xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <MappingBehavior xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <OtherResourceType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Parent xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <PoolID xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Reservation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceSubType
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">lsilogic</ResourceSubType>
-            <ResourceType
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">6</ResourceType>
-            <VirtualQuantity xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <VirtualQuantityUnits xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Weight xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-        </Item>
-        <Item>
-            <Address xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AddressOnParent
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</AddressOnParent>
-            <AllocationUnits xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AutomaticAllocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AutomaticDeallocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Caption xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ConsumerVisibility xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Description xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ElementName
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">Hard Disk 1</ElementName>
-            <HostResource
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4194304</HostResource>
-            <InstanceID
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID>
-            <Limit xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <MappingBehavior xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <OtherResourceType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Parent
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</Parent>
-            <PoolID xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Reservation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceSubType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceType
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType>
-            <VirtualQuantity
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4194304</VirtualQuantity>
-            <VirtualQuantityUnits xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Weight xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-        </Item>
-        <Item>
-            <Address xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AddressOnParent
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</AddressOnParent>
-            <AllocationUnits xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AutomaticAllocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <AutomaticDeallocation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Caption xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ConsumerVisibility xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Description xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ElementName
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">Hard Disk 2</ElementName>
-            <HostResource
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">26214400</HostResource>
-            <InstanceID
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID>
-            <Limit xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <MappingBehavior xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <OtherResourceType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Parent
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</Parent>
-            <PoolID xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Reservation xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceSubType xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <ResourceType
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType>
-            <VirtualQuantity
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">26214400</VirtualQuantity>
-            <VirtualQuantityUnits xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-            <Weight xsi:nil="true"
-                xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-        </Item>
-    </Section>
-</VApp>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/instantiatedvapp.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/instantiatedvapp.xml b/common/trmk/src/test/resources/instantiatedvapp.xml
deleted file mode 100644
index ec9255e..0000000
--- a/common/trmk/src/test/resources/instantiatedvapp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VApp href="http://10.150.4.49/api/v0.8/vApp/10" type="application/vnd.vmware.vcloud.vApp+xml"
-    name="centos53" status="1"
-    size="123456789" xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Link rel="up"
-    	href="http://10.150.4.49/api/v0.8/vdc/4"
-    	type="application/vnd.vmware.vcloud.vdc+xml"/>
-</VApp>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/ipAddresses.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/ipAddresses.xml b/common/trmk/src/test/resources/ipAddresses.xml
deleted file mode 100644
index 635e74f..0000000
--- a/common/trmk/src/test/resources/ipAddresses.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<IpAddresses xmlns="urn:tmrk:vCloudExpress-1.0"
-    xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
-    <IpAddress>
-        <Name>10.114.34.131</Name>
-        <Status>Assigned</Status>
-        <Server>testforjcloud2</Server>
-    </IpAddress>
-    <IpAddress>
-        <Name>10.114.34.132</Name>
-        <Status>Available</Status>
-        <Server i:nil="true" />
-    </IpAddress>
-</IpAddresses>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/item.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/item.xml b/common/trmk/src/test/resources/item.xml
deleted file mode 100644
index 1972988..0000000
--- a/common/trmk/src/test/resources/item.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<Item>
-    <Address
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</Address>
-    <AddressOnParent xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-    <AllocationUnits xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-    <AutomaticAllocation xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-    <AutomaticDeallocation xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-    <Caption xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-    <ConsumerVisibility xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-    <Description
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">SCSI Controller</Description>
-    <ElementName
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">SCSI Controller 0</ElementName>
-    <InstanceID
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</InstanceID>
-    <Limit xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-    <MappingBehavior xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-    <OtherResourceType xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-    <Parent xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-    <PoolID xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-    <Reservation xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-    <ResourceSubType
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">lsilogic</ResourceSubType>
-    <ResourceType
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">6</ResourceType>
-    <VirtualQuantity xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-    <VirtualQuantityUnits xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-    <Weight xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" />
-</Item>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/key.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/key.xml b/common/trmk/src/test/resources/key.xml
deleted file mode 100644
index a007ccd..0000000
--- a/common/trmk/src/test/resources/key.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<CreateKeyResponse xmlns="urn:tmrk:eCloudExtensions-2.8" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"><Id>13691</Id><Href>https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/key/13691</Href><Name>jclouds_te_r_1241</Name><IsDefault>false</IsDefault><PrivateKey>-----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQCxdOcKd0WDuphOojK6Z2uErdgPsjei3/Xs6CzjL7a4ofd15rfz
-oRLbuNhLto4p/3drDjYdNrtPRLq5iNHq/qrRsHOJKS+bpAVQapuKDLCWwXa25nyM
-hG9iL/kwYGvS55CSOvHp5AH+diBuu6M9ay0w7idOBPnFdg4OMLIpAUTvqwICAQEC
-gYEAi3rDirdldHy/bp1eqG0tqQgkWAqVUTOEiGbMnqUBLINJ+Q7+KBUD3YJYU2qh
-i5f8Pjr7t1XZ8pmhtLFEXw3k40F7oV/NGs4CsnbYlxbegzHTzMNnN1dA+zj333jr
-N7U760b5D1cx5yTL5wF59gYaP8xugDnuCvRqbinqijApnzECQQDbJcxGUShVCpEh
-W0+BT/YHtM7BI1S6me7JdL5NMHsg1HE/0Ghi7nFUfbJDNsuIomRqbO5qcG7RpIN/
-xxsXyJFFAkEAz0xTsTiMxRMyaIpytoTliE3JBC/g5375eo2Epb740jbdkFvC5cin
-r6breljhbcm4LUIQG5sdnZspnxMH65N0LwJAEQ3mD27oPmZs6bFwxVTqTkvUUsP+
-n/QSlSf25yCo9Zr92yEnALnm86YrwX7JHY8gt5jptpoueebzUqjlOKMIUQJANgru
-+GljdB/mSxEq2uneNHfjuGAntOFZ8SHnz5FptU8M79gr1k02rExjPcd7hDeToDgS
-JRSEPAOYTFWlbTpdCwJAU1dI02ailOUpa1Dso5Mi7kO6QPygJfGyI6HlomvvHQZ3
-vyHKfLPKeAOfRYvkgHpf3q0WGoNh5M6GcQRwFQdhTA==
------END RSA PRIVATE KEY-----
-</PrivateKey><FingerPrint>fa:69:2c:0c:81:03:80:39:33:4d:de:ef:13:3c:e6:ef</FingerPrint></CreateKeyResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/keysList.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/keysList.xml b/common/trmk/src/test/resources/keysList.xml
deleted file mode 100644
index d202c63..0000000
--- a/common/trmk/src/test/resources/keysList.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Keys xmlns="urn:tmrk:vCloudExpressExtensions-1.6" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
-	<Key>
-		<Id>9</Id>
-		<Href>https://services.vcloudexpress.terremark.com/api/v0.8a-ext1.6/extensions/key/9</Href>
-		<Name>default</Name>
-		<IsDefault>true</IsDefault>
-		<FingerPrint>4e:af:8a:9f:e9:d2:72:d7:4b:a0:da:98:72:98:4d:7d</FingerPrint>
-	</Key>
-</Keys>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/lamp_description.txt
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/lamp_description.txt b/common/trmk/src/test/resources/lamp_description.txt
deleted file mode 100644
index 91d9283..0000000
--- a/common/trmk/src/test/resources/lamp_description.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-NOTE: This template does not support automated OS configuration.
-
-Username: ecloud
-Password: $Ep455l0ud!2
-
-mySQL root password is the same as ecloud.
-
-This template contains a base install of Ubuntu Server 8.04 + LAMP.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/launched_vapp.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/launched_vapp.xml b/common/trmk/src/test/resources/launched_vapp.xml
deleted file mode 100644
index cd3c340..0000000
--- a/common/trmk/src/test/resources/launched_vapp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<VApp href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/13775"
-    type="application/vnd.vmware.vcloud.vApp+xml" name="adriantest"
-    status="0" size="4" 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="up"
-        href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/32"
-        type="application/vnd.vmware.vcloud.vdc+xml" />
-</VApp>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/log4j.xml b/common/trmk/src/test/resources/log4j.xml
deleted file mode 100644
index 63810d3..0000000
--- a/common/trmk/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/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/network-terremark.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/network-terremark.xml b/common/trmk/src/test/resources/network-terremark.xml
deleted file mode 100644
index 66f6524..0000000
--- a/common/trmk/src/test/resources/network-terremark.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Network href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.5/network/40031" type="application/vnd.vmware.vcloud.network+xml" name="10.122.209.128/28" xmlns="http://www.vmware.com/vcloud/v0.8"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Link rel="down" href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.5/extensions/network/40031" type="application/xml" name="10.122.209.128/28"/>
-  <Link rel="down" href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.5/extensions/network/40031/ips" type="application/xml" name="IP Addresses"/>
-  <Configuration>
-    <Gateway>10.122.209.129</Gateway>
-    <Netmask>255.255.255.240</Netmask>
-  </Configuration>
-  <Features>
-    <FenceMode>isolated</FenceMode>
-  </Features>
-</Network>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/newvapp-cpumemdisk.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/newvapp-cpumemdisk.xml b/common/trmk/src/test/resources/newvapp-cpumemdisk.xml
deleted file mode 100644
index 2042618..0000000
--- a/common/trmk/src/test/resources/newvapp-cpumemdisk.xml
+++ /dev/null
@@ -1 +0,0 @@
-<InstantiateVAppTemplateParams xmlns="http://www.vmware.com/vcloud/v1.0" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="my-vapp" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.0 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><VAppTemplate href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/3"/><InstantiationParams><VirtualHardwareSection xmlns:q1="http://www.vmware.com/vcloud/v1.0"><Item xmlns="http://schemas.dmtf.org/ovf/envelope/1"><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</VirtualQuantity></Item><Item xmlns="http://schemas.dmtf.org/ovf/envelope/1"><InstanceID xmlns="http://schemas.dmtf.org/wbem/wsci
 m/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">512</VirtualQuantity></Item><Item xmlns="http://schemas.dmtf.org/ovf/envelope/1"><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1024</VirtualQuantity></Item></VirtualHardwareSection><NetworkConfigSection><NetworkConfig name="my-vapp"><Features><FenceMode>bridged</FenceMode></Features><NetworkAssociation href="https://vcenterprise.bluelock.com/api/v1.0/network/1990"/></NetworkConfig></NetworkCon
 figSection></InstantiationParams></InstantiateVAppTemplateParams>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/newvapp-networknamedhcpfencemode.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/newvapp-networknamedhcpfencemode.xml b/common/trmk/src/test/resources/newvapp-networknamedhcpfencemode.xml
deleted file mode 100644
index 60c097b..0000000
--- a/common/trmk/src/test/resources/newvapp-networknamedhcpfencemode.xml
+++ /dev/null
@@ -1 +0,0 @@
-<InstantiateVAppTemplateParams xmlns="http://www.vmware.com/vcloud/v1.0" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="my-vapp" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.0 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><VAppTemplate href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/3"/><InstantiationParams><NetworkConfigSection><NetworkConfig name="my-vapp"><Features><FenceMode>bridged</FenceMode></Features><NetworkAssociation href="https://vcenterprise.bluelock.com/api/v1.0/network/1990"/></NetworkConfig></NetworkConfigSection></InstantiationParams></InstantiateVAppTemplateParams>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/newvapp.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/newvapp.xml b/common/trmk/src/test/resources/newvapp.xml
deleted file mode 100644
index 60c097b..0000000
--- a/common/trmk/src/test/resources/newvapp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<InstantiateVAppTemplateParams xmlns="http://www.vmware.com/vcloud/v1.0" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="my-vapp" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.0 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><VAppTemplate href="https://vcenterprise.bluelock.com/api/v1.0/vAppTemplate/3"/><InstantiationParams><NetworkConfigSection><NetworkConfig name="my-vapp"><Features><FenceMode>bridged</FenceMode></Features><NetworkAssociation href="https://vcenterprise.bluelock.com/api/v1.0/network/1990"/></NetworkConfig></NetworkConfigSection></InstantiationParams></InstantiateVAppTemplateParams>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/org.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/org.xml b/common/trmk/src/test/resources/org.xml
deleted file mode 100644
index 978440c..0000000
--- a/common/trmk/src/test/resources/org.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Org
-	href="https://services.vcloudexpress.terremark.com/api/v0.8a-ext1.6/org/48"
-	name="adrian@jclouds.org" xmlns="http://www.vmware.com/vcloud/v0.8"
-	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.8a-ext1.6/vdc/32"
-		type="application/vnd.vmware.vcloud.vdc+xml" name="Miami Environment 1" />
-	<Link rel="down"
-		href="https://services.vcloudexpress.terremark.com/api/v0.8a-ext1.6/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.8a-ext1.6/vdc/32/tasksList"
-		type="application/vnd.vmware.vcloud.tasksList+xml" name="Miami Environment 1 Tasks List" />
-	<Link rel="down"
-		href="https://services.vcloudexpress.terremark.com/api/v0.8a-ext1.6/extensions/org/48/keys"
-		type="application/vnd.tmrk.vcloudExpress.keysList+xml" name="Keys" />
-</Org>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/orglist.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/orglist.xml b/common/trmk/src/test/resources/orglist.xml
deleted file mode 100644
index e6117b3..0000000
--- a/common/trmk/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/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/rhel_description.txt
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/rhel_description.txt b/common/trmk/src/test/resources/rhel_description.txt
deleted file mode 100644
index dd06694..0000000
--- a/common/trmk/src/test/resources/rhel_description.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-username: vcloud (SSH) or (Console)
-password: $Ep455l0ud!2
-This template consists of a basic Red Hat 5 (32-bit) installation without an entitlement. Additional software and updates are available via the Redhat Network once the server is regist
-ered with the Redhat Network.  The hostname and base IP will be set as part of the server creation process based on user input. Once deployment is complete, please connect via the cons
-ole and change the vcloud password.

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/system.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/system.xml b/common/trmk/src/test/resources/system.xml
deleted file mode 100644
index caff18f..0000000
--- a/common/trmk/src/test/resources/system.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<System>
-    <AutomaticRecoveryAction xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <AutomaticShutdownAction xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <AutomaticStartupAction xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <AutomaticStartupActionDelay xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <AutomaticStartupActionSequenceNumber
-        xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <Caption xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <ConfigurationDataRoot xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <ConfigurationFile xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <ConfigurationID xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <CreationTime xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <Description xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <ElementName
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">Virtual Hardware Family</ElementName>
-    <InstanceID
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">0</InstanceID>
-    <LogDataRoot xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <RecoveryFile xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <SnapshotDataRoot xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <SuspendDataRoot xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <SwapFileDataRoot xsi:nil="true"
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" />
-    <VirtualSystemIdentifier
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">adriantest1</VirtualSystemIdentifier>
-    <VirtualSystemType
-        xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData">vmx-07</VirtualSystemType>
-</System>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/task-error.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/task-error.xml b/common/trmk/src/test/resources/task-error.xml
deleted file mode 100644
index 77147f8..0000000
--- a/common/trmk/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/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/task-self.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/task-self.xml b/common/trmk/src/test/resources/task-self.xml
deleted file mode 100644
index 4a17424..0000000
--- a/common/trmk/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/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/task.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/task.xml b/common/trmk/src/test/resources/task.xml
deleted file mode 100644
index bd0514e..0000000
--- a/common/trmk/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/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/taskslist.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/taskslist.xml b/common/trmk/src/test/resources/taskslist.xml
deleted file mode 100644
index fe0d8c1..0000000
--- a/common/trmk/src/test/resources/taskslist.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<TasksList
-    href="https://services.vcloudexpress.terremark.com/api/v0.8/tasksList/1"
-    xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Task
-        href="https://services.vcloudexpress.terremark.com/api/v0.8/task/3300"
-        type="application/vnd.vmware.vcloud.task+xml" status="success"
-        startTime="2009-08-24T21:30:19.587Z" endTime="2009-08-24T21:30:32.63Z">
-        <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>
-    <Task
-        href="https://services.vcloudexpress.terremark.com/api/v0.8/task/3299"
-        type="application/vnd.vmware.vcloud.task+xml" 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>
-</TasksList>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/vAppTemplate-trmk.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/vAppTemplate-trmk.xml b/common/trmk/src/test/resources/vAppTemplate-trmk.xml
deleted file mode 100644
index 32c6906..0000000
--- a/common/trmk/src/test/resources/vAppTemplate-trmk.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<VAppTemplate
-    href="https://services.vcloudexpress.terremark.com/api/v0.8/vAppTemplate/5"
-    type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS 5.3 (32-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">
-    <Description>description of CentOS 5.3 (32-bit)</Description>
-</VAppTemplate>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/vapp-ext.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/vapp-ext.xml b/common/trmk/src/test/resources/vapp-ext.xml
deleted file mode 100644
index 6739670..0000000
--- a/common/trmk/src/test/resources/vapp-ext.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<VApp xmlns="urn:tmrk:eCloudExtensions-2.8" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
-    <Id>392992</Id>
-    <Href>https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/vapp/392992</Href>
-    <Name>instance01</Name>
-    <Tags></Tags>
-    <LongName></LongName>
-    <NetworkAdapters>
-        <NetworkAdapter>
-            <MacAddress>00:50:56:95:12:96</MacAddress>
-            <Name>Network adapter 1</Name>
-            <Subnet>
-                <Href>https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/network/43781</Href>
-                <Name>10.122.213.192/27</Name>
-            </Subnet>
-        </NetworkAdapter>
-    </NetworkAdapters>
-    <ComputePoolReference>
-        <Href>https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/computePool/692</Href>
-        <Name>Resource Pool 692</Name>
-    </ComputePoolReference>
-</VApp>
\ No newline at end of file