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:24 UTC
[04/17] JCLOUDS-304. Remove broken terremark providers
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/vapp.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/vapp.xml b/common/trmk/src/test/resources/vapp.xml
deleted file mode 100644
index 14166e8..0000000
--- a/common/trmk/src/test/resources/vapp.xml
+++ /dev/null
@@ -1,153 +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="4"
- xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 http://10.150.4.49/api/v0.8/vcloud/vApp.xsd"
- xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
- xmlns="http://www.vmware.com/vcloud/v0.8"
- xmlns:vmw="http://www.vmware.com/schema/ovf"
- xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
- xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" size="104857">
- <Link rel="up"
- href="http://10.150.4.49/api/v0.8/vdc/4"
- type="application/vnd.vmware.vcloud.vdc+xml"/>
- <NetworkConnectionSection xmlns="http://schemas.dmtf.org/ovf/envelope/1"
- xmlns:ovf="http://www.vmware.com/vcloud/v0.8">
- <ovf:NetworkConnection Network="Public Network">
- <ovf:IpAddress>10.150.4.93</ovf:IpAddress>
- </ovf:NetworkConnection>
- </NetworkConnectionSection>
- <OperatingSystemSection d2p1:id="36" 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>Other Linux (32-bit)</Description>
- </OperatingSystemSection>
- <VirtualHardwareSection xmlns="http://schemas.dmtf.org/ovf/envelope/1">
- <Info>Virtual hardware</Info>
- <Link rel="edit" href="http://10.150.4.49/api/v0.8/vApp/10" type="application/vnd.vmware.ovf.virtualHardwareSection+xml"/>
- <System>
- <vssd:AutomaticRecoveryAction xsi:nil="true" />
- <vssd:AutomaticShutdownAction xsi:nil="true" />
- <vssd:AutomaticStartupAction xsi:nil="true" />
- <vssd:AutomaticStartupActionDelay xsi:nil="true" />
- <vssd:AutomaticStartupActionSequenceNumber xsi:nil="true" />
- <vssd:Caption xsi:nil="true" />
- <vssd:ConfigurationDataRoot xsi:nil="true" />
- <vssd:ConfigurationFile xsi:nil="true" />
- <vssd:ConfigurationID xsi:nil="true" />
- <vssd:CreationTime xsi:nil="true" />
- <vssd:Description xsi:nil="true" />
- <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
- <vssd:InstanceID>0</vssd:InstanceID>
- <vssd:LogDataRoot xsi:nil="true" />
- <vssd:RecoveryFile xsi:nil="true" />
- <vssd:SnapshotDataRoot xsi:nil="true" />
- <vssd:SuspendDataRoot xsi:nil="true" />
- <vssd:SwapFileDataRoot xsi:nil="true" />
- <vssd:VirtualSystemIdentifier>centos53</vssd:VirtualSystemIdentifier>
- <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
- </System>
- <Item>
- <rasd:Address xsi:nil="true" />
- <rasd:AddressOnParent xsi:nil="true" />
- <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
- <rasd:AutomaticAllocation xsi:nil="true" />
- <rasd:AutomaticDeallocation xsi:nil="true" />
- <rasd:Caption xsi:nil="true" />
- <rasd:ConsumerVisibility xsi:nil="true" />
- <rasd:Description>Number of Virtual CPUs</rasd:Description>
- <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>
- <rasd:InstanceID>1</rasd:InstanceID>
- <rasd:Limit xsi:nil="true" />
- <rasd:MappingBehavior xsi:nil="true" />
- <rasd:OtherResourceType xsi:nil="true" />
- <rasd:Parent xsi:nil="true" />
- <rasd:PoolID xsi:nil="true" />
- <rasd:Reservation xsi:nil="true" />
- <rasd:ResourceSubType xsi:nil="true" />
- <rasd:ResourceType>3</rasd:ResourceType>
- <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
- <rasd:VirtualQuantityUnits>count</rasd:VirtualQuantityUnits>
- <rasd:Weight xsi:nil="true" />
- </Item>
- <Item>
- <rasd:Address xsi:nil="true" />
- <rasd:AddressOnParent xsi:nil="true" />
- <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
- <rasd:AutomaticAllocation xsi:nil="true" />
- <rasd:AutomaticDeallocation xsi:nil="true" />
- <rasd:Caption xsi:nil="true" />
- <rasd:ConsumerVisibility xsi:nil="true" />
- <rasd:Description>Memory Size</rasd:Description>
- <rasd:ElementName>16MB of memory</rasd:ElementName>
- <rasd:InstanceID>2</rasd:InstanceID>
- <rasd:Limit xsi:nil="true" />
- <rasd:MappingBehavior xsi:nil="true" />
- <rasd:OtherResourceType xsi:nil="true" />
- <rasd:Parent xsi:nil="true" />
- <rasd:PoolID xsi:nil="true" />
- <rasd:Reservation xsi:nil="true" />
- <rasd:ResourceSubType xsi:nil="true" />
- <rasd:ResourceType>4</rasd:ResourceType>
- <rasd:VirtualQuantity>16</rasd:VirtualQuantity>
- <rasd:VirtualQuantityUnits>byte * 2^20</rasd:VirtualQuantityUnits>
- <rasd:Weight xsi:nil="true" />
- </Item>
- <Item>
- <rasd:Address>0</rasd:Address>
- <rasd:AddressOnParent xsi:nil="true" />
- <rasd:AllocationUnits xsi:nil="true" />
- <rasd:AutomaticAllocation xsi:nil="true" />
- <rasd:AutomaticDeallocation xsi:nil="true" />
- <rasd:Caption xsi:nil="true" />
- <rasd:ConsumerVisibility xsi:nil="true" />
- <rasd:Description>SCSI Controller</rasd:Description>
- <rasd:ElementName>SCSI Controller 0</rasd:ElementName>
- <rasd:InstanceID>3</rasd:InstanceID>
- <rasd:Limit xsi:nil="true" />
- <rasd:MappingBehavior xsi:nil="true" />
- <rasd:OtherResourceType xsi:nil="true" />
- <rasd:Parent xsi:nil="true" />
- <rasd:PoolID xsi:nil="true" />
- <rasd:Reservation xsi:nil="true" />
- <rasd:ResourceSubType>lsilogic</rasd:ResourceSubType>
- <rasd:ResourceType>6</rasd:ResourceType>
- <rasd:VirtualQuantity xsi:nil="true" />
- <rasd:VirtualQuantityUnits xsi:nil="true" />
- <rasd:Weight xsi:nil="true" />
- </Item>
- <Item>
- <rasd:AddressOnParent>7</rasd:AddressOnParent>
- <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
- <rasd:Connection connected="true">Internal</rasd:Connection>
- <rasd:Description>PCNet32 ethernet adapter on "Internal" network</rasd:Description>
- <rasd:ElementName>Network Adapter 1</rasd:ElementName>
- <rasd:InstanceID>8</rasd:InstanceID>
- <rasd:ResourceSubType>PCNet32</rasd:ResourceSubType>
- <rasd:ResourceType>10</rasd:ResourceType>
- </Item>
- <Item>
- <rasd:Address xsi:nil="true" />
- <rasd:AddressOnParent>0</rasd:AddressOnParent>
- <rasd:AllocationUnits xsi:nil="true" />
- <rasd:AutomaticAllocation xsi:nil="true" />
- <rasd:AutomaticDeallocation xsi:nil="true" />
- <rasd:Caption xsi:nil="true" />
- <rasd:ConsumerVisibility xsi:nil="true" />
- <rasd:Description xsi:nil="true" />
- <rasd:ElementName>Hard Disk 1</rasd:ElementName>
- <rasd:HostResource>104857</rasd:HostResource>
- <rasd:InstanceID>9</rasd:InstanceID>
- <rasd:Limit xsi:nil="true" />
- <rasd:MappingBehavior xsi:nil="true" />
- <rasd:OtherResourceType xsi:nil="true" />
- <rasd:Parent>3</rasd:Parent>
- <rasd:PoolID xsi:nil="true" />
- <rasd:Reservation xsi:nil="true" />
- <rasd:ResourceSubType xsi:nil="true" />
- <rasd:ResourceType>17</rasd:ResourceType>
- <rasd:VirtualQuantity>104857</rasd:VirtualQuantity>
- <rasd:VirtualQuantityUnits xsi:nil="true" />
- <rasd:Weight xsi:nil="true" />
- </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/vapp2.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/vapp2.xml b/common/trmk/src/test/resources/vapp2.xml
deleted file mode 100644
index 4fc1966..0000000
--- a/common/trmk/src/test/resources/vapp2.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VApp href="http://localhost:8000/api/v0.8/vApp/80" type="application/vnd.vmware.vcloud.vApp+xml"
- name="m1" status="4"
- xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 http://localhost:8000/api/v0.8/schemas/vcloud/vApp.xsd"
- xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns="http://www.vmware.com/vcloud/v0.8"
- xmlns:vmw="http://www.vmware.com/schema/ovf"
- xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
- xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" size="10485760">
- <Link rel="up" href="http://localhost:8000/api/v0.8/vdc/28"
- type="application/vnd.vmware.vcloud.vdc+xml" />
- <Link rel="remove" href="http://localhost:8000/api/v0.8/vApp/80" />
- <NetworkConnectionSection xmlns="http://schemas.dmtf.org/ovf/envelope/1"
- xmlns:ovf="http://www.vmware.com/vcloud/v0.8">
- <ovf:NetworkConnection Network="Public Network">
- <ovf:IpAddress>10.23.119.221</ovf:IpAddress>
- </ovf:NetworkConnection>
- </NetworkConnectionSection>
- <OperatingSystemSection d2p1:id="67"
- 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>Microsoft Windows XP Professional (32-bit)
- </Description>
- </OperatingSystemSection>
- <VirtualHardwareSection xmlns="http://schemas.dmtf.org/ovf/envelope/1">
- <Info>Virtual hardware</Info>
- <Link rel="edit" href="http://localhost:8000/api/v0.8/vApp/80"
- type="application/vnd.vmware.ovf.virtualHardwareSection+xml" />
- <System>
- <vssd:AutomaticRecoveryAction
- xsi:nil="true" />
- <vssd:AutomaticShutdownAction
- xsi:nil="true" />
- <vssd:AutomaticStartupAction
- xsi:nil="true" />
- <vssd:AutomaticStartupActionDelay
- xsi:nil="true" />
- <vssd:AutomaticStartupActionSequenceNumber
- xsi:nil="true" />
- <vssd:Caption xsi:nil="true" />
- <vssd:ConfigurationDataRoot
- xsi:nil="true" />
- <vssd:ConfigurationFile xsi:nil="true" />
- <vssd:ConfigurationID xsi:nil="true" />
- <vssd:CreationTime xsi:nil="true" />
- <vssd:Description xsi:nil="true" />
- <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
- <vssd:InstanceID>0</vssd:InstanceID>
- <vssd:LogDataRoot xsi:nil="true" />
- <vssd:RecoveryFile xsi:nil="true" />
- <vssd:SnapshotDataRoot xsi:nil="true" />
- <vssd:SuspendDataRoot xsi:nil="true" />
- <vssd:SwapFileDataRoot xsi:nil="true" />
- <vssd:VirtualSystemIdentifier>m1
- </vssd:VirtualSystemIdentifier>
- <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
- </System>
- <Item>
- <rasd:Address xsi:nil="true" />
- <rasd:AddressOnParent xsi:nil="true" />
- <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
- <rasd:AutomaticAllocation xsi:nil="true" />
- <rasd:AutomaticDeallocation
- xsi:nil="true" />
- <rasd:Caption xsi:nil="true" />
- <rasd:ConsumerVisibility xsi:nil="true" />
- <rasd:Description>Number of Virtual CPUs</rasd:Description>
- <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>
- <rasd:InstanceID>1</rasd:InstanceID>
- <rasd:Limit xsi:nil="true" />
- <rasd:MappingBehavior xsi:nil="true" />
- <rasd:OtherResourceType xsi:nil="true" />
- <rasd:Parent xsi:nil="true" />
- <rasd:PoolID xsi:nil="true" />
- <rasd:Reservation xsi:nil="true" />
- <rasd:ResourceSubType xsi:nil="true" />
- <rasd:ResourceType>3</rasd:ResourceType>
- <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
- <rasd:VirtualQuantityUnits>count</rasd:VirtualQuantityUnits>
- <rasd:Weight xsi:nil="true" />
- </Item>
- <Item>
- <rasd:Address xsi:nil="true" />
- <rasd:AddressOnParent xsi:nil="true" />
- <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
- <rasd:AutomaticAllocation xsi:nil="true" />
- <rasd:AutomaticDeallocation
- xsi:nil="true" />
- <rasd:Caption xsi:nil="true" />
- <rasd:ConsumerVisibility xsi:nil="true" />
- <rasd:Description>Memory Size</rasd:Description>
- <rasd:ElementName>512MB of memory</rasd:ElementName>
- <rasd:InstanceID>2</rasd:InstanceID>
- <rasd:Limit xsi:nil="true" />
- <rasd:MappingBehavior xsi:nil="true" />
- <rasd:OtherResourceType xsi:nil="true" />
- <rasd:Parent xsi:nil="true" />
- <rasd:PoolID xsi:nil="true" />
- <rasd:Reservation xsi:nil="true" />
- <rasd:ResourceSubType xsi:nil="true" />
- <rasd:ResourceType>4</rasd:ResourceType>
- <rasd:VirtualQuantity>512</rasd:VirtualQuantity>
- <rasd:VirtualQuantityUnits>byte * 2^20
- </rasd:VirtualQuantityUnits>
- <rasd:Weight xsi:nil="true" />
- </Item>
- <Item>
- <rasd:Address>0</rasd:Address>
- <rasd:AddressOnParent xsi:nil="true" />
- <rasd:AllocationUnits xsi:nil="true" />
- <rasd:AutomaticAllocation xsi:nil="true" />
- <rasd:AutomaticDeallocation
- xsi:nil="true" />
- <rasd:Caption xsi:nil="true" />
- <rasd:ConsumerVisibility xsi:nil="true" />
- <rasd:Description>SCSI Controller</rasd:Description>
- <rasd:ElementName>SCSI Controller 0</rasd:ElementName>
- <rasd:InstanceID>3</rasd:InstanceID>
- <rasd:Limit xsi:nil="true" />
- <rasd:MappingBehavior xsi:nil="true" />
- <rasd:OtherResourceType xsi:nil="true" />
- <rasd:Parent xsi:nil="true" />
- <rasd:PoolID xsi:nil="true" />
- <rasd:Reservation xsi:nil="true" />
- <rasd:ResourceSubType>lsilogic</rasd:ResourceSubType>
- <rasd:ResourceType>6</rasd:ResourceType>
- <rasd:VirtualQuantity xsi:nil="true" />
- <rasd:VirtualQuantityUnits
- xsi:nil="true" />
- <rasd:Weight xsi:nil="true" />
- </Item>
- <Item>
- <rasd:AddressOnParent>7</rasd:AddressOnParent>
- <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
- <rasd:Connection connected="true">Internal
- </rasd:Connection>
- <rasd:Description>PCNet32 ethernet adapter on "Internal" network</rasd:Description>
- <rasd:ElementName>Network Adapter 1</rasd:ElementName>
- <rasd:InstanceID>8</rasd:InstanceID>
- <rasd:ResourceSubType>PCNet32</rasd:ResourceSubType>
- <rasd:ResourceType>10</rasd:ResourceType>
- </Item>
- <Item>
- <rasd:Address xsi:nil="true" />
- <rasd:AddressOnParent>0</rasd:AddressOnParent>
- <rasd:AllocationUnits xsi:nil="true" />
- <rasd:AutomaticAllocation xsi:nil="true" />
- <rasd:AutomaticDeallocation
- xsi:nil="true" />
- <rasd:Caption xsi:nil="true" />
- <rasd:ConsumerVisibility xsi:nil="true" />
- <rasd:Description xsi:nil="true" />
- <rasd:ElementName>Hard Disk 1</rasd:ElementName>
- <rasd:HostResource>10485760</rasd:HostResource>
- <rasd:InstanceID>9</rasd:InstanceID>
- <rasd:Limit xsi:nil="true" />
- <rasd:MappingBehavior xsi:nil="true" />
- <rasd:OtherResourceType xsi:nil="true" />
- <rasd:Parent>3</rasd:Parent>
- <rasd:PoolID xsi:nil="true" />
- <rasd:Reservation xsi:nil="true" />
- <rasd:ResourceSubType xsi:nil="true" />
- <rasd:ResourceType>17</rasd:ResourceType>
- <rasd:VirtualQuantity>10485760</rasd:VirtualQuantity>
- <rasd:VirtualQuantityUnits
- xsi:nil="true" />
- <rasd:Weight xsi:nil="true" />
- </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/vdc-nonet.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/vdc-nonet.xml b/common/trmk/src/test/resources/vdc-nonet.xml
deleted file mode 100644
index eebf132..0000000
--- a/common/trmk/src/test/resources/vdc-nonet.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Vdc href="http://10.150.4.49/api/v0.8/vdc/4" name="DWPCloud"
- xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 http://10.150.4.49/api/v0.8/schemas/vcloud/vcloud/vdc.xsd"
- xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <Link rel="add" href="http://10.150.4.49/api/v0.8/vdc/4/vApps"
- type="application/vnd.vmware.vcloud.vApp+xml" />
- <Link rel="add" href="http://10.150.4.49/api/v0.8/vdc/4/vAppTemplates"
- type="application/vnd.vmware.vcloud.vAppTemplate+xml" />
- <Link rel="add" href="http://10.150.4.49/api/v0.8/vdc/4/media"
- type="application/vnd.vmware.vcloud.media+xml" />
- <Description>Workand Pension Apps</Description>
- <ResourceEntities>
- <ResourceEntity href="http://10.150.4.49/api/v0.8/vAppTemplate/1"
- type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="ttylinux-4-ESX3" />
- <ResourceEntity href="http://10.150.4.49/api/v0.8/vAppTemplate/3"
- type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Win2K3" />
- <ResourceEntity href="http://10.150.4.49/api/v0.8/vApp/7"
- type="application/vnd.vmware.vcloud.vApp+xml" name="OracleRAC" />
- <ResourceEntity href="http://10.150.4.49/api/v0.8/vApp/4"
- type="application/vnd.vmware.vcloud.vApp+xml" name="Oracle" />
- </ResourceEntities>
-</Vdc>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/vdc.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/vdc.xml b/common/trmk/src/test/resources/vdc.xml
deleted file mode 100644
index d5df92f..0000000
--- a/common/trmk/src/test/resources/vdc.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<Vdc href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/32" type="application/vnd.vmware.vcloud.vdc+xml" name="Miami Environment 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">
- <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"/>
- <Link rel="down" href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/32/publicIps" type="application/xml" name="Public IPs"/>
- <Link rel="down" href="https://services.vcloudexpress.terremark.com/api/v0.8/vdc/32/internetServices" type="application/xml" name="Internet Services"/>
- <Description/>
- <StorageCapacity>
- <Units>bytes * 10^9</Units>
- <Allocated>100</Allocated>
- <Used>8</Used>
- </StorageCapacity>
- <ComputeCapacity>
- <Cpu>
- <Units>hz * 10^6</Units>
- <Allocated>5000</Allocated>
- </Cpu>
- <Memory>
- <Units>bytes * 2^20</Units>
- <Allocated>10240</Allocated>
- </Memory>
- <InstantiatedVmsQuota>
- <Limit>-1</Limit>
- <Used>-1</Used>
- </InstantiatedVmsQuota>
- <DeployedVmsQuota>
- <Limit>-1</Limit>
- <Used>-1</Used>
- </DeployedVmsQuota>
- </ComputeCapacity>
- <ResourceEntities>
- <ResourceEntity href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/15124" type="application/vnd.vmware.vcloud.vApp+xml" name="adriantest"/>
- <ResourceEntity href="https://services.vcloudexpress.terremark.com/api/v0.8/vapp/15120" type="application/vnd.vmware.vcloud.vApp+xml" name="centos-53"/>
- </ResourceEntities>
- <AvailableNetworks>
- <Network href="https://services.vcloudexpress.terremark.com/api/v0.8/network/1708" type="application/vnd.vmware.vcloud.network+xml" name="10.114.34.128/26"/>
- </AvailableNetworks>
-</Vdc>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/versions.xml
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/versions.xml b/common/trmk/src/test/resources/versions.xml
deleted file mode 100644
index 4651754..0000000
--- a/common/trmk/src/test/resources/versions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<SupportedVersions xmlns="http://www.vmware.com/vcloud/versions"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <VersionInfo>
- <Version>0.8</Version>
- <LoginUrl>https://services.vcloudexpress.terremark.com/api/v0.8/login</LoginUrl>
- </VersionInfo>
-</SupportedVersions>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/test/resources/windows_description.txt
----------------------------------------------------------------------
diff --git a/common/trmk/src/test/resources/windows_description.txt b/common/trmk/src/test/resources/windows_description.txt
deleted file mode 100644
index d540db5..0000000
--- a/common/trmk/src/test/resources/windows_description.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This template consists of a base Windows Server 2008 R2, Enterprise Edition build. Additional features and roles can be added using the Windows Server Manager. The hostname, Administr
-ator password, and base IP will be set as part of the server creation process based on user input. Once deployment is complete, the server should be accessible via a Remote Desktop Cli
-ent. This customization can take 10 minutes after the base operating system has been deployed. The operating system license is provided through the SPLA program and is done assuming th
-at no application management is being done by the managed services provider.
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/pom.xml
----------------------------------------------------------------------
diff --git a/providers/pom.xml b/providers/pom.xml
index da9b9cb..320aa88 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -41,8 +41,6 @@
<module>ninefold-storage</module>
<module>cloudonestorage</module>
<module>bluelock-vcloud-zone01</module>
- <module>trmk-ecloud</module>
- <module>trmk-vcloudexpress</module>
<module>elastichosts-lon-p</module>
<module>elastichosts-sat-p</module>
<module>elastichosts-lon-b</module>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/README.txt
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/README.txt b/providers/trmk-ecloud/README.txt
deleted file mode 100644
index 53580e4..0000000
--- a/providers/trmk-ecloud/README.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# The jclouds provider for Terremark's Enterprise Cloud (http://www.terremark.com/services/cloudcomputing/theenterprisecloud.aspx) platform.
-#
-# Expects the jclouds vcloudexpress API to be present on your application's classpath.
-#
-# TODO: Implementation status.
-# TODO: Supported features.
-# See http://code.google.com/p/jclouds/wiki/QuickStartTerremarkECloud for example usage.
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/pom.xml
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/pom.xml b/providers/trmk-ecloud/pom.xml
deleted file mode 100644
index cf0ea0a..0000000
--- a/providers/trmk-ecloud/pom.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- <relativePath>../../project/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.jclouds.provider</groupId>
- <artifactId>trmk-ecloud</artifactId>
- <name>jclouds Terremark Enterprise Cloud provider</name>
- <description>jclouds Terremark Enterprise Cloud provider</description>
- <packaging>bundle</packaging>
-
- <properties>
- <test.trmk-ecloud.endpoint>https://services.enterprisecloud.terremark.com/api</test.trmk-ecloud.endpoint>
- <test.trmk-ecloud.datacenter>MIA</test.trmk-ecloud.datacenter>
- <test.trmk-ecloud.api-version>0.8b-ext2.8</test.trmk-ecloud.api-version>
- <test.trmk-ecloud.build-version />
- <test.trmk-ecloud.identity>FIXME</test.trmk-ecloud.identity>
- <test.trmk-ecloud.credential>FIXME</test.trmk-ecloud.credential>
- <test.trmk-ecloud.template />
-
- <jclouds.osgi.export>org.jclouds.trmk.ecloud*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds.common</groupId>
- <artifactId>trmk-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.common</groupId>
- <artifactId>trmk-common</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.mockwebserver</groupId>
- <artifactId>mockwebserver</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <threadCount>1</threadCount>
- <systemPropertyVariables>
- <test.trmk-ecloud.endpoint>${test.trmk-ecloud.endpoint}</test.trmk-ecloud.endpoint>
- <test.trmk-ecloud.api-version>${test.trmk-ecloud.api-version}</test.trmk-ecloud.api-version>
- <test.trmk-ecloud.build-version>${test.trmk-ecloud.build-version}</test.trmk-ecloud.build-version>
- <test.trmk-ecloud.identity>${test.trmk-ecloud.identity}</test.trmk-ecloud.identity>
- <test.trmk-ecloud.credential>${test.trmk-ecloud.credential}</test.trmk-ecloud.credential>
- <test.trmk-ecloud.datacenter>${test.trmk-ecloud.datacenter}</test.trmk-ecloud.datacenter>
- <test.trmk-ecloud.template>${test.trmk-ecloud.template}</test.trmk-ecloud.template>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApi.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApi.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApi.java
deleted file mode 100644
index fb94a21..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApi.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud;
-
-import static javax.ws.rs.core.MediaType.APPLICATION_XML;
-import static org.jclouds.trmk.ecloud.TerremarkECloudMediaType.INTERNETSERVICESLIST_XML;
-import static org.jclouds.trmk.ecloud.TerremarkECloudMediaType.INTERNETSERVICE_XML;
-import static org.jclouds.trmk.ecloud.TerremarkECloudMediaType.IPADDRESS_LIST_XML;
-import static org.jclouds.trmk.ecloud.TerremarkECloudMediaType.KEYSLIST_XML;
-import static org.jclouds.trmk.ecloud.TerremarkECloudMediaType.PUBLICIP_XML;
-import static org.jclouds.trmk.ecloud.TerremarkECloudMediaType.VAPPEXTINFO_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.NETWORK_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.ORG_XML;
-
-import java.net.URI;
-import java.util.Set;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.Fallbacks;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.Delegate;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.MapBinder;
-import org.jclouds.rest.annotations.PayloadParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.XMLResponseParser;
-import org.jclouds.trmk.ecloud.domain.ECloudOrg;
-import org.jclouds.trmk.ecloud.features.DataCenterOperationsApi;
-import org.jclouds.trmk.ecloud.features.TagOperationsApi;
-import org.jclouds.trmk.ecloud.xml.ECloudOrgHandler;
-import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudApi;
-import org.jclouds.trmk.vcloud_0_8.binders.BindCreateKeyToXmlPayload;
-import org.jclouds.trmk.vcloud_0_8.binders.OrgNameVDCNameNetworkNameToEndpoint;
-import org.jclouds.trmk.vcloud_0_8.domain.InternetService;
-import org.jclouds.trmk.vcloud_0_8.domain.IpAddress;
-import org.jclouds.trmk.vcloud_0_8.domain.KeyPair;
-import org.jclouds.trmk.vcloud_0_8.domain.Network;
-import org.jclouds.trmk.vcloud_0_8.domain.NetworkExtendedInfo;
-import org.jclouds.trmk.vcloud_0_8.domain.Protocol;
-import org.jclouds.trmk.vcloud_0_8.domain.PublicIpAddress;
-import org.jclouds.trmk.vcloud_0_8.domain.VAppExtendedInfo;
-import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie;
-import org.jclouds.trmk.vcloud_0_8.functions.OrgNameToEndpoint;
-import org.jclouds.trmk.vcloud_0_8.functions.OrgURIToKeysListEndpoint;
-import org.jclouds.trmk.vcloud_0_8.functions.VDCURIToInternetServicesEndpoint;
-import org.jclouds.trmk.vcloud_0_8.functions.VDCURIToPublicIPsEndpoint;
-import org.jclouds.trmk.vcloud_0_8.options.AddInternetServiceOptions;
-import org.jclouds.trmk.vcloud_0_8.xml.InternetServiceHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.InternetServicesHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.IpAddressesHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.KeyPairByNameHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.KeyPairHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.KeyPairsHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.NetworkExtendedInfoHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.NetworkHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.PublicIpAddressHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.VAppExtendedInfoHandler;
-
-/**
- * Provides access to VCloud resources via their REST API.
- * <p/>
- *
- * @see <a href=
- * "http://support.theenterprisecloud.com/kb/default.asp?id=645&Lang=1&SID="
- * />
- * @author Adrian Cole
- */
-@RequestFilters(SetVCloudTokenCookie.class)
-public interface TerremarkECloudApi extends TerremarkVCloudApi {
- /**
- * Provides synchronous access to Data Center Operations.
- *
- */
- @Delegate
- DataCenterOperationsApi getDataCenterOperationsApi();
-
- /**
- * Provides synchronous access to Data Center Operations.
- *
- */
- @Delegate
- TagOperationsApi getTagOperationsApi();
-
- /**
- * {@inheritDoc}
- */
- @Override
- @GET
- @XMLResponseParser(ECloudOrgHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @Consumes(ORG_XML)
- ECloudOrg getOrg(@EndpointParam URI orgId);
-
- @Override
- @GET
- @XMLResponseParser(ECloudOrgHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @Consumes(ORG_XML)
- ECloudOrg findOrgNamed(
- @Nullable @EndpointParam(parser = OrgNameToEndpoint.class) String orgName);
-
- @GET
- @Consumes(INTERNETSERVICESLIST_XML)
- @XMLResponseParser(InternetServicesHandler.class)
- @Fallback(Fallbacks.EmptySetOnNotFoundOr404.class)
- @Override
- Set<InternetService> getAllInternetServicesInVDC(
- @EndpointParam(parser = VDCURIToInternetServicesEndpoint.class) URI vDCId);
-
- /**
- * Allocate a new public IP
- *
- * @param vDCId
- * @return
- * @throws org.jclouds.rest.InsufficientResourcesException
- * if there's no additional ips available
- */
- @POST
- @Consumes(PUBLICIP_XML)
- @XMLResponseParser(PublicIpAddressHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- PublicIpAddress activatePublicIpInVDC(
- @EndpointParam(parser = VDCURIToPublicIPsEndpoint.class) URI vDCId);
-
- @POST
- @Path("/internetServices")
- @Produces(INTERNETSERVICE_XML)
- @Consumes(INTERNETSERVICE_XML)
- @XMLResponseParser(InternetServiceHandler.class)
- @MapBinder(AddInternetServiceOptions.class)
- @Override
- InternetService addInternetServiceToExistingIp(@EndpointParam URI existingIpId,
- @PayloadParam("name") String serviceName, @PayloadParam("protocol") Protocol protocol,
- @PayloadParam("port") int port, AddInternetServiceOptions... options);
-
- @GET
- @Path("/internetServices")
- @Consumes(INTERNETSERVICESLIST_XML)
- @XMLResponseParser(InternetServicesHandler.class)
- @Fallback(Fallbacks.EmptySetOnNotFoundOr404.class)
- @Override
- Set<InternetService> getInternetServicesOnPublicIp(@EndpointParam URI ipId);
-
- @GET
- @Consumes(INTERNETSERVICESLIST_XML)
- @XMLResponseParser(InternetServiceHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @Override
- InternetService getInternetService(@EndpointParam URI internetServiceId);
-
- @Override
- @GET
- @XMLResponseParser(KeyPairByNameHandler.class)
- @Consumes(KEYSLIST_XML)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- KeyPair findKeyPairInOrg(@Nullable @EndpointParam(parser = OrgURIToKeysListEndpoint.class) URI org, String keyName);
-
- @Override
- @GET
- @Consumes(KEYSLIST_XML)
- @XMLResponseParser(KeyPairsHandler.class)
- @Fallback(Fallbacks.EmptySetOnNotFoundOr404.class)
- Set<KeyPair> listKeyPairsInOrg(@Nullable @EndpointParam(parser = OrgURIToKeysListEndpoint.class) URI org);
-
- @GET
- @Consumes(KEYSLIST_XML)
- @XMLResponseParser(KeyPairsHandler.class)
- @Fallback(Fallbacks.EmptySetOnNotFoundOr404.class)
- Set<KeyPair> listKeyPairs(@EndpointParam URI keysList);
-
- @Override
- @POST
- @Produces(KEYSLIST_XML)
- @Consumes(KEYSLIST_XML)
- @XMLResponseParser(KeyPairHandler.class)
- @MapBinder(BindCreateKeyToXmlPayload.class)
- KeyPair generateKeyPairInOrg(
- @EndpointParam(parser = OrgURIToKeysListEndpoint.class) URI org, @PayloadParam("name") String name,
- @PayloadParam("isDefault") boolean makeDefault);
-
- @Override
- @GET
- @XMLResponseParser(KeyPairHandler.class)
- @Consumes(APPLICATION_XML)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- KeyPair getKeyPair(@EndpointParam URI keyId);
-
- @Override
- @DELETE
- @Fallback(Fallbacks.VoidOnNotFoundOr404.class)
- void deleteKeyPair(@EndpointParam URI keyId);
-
- @Override
- @GET
- @Consumes(NETWORK_XML)
- @XMLResponseParser(NetworkHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @MapBinder(OrgNameVDCNameNetworkNameToEndpoint.class)
- Network findNetworkInOrgVDCNamed(@Nullable @PayloadParam("orgName") String orgName,
- @Nullable @PayloadParam("vdcName") String vdcName, @PayloadParam("resourceName") String networkName);
-
- @Override
- @GET
- @Consumes(NETWORK_XML)
- @XMLResponseParser(NetworkHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- Network getNetwork(@EndpointParam URI network);
-
- @GET
- @XMLResponseParser(NetworkExtendedInfoHandler.class)
- @Consumes(APPLICATION_XML)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- NetworkExtendedInfo getNetworkExtendedInfo(@EndpointParam URI network);
-
- @GET
- @Consumes(IPADDRESS_LIST_XML)
- @XMLResponseParser(IpAddressesHandler.class)
- @Fallback(Fallbacks.EmptySetOnNotFoundOr404.class)
- Set<IpAddress> getIpAddresses(@EndpointParam URI network);
-
- /**
- * Returns extended information for the vApp.
- *
- * @param vApp
- * The URI at which the vApp information is available.
- * @return Extended vApp information like tags, long name, network adapter
- * information.
- */
- @GET
- @Consumes(VAPPEXTINFO_XML)
- @XMLResponseParser(VAppExtendedInfoHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- VAppExtendedInfo getVAppExtendedInfo(@EndpointParam URI href);
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApiMetadata.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApiMetadata.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApiMetadata.java
deleted file mode 100644
index 58f20d9..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApiMetadata.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud;
-
-import static org.jclouds.trmk.vcloud_0_8.reference.TerremarkConstants.PROPERTY_TERREMARK_EXTENSION_NAME;
-import static org.jclouds.trmk.vcloud_0_8.reference.TerremarkConstants.PROPERTY_TERREMARK_EXTENSION_VERSION;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.apis.ApiMetadata;
-import org.jclouds.trmk.ecloud.compute.config.TerremarkECloudComputeServiceContextModule;
-import org.jclouds.trmk.ecloud.config.TerremarkECloudHttpApiModule;
-import org.jclouds.trmk.vcloud_0_8.internal.TerremarkVCloudApiMetadata;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-
-/**
- * Implementation of {@link ApiMetadata} for Terremark eCloud v2.8 API
- *
- * @author Adrian Cole
- */
-public class TerremarkECloudApiMetadata extends TerremarkVCloudApiMetadata {
-
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromApiMetadata(this);
- }
-
- public TerremarkECloudApiMetadata() {
- this(new Builder());
- }
-
- protected TerremarkECloudApiMetadata(Builder builder) {
- super(builder);
- }
-
- public static Properties defaultProperties() {
- Properties properties = TerremarkVCloudApiMetadata.defaultProperties();
- properties.setProperty(PROPERTY_TERREMARK_EXTENSION_NAME, "eCloudExtensions");
- properties.setProperty(PROPERTY_TERREMARK_EXTENSION_VERSION, "2.8");
- return properties;
- }
-
- public static class Builder extends TerremarkVCloudApiMetadata.Builder<Builder> {
-
- protected Builder() {
- id("trmk-ecloud")
- .name("Terremark Enterprise Cloud v2.8 API")
- .version("0.8b-ext2.8")
- .defaultEndpoint("https://services.enterprisecloud.terremark.com/api")
- .documentation(URI.create("http://support.theenterprisecloud.com/kb/default.asp?id=533&Lang=1&SID="))
- .defaultProperties(TerremarkECloudApiMetadata.defaultProperties())
- .defaultModules(ImmutableSet.<Class<? extends Module>>of(TerremarkECloudHttpApiModule.class, TerremarkECloudComputeServiceContextModule.class));
- }
-
- @Override
- public TerremarkECloudApiMetadata build() {
- return new TerremarkECloudApiMetadata(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudMediaType.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudMediaType.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudMediaType.java
deleted file mode 100644
index 5c3972b..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudMediaType.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType;
-
-/**
- * Resource Types used in Terremark eCloud
- *
- * @see MediaType
- */
-public interface TerremarkECloudMediaType extends TerremarkVCloudMediaType {
- /**
- * "application/vnd.tmrk.ecloud.publicIp+xml"
- */
- public static final String PUBLICIP_XML = "application/vnd.tmrk.ecloud.publicIp+xml";
-
- /**
- * "application/vnd.tmrk.ecloud.publicIp+xml"
- */
- public static final MediaType PUBLICIP_XML_TYPE = new MediaType("application", "vnd.tmrk.ecloud.publicIp+xml");
-
- /**
- * "application/vnd.tmrk.ecloud.internetService+xml"
- */
- public static final String INTERNETSERVICE_XML = "application/vnd.tmrk.ecloud.internetService+xml";
-
- /**
- * "application/vnd.tmrk.ecloud.internetService+xml"
- */
- public static final MediaType INTERNETSERVICE_XML_TYPE = new MediaType("application",
- "vnd.tmrk.ecloud.internetService+xml");
- /**
- * "application/vnd.tmrk.ecloud.internetServicesList+xml"
- */
- public static final String INTERNETSERVICESLIST_XML = "application/vnd.tmrk.ecloud.internetServicesList+xml";
-
- /**
- * "application/vnd.tmrk.ecloud.internetServicesList+xml"
- */
- public static final MediaType INTERNETSERVICESLIST_XML_TYPE = new MediaType("application",
- "vnd.tmrk.ecloud.internetServicesList+xml");
-
- /**
- * "application/vnd.tmrk.ecloud.keysList+xml"
- */
- public static final String KEYSLIST_XML = "application/vnd.tmrk.ecloud.keysList+xml";
-
- /**
- * "application/vnd.tmrk.ecloud.keysList+xml"
- */
- public static final MediaType KEYSLIST_XML_TYPE = new MediaType("application", "vnd.tmrk.ecloud.keysList+xml");
- /**
- * "application/vnd.tmrk.ecloud.tagsList+xml"
- */
- public static final String TAGSLISTLIST_XML = "application/vnd.tmrk.ecloud.tagsList+xml";
-
- /**
- * "application/vnd.tmrk.ecloud.tagsList+xml"
- */
- public static final MediaType TAGSLISTLIST_XML_TYPE = new MediaType("application", "vnd.tmrk.ecloud.tagsList+xml");
- /**
- * "application/vnd.tmrk.ecloud.VAppCatalogList+xml"
- */
- public static final String VAPPCATALOGLIST_XML = "application/vnd.tmrk.ecloud.VAppCatalogList+xml";
-
- /**
- * "application/vnd.tmrk.ecloud.VAppCatalogList+xml"
- */
- public static final MediaType VAPPCATALOGLIST_XML_TYPE = new MediaType("application",
- "vnd.tmrk.ecloud.VAppCatalogList+xml");
-
- /**
- * "application/vnd.tmrk.ecloud.dataCentersList+xml"
- */
- public static final String DATACENTERSLIST_XML = "application/vnd.tmrk.ecloud.dataCentersList+xml";
-
- /**
- * "application/vnd.tmrk.ecloud.dataCentersList+xml"
- */
- public static final MediaType DATACENTERSLIST_XML_TYPE = new MediaType("application",
- "vnd.tmrk.ecloud.dataCentersList+xml");
-
- /**
- * "application/vnd.tmrk.ecloud.ipAddressList+xml"
- */
- public static final String IPADDRESS_LIST_XML = "application/vnd.tmrk.ecloud.ipAddressList+xml";
-
- /**
- * "application/vnd.tmrk.ecloud.ipAddressList+xml"
- */
- public static final MediaType IPADDRESSES_LIST_XML_TYPE = new MediaType("application",
- "vnd.tmrk.ecloud.ipAddressList+xml");
-
- /**
- * "application/vnd.tmrk.ecloud.vApp+xml"
- */
- public static final String VAPPEXTINFO_XML = "application/vnd.tmrk.ecloud.vApp+xml";
-
- /**
- * "application/vnd.tmrk.ecloud.vApp+xml"
- */
- public static final MediaType VAPPEXTINFO_XML_TYPE = new MediaType("application", "vnd.tmrk.ecloud.vApp+xml");
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderMetadata.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderMetadata.java
deleted file mode 100644
index 732f3e0..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderMetadata.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-
-/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Terremark's Enterprise Cloud.
- *
- * @author Adrian Cole
- */
-public class TerremarkECloudProviderMetadata extends BaseProviderMetadata {
-
- public static Builder builder() {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder() {
- return builder().fromProviderMetadata(this);
- }
-
- public TerremarkECloudProviderMetadata() {
- super(builder());
- }
-
- public TerremarkECloudProviderMetadata(Builder builder) {
- super(builder);
- }
-
- public static Properties defaultProperties() {
- Properties properties = new Properties();
- return properties;
- }
-
- public static class Builder extends BaseProviderMetadata.Builder {
-
- protected Builder(){
- id("trmk-ecloud")
- .name("Terremark Enterprise Cloud v2.8")
- .apiMetadata(new TerremarkECloudApiMetadata())
- .endpoint("https://services.enterprisecloud.terremark.com/api")
- .homepage(URI.create("http://www.terremark.com/services/cloudcomputing/theenterprisecloud.aspx"))
- .console(URI.create("https://icenter.digitalops.net"))
- .iso3166Codes("US-FL", "US-VA", "NL-NH", "BR-SP");
- }
-
- @Override
- public TerremarkECloudProviderMetadata build() {
- return new TerremarkECloudProviderMetadata(this);
- }
-
- @Override
- public Builder fromProviderMetadata(
- ProviderMetadata in) {
- super.fromProviderMetadata(in);
- return this;
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/compute/config/TerremarkECloudComputeServiceContextModule.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/compute/config/TerremarkECloudComputeServiceContextModule.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/compute/config/TerremarkECloudComputeServiceContextModule.java
deleted file mode 100644
index 7773dab..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/compute/config/TerremarkECloudComputeServiceContextModule.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.compute.config;
-
-import org.jclouds.trmk.ecloud.compute.functions.TerremarkECloudParseOsFromVAppTemplateName;
-import org.jclouds.trmk.ecloud.suppliers.TerremarkECloudInternetServiceAndPublicIpAddressSupplier;
-import org.jclouds.trmk.vcloud_0_8.compute.config.TerremarkVCloudComputeServiceContextModule;
-import org.jclouds.trmk.vcloud_0_8.compute.functions.ParseOsFromVAppTemplateName;
-import org.jclouds.trmk.vcloud_0_8.suppliers.InternetServiceAndPublicIpAddressSupplier;
-
-/**
- * @author Adrian Cole
- */
-public class TerremarkECloudComputeServiceContextModule extends TerremarkVCloudComputeServiceContextModule {
-
- @Override
- protected void configure() {
- bind(InternetServiceAndPublicIpAddressSupplier.class).to(
- TerremarkECloudInternetServiceAndPublicIpAddressSupplier.class);
- bind(ParseOsFromVAppTemplateName.class).to(TerremarkECloudParseOsFromVAppTemplateName.class);
- super.configure();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/compute/functions/TerremarkECloudParseOsFromVAppTemplateName.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/compute/functions/TerremarkECloudParseOsFromVAppTemplateName.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/compute/functions/TerremarkECloudParseOsFromVAppTemplateName.java
deleted file mode 100644
index c5569ab..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/compute/functions/TerremarkECloudParseOsFromVAppTemplateName.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.compute.util.ComputeServiceUtils.parseOsFamilyOrUnrecognized;
-
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.domain.OperatingSystem.Builder;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.compute.util.ComputeServiceUtils;
-import org.jclouds.trmk.vcloud_0_8.compute.functions.ParseOsFromVAppTemplateName;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class TerremarkECloudParseOsFromVAppTemplateName extends ParseOsFromVAppTemplateName {
- // CentOS 5 (x64)
- public static final Pattern OS_PATTERN = Pattern.compile("^-?([^ ]*) ([0-9.]+)( R[1-9])? ?.*");
-
- @Inject
- protected TerremarkECloudParseOsFromVAppTemplateName(Map<OsFamily, Map<String, String>> osVersionMap) {
- super(osVersionMap);
- }
-
- @Override
- public OperatingSystem apply(String from) {
- checkNotNull(from, "vapp template name");
- Builder builder = new OperatingSystem.Builder();
- builder.description(from);
- if (from.equals("-Windows 2003 Std. R2 SQL 2005 Std. (x64)"))
- System.out.print(';');
- builder.is64Bit(from.indexOf("64") != -1);
- from = from.replace("Red Hat Enterprise Linux", "RHEL").replace("Sun Solaris", "SOLARIS").replace(
- " Server", "").replace("Std. ", "");
- Matcher matcher = OS_PATTERN.matcher(from);
- if (matcher.find()) {
- OsFamily osFamily = parseOsFamilyOrUnrecognized(matcher.group(1));
- builder.family(osFamily);
- String version = (matcher.group(3) != null) ? matcher.group(2) + matcher.group(3) : matcher.group(2);
- builder.version(ComputeServiceUtils.parseVersionOrReturnEmptyString(osFamily, version, osVersionMap));
- } else {
- OsFamily osFamily = parseOsFamilyOrUnrecognized(from);
- builder.family(osFamily);
- }
- return builder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/config/TerremarkECloudHttpApiModule.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/config/TerremarkECloudHttpApiModule.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/config/TerremarkECloudHttpApiModule.java
deleted file mode 100644
index 78b98ce..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/config/TerremarkECloudHttpApiModule.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.config;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.rest.ConfiguresRestClient;
-import org.jclouds.trmk.ecloud.TerremarkECloudApi;
-import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudApi;
-import org.jclouds.trmk.vcloud_0_8.config.DefaultVCloudReferencesModule;
-import org.jclouds.trmk.vcloud_0_8.config.TerremarkVCloudHttpApiModule;
-import org.jclouds.trmk.vcloud_0_8.domain.Network;
-import org.jclouds.trmk.vcloud_0_8.domain.NetworkExtendedInfo;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-
-import com.google.common.base.Predicate;
-import com.google.inject.Injector;
-import com.google.inject.Provides;
-
-/**
- * Configures the VCloud authentication service connection, including logging
- * and http transport.
- *
- * @author Adrian Cole
- */
-@ConfiguresRestClient
-public class TerremarkECloudHttpApiModule extends
- TerremarkVCloudHttpApiModule<TerremarkECloudApi> {
-
- @Provides
- @Singleton
- protected TerremarkVCloudApi provideTerremarkApi(TerremarkECloudApi in) {
- return in;
- }
-
- @Singleton
- public static class IsDMZNetwork implements Predicate<ReferenceType> {
- private final TerremarkECloudApi client;
-
- @Inject
- public IsDMZNetwork(TerremarkECloudApi client) {
- this.client = client;
- }
-
- @Override
- public boolean apply(ReferenceType arg0) {
- // TODO FIXME XXX: In Terremark Enterprise environment with multiple
- // VDC's
- // this does not
- // work well.
- // Each VDC will have different network subnets. So we cannot assume the
- // default VDC's
- // networks will
- // work with non-default VDC's. So make PROPERTY_VCLOUD_DEFAULT_NETWORK
- // optional. If
- // this property
- // is not set, they are expected to add NetworkConfig to the options
- // when
- // launching a
- // server.
- Network orgNetwork = client.getNetwork(arg0.getHref());
- NetworkExtendedInfo terremarkNetwork = client.getNetworkExtendedInfo(checkNotNull(
- checkNotNull(orgNetwork, "network at: " + arg0).getNetworkExtension(), "network extension for: " + arg0)
- .getHref());
- return checkNotNull(terremarkNetwork, "terremark network extension at: " + orgNetwork.getNetworkExtension())
- .getNetworkType() == NetworkExtendedInfo.Type.DMZ;
- }
- }
-
- @Override
- protected void installDefaultVCloudEndpointsModule() {
- install(new DefaultVCloudReferencesModule() {
-
- @Override
- protected Predicate<ReferenceType> provideDefaultNetworkSelector(Injector i) {
- return i.getInstance(IsDMZNetwork.class);
- }
-
- });
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/domain/ECloudOrg.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/domain/ECloudOrg.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/domain/ECloudOrg.java
deleted file mode 100644
index 696fc9f..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/domain/ECloudOrg.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.domain;
-
-import org.jclouds.trmk.ecloud.domain.internal.ECloudOrgImpl;
-import org.jclouds.trmk.vcloud_0_8.domain.Org;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-import org.jclouds.trmk.vcloud_0_8.endpoints.DataCenters;
-import org.jclouds.trmk.vcloud_0_8.endpoints.Tags;
-import org.jclouds.trmk.vcloud_0_8.endpoints.VAppCatalog;
-
-import com.google.inject.ImplementedBy;
-
-/**
- * @author Adrian Cole
- */
-@org.jclouds.trmk.vcloud_0_8.endpoints.Org
-@ImplementedBy(ECloudOrgImpl.class)
-public interface ECloudOrg extends Org {
-
- @DataCenters
- ReferenceType getDataCenters();
-
- @Tags
- ReferenceType getTags();
-
- @VAppCatalog
- ReferenceType getVAppCatalog();
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/domain/internal/ECloudOrgImpl.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/domain/internal/ECloudOrgImpl.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/domain/internal/ECloudOrgImpl.java
deleted file mode 100644
index f515c07..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/domain/internal/ECloudOrgImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.domain.internal;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Map;
-
-import org.jclouds.trmk.ecloud.domain.ECloudOrg;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-import org.jclouds.trmk.vcloud_0_8.domain.internal.OrgImpl;
-
-/**
- * Locations of resources in a Terremark eCloud Org
- *
- * @author Adrian Cole
- *
- */
-public class ECloudOrgImpl extends OrgImpl implements ECloudOrg {
-
- private final ReferenceType dataCentersList;
- private final ReferenceType deviceTags;
- private final ReferenceType vAppCatalog;
-
- public ECloudOrgImpl(String name, String type, URI id, String description, Map<String, ReferenceType> catalogs,
- Map<String, ReferenceType> vdcs, Map<String, ReferenceType> tasksLists, ReferenceType keys,
- ReferenceType dataCentersList, ReferenceType deviceTags, ReferenceType vAppCatalog) {
- super(name, type, id, description, catalogs, vdcs, tasksLists, keys);
- this.deviceTags = checkNotNull(deviceTags, "deviceTags");
- this.vAppCatalog = checkNotNull(vAppCatalog, "vAppCatalog");
- this.dataCentersList = checkNotNull(dataCentersList, "dataCentersList");
- }
-
- @Override
- public ReferenceType getDataCenters() {
- return dataCentersList;
- }
-
- @Override
- public ReferenceType getTags() {
- return deviceTags;
- }
-
- @Override
- public ReferenceType getVAppCatalog() {
- return vAppCatalog;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApi.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApi.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApi.java
deleted file mode 100644
index ba31d97..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApi.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.features;
-
-import static org.jclouds.trmk.ecloud.TerremarkECloudMediaType.DATACENTERSLIST_XML;
-
-import java.net.URI;
-import java.util.Set;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-
-import org.jclouds.Fallbacks;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.XMLResponseParser;
-import org.jclouds.trmk.ecloud.functions.OrgURIToDataCentersListEndpoint;
-import org.jclouds.trmk.vcloud_0_8.domain.DataCenter;
-import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie;
-import org.jclouds.trmk.vcloud_0_8.xml.DataCentersHandler;
-
-/**
- * Data Center Operations access to DataCenterOperations functionality in vCloud
- * <p/>
- * There are times where knowing a data center is necessary to complete certain
- * operations (i.e. uploading a catalog item). The data centers for an
- * organization are those data centers that contain at least one of the
- * organization's environments.
- *
- * @author Adrian Cole
- */
-@RequestFilters(SetVCloudTokenCookie.class)
-public interface DataCenterOperationsApi {
-
- /**
- * This call will get the list of data centers that contain at least one of
- * the organization's environments.
- *
- *
- * @return data centers
- */
- @GET
- @Consumes(DATACENTERSLIST_XML)
- @XMLResponseParser(DataCentersHandler.class)
- @Fallback(Fallbacks.EmptySetOnNotFoundOr404.class)
- Set<DataCenter> listDataCentersInOrg(@Nullable @EndpointParam(parser = OrgURIToDataCentersListEndpoint.class) URI org);
-
- /**
- * This call will get the list of data centers by list id.
- *
- * @return data centers
- */
- @GET
- @Consumes(DATACENTERSLIST_XML)
- @XMLResponseParser(DataCentersHandler.class)
- @Fallback(Fallbacks.EmptySetOnNotFoundOr404.class)
- Set<DataCenter> listDataCenters(@EndpointParam URI dataCenters);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsApi.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsApi.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsApi.java
deleted file mode 100644
index f024ba3..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsApi.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.features;
-
-import static org.jclouds.trmk.ecloud.TerremarkECloudMediaType.TAGSLISTLIST_XML;
-
-import java.net.URI;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-
-import org.jclouds.Fallbacks;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.XMLResponseParser;
-import org.jclouds.trmk.ecloud.functions.OrgURIToTagsListEndpoint;
-import org.jclouds.trmk.ecloud.xml.TagNameToUsageCountHandler;
-import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie;
-
-/**
- * Tag Based Operations
- * <p/>
- *
- * @author Adrian Cole
- */
-@RequestFilters(SetVCloudTokenCookie.class)
-public interface TagOperationsApi {
-
- /**
- * This call returns the list of all tags belonging to the organization.
- *
- * @return tags
- */
- @GET
- @Consumes(TAGSLISTLIST_XML)
- @XMLResponseParser(TagNameToUsageCountHandler.class)
- @Fallback(Fallbacks.EmptyMapOnNotFoundOr404.class)
- Map<String, Integer> getTagNameToUsageCountInOrg(@Nullable @EndpointParam(parser = OrgURIToTagsListEndpoint.class) URI org);
-
- /**
- * This call returns the list of all tags by list id.
- *
- * @return tags
- */
- @GET
- @Consumes(TAGSLISTLIST_XML)
- @XMLResponseParser(TagNameToUsageCountHandler.class)
- @Fallback(Fallbacks.EmptyMapOnNotFoundOr404.class)
- Map<String, Integer> getTagNameToUsageCount(@EndpointParam URI tagList);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/functions/OrgURIToDataCentersListEndpoint.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/functions/OrgURIToDataCentersListEndpoint.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/functions/OrgURIToDataCentersListEndpoint.java
deleted file mode 100644
index 3466cfd..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/functions/OrgURIToDataCentersListEndpoint.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.functions;
-
-import java.net.URI;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.trmk.ecloud.domain.ECloudOrg;
-import org.jclouds.trmk.vcloud_0_8.domain.Org;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-import org.jclouds.trmk.vcloud_0_8.functions.OrgURIToEndpoint;
-
-import com.google.common.base.Function;
-import com.google.common.base.Supplier;
-
-/**
- *
- * @author Adrian Cole
- */
-@Singleton
-public class OrgURIToDataCentersListEndpoint extends OrgURIToEndpoint {
- @Inject
- public OrgURIToDataCentersListEndpoint(Supplier<Map<String, ? extends Org>> orgMap,
- @org.jclouds.trmk.vcloud_0_8.endpoints.Org Supplier<ReferenceType> defaultUri) {
- super(orgMap, defaultUri);
- }
-
- public URI getUriFromOrg(Org org) {
- return ECloudOrg.class.cast(org).getDataCenters().getHref();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/functions/OrgURIToTagsListEndpoint.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/functions/OrgURIToTagsListEndpoint.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/functions/OrgURIToTagsListEndpoint.java
deleted file mode 100644
index 2ff16e5..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/functions/OrgURIToTagsListEndpoint.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.functions;
-
-import java.net.URI;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.trmk.ecloud.domain.ECloudOrg;
-import org.jclouds.trmk.vcloud_0_8.domain.Org;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-import org.jclouds.trmk.vcloud_0_8.functions.OrgURIToEndpoint;
-
-import com.google.common.base.Function;
-import com.google.common.base.Supplier;
-
-/**
- *
- * @author Adrian Cole
- */
-@Singleton
-public class OrgURIToTagsListEndpoint extends OrgURIToEndpoint {
- @Inject
- public OrgURIToTagsListEndpoint(Supplier<Map<String, ? extends Org>> orgMap,
- @org.jclouds.trmk.vcloud_0_8.endpoints.Org Supplier<ReferenceType> defaultUri) {
- super(orgMap, defaultUri);
- }
-
- public URI getUriFromOrg(Org org) {
- return ECloudOrg.class.cast(org).getTags().getHref();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/suppliers/TerremarkECloudInternetServiceAndPublicIpAddressSupplier.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/suppliers/TerremarkECloudInternetServiceAndPublicIpAddressSupplier.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/suppliers/TerremarkECloudInternetServiceAndPublicIpAddressSupplier.java
deleted file mode 100644
index 7316464fa..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/suppliers/TerremarkECloudInternetServiceAndPublicIpAddressSupplier.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.suppliers;
-
-import static org.jclouds.trmk.vcloud_0_8.options.AddInternetServiceOptions.Builder.withDescription;
-
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.logging.Logger;
-import org.jclouds.rest.InsufficientResourcesException;
-import org.jclouds.trmk.ecloud.TerremarkECloudApi;
-import org.jclouds.trmk.vcloud_0_8.domain.InternetService;
-import org.jclouds.trmk.vcloud_0_8.domain.Protocol;
-import org.jclouds.trmk.vcloud_0_8.domain.PublicIpAddress;
-import org.jclouds.trmk.vcloud_0_8.domain.VApp;
-import org.jclouds.trmk.vcloud_0_8.suppliers.InternetServiceAndPublicIpAddressSupplier;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class TerremarkECloudInternetServiceAndPublicIpAddressSupplier implements
- InternetServiceAndPublicIpAddressSupplier {
-
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- public Logger logger = Logger.NULL;
- protected final TerremarkECloudApi client;
-
- @Inject
- public TerremarkECloudInternetServiceAndPublicIpAddressSupplier(TerremarkECloudApi client) {
- this.client = client;
- }
-
- @Override
- public Entry<InternetService, PublicIpAddress> getNewInternetServiceAndIp(VApp vApp, int port, Protocol protocol) {
- logger.debug(">> creating InternetService in vDC %s:%s:%d", vApp.getVDC().getHref(), protocol, port);
- InternetService is = null;
- PublicIpAddress ip = null;
- try {
- ip = client.activatePublicIpInVDC(vApp.getVDC().getHref());
- } catch (InsufficientResourcesException e) {
- logger.warn(">> no more ip addresses available, looking for one to re-use");
- Set<PublicIpAddress> publicIps = client.getPublicIpsAssociatedWithVDC(vApp.getVDC().getHref());
- for (PublicIpAddress existingIp : publicIps) {
- Set<InternetService> services = client.getInternetServicesOnPublicIp(existingIp.getId());
- if (services.size() == 0) {
- ip = existingIp;
- break;
- }
- }
- if (ip == null)
- throw new InsufficientResourcesException(
- "no more ip addresses available and existing ips all have services attached: " + publicIps, e
- .getCause());
- }
- is = client.addInternetServiceToExistingIp(ip.getId(), vApp.getName() + "-" + port, protocol, port,
- withDescription(String.format("port %d access to serverId: %s name: %s", port, vApp.getName(), vApp
- .getName())));
- Map<InternetService, PublicIpAddress> result = ImmutableMap.<InternetService, PublicIpAddress> of(is, ip);
- Entry<InternetService, PublicIpAddress> entry = Iterables.getOnlyElement(result.entrySet());
- return entry;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/xml/ECloudOrgHandler.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/xml/ECloudOrgHandler.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/xml/ECloudOrgHandler.java
deleted file mode 100644
index 7ac52e9..0000000
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/xml/ECloudOrgHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.xml;
-
-import static org.jclouds.trmk.vcloud_0_8.util.Utils.newReferenceType;
-import static org.jclouds.util.SaxUtils.cleanseAttributes;
-
-import java.util.Map;
-
-import org.jclouds.trmk.ecloud.domain.ECloudOrg;
-import org.jclouds.trmk.ecloud.domain.internal.ECloudOrgImpl;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-import org.jclouds.trmk.vcloud_0_8.xml.OrgHandler;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * @author Adrian Cole
- */
-public class ECloudOrgHandler extends OrgHandler {
-
- private ReferenceType dataCentersList;
- private ReferenceType deviceTags;
- private ReferenceType vAppCatalog;
-
- public ECloudOrg getResult() {
- return new ECloudOrgImpl(org.getName(), org.getType(), org.getHref(), description, catalogs, vdcs, tasksLists,
- keys, dataCentersList, deviceTags, vAppCatalog);
- }
-
- @Override
- public void startElement(String uri, String localName, String qName, Attributes attrs) throws SAXException {
- Map<String, String> attributes = cleanseAttributes(attrs);
- super.startElement(uri, localName, qName, attrs);
- if (qName.equals("Link")) {
- if (attributes.containsKey("type")) {
- String type = attributes.get("type");
- if (type != null && type.endsWith("dataCentersList+xml")) {
- dataCentersList = newReferenceType(attributes);
- } else if (type != null && type.endsWith("tagsList+xml")) {
- deviceTags = newReferenceType(attributes);
- } else if (type != null && type.endsWith("VAppCatalogList+xml")) {
- vAppCatalog = newReferenceType(attributes);
- }
- }
- }
- }
-}