diff --git a/core/src/main/resources/rest.properties b/core/src/main/resources/rest.properties index dd4ad6c03e..fc7ac9bb88 100644 --- a/core/src/main/resources/rest.properties +++ b/core/src/main/resources/rest.properties @@ -50,8 +50,8 @@ trmk-vcloudexpress.propertiesbuilder=org.jclouds.trmk.vcloudexpress.TerremarkVCl trmk-ecloud.contextbuilder=org.jclouds.trmk.ecloud.TerremarkECloudContextBuilder trmk-ecloud.propertiesbuilder=org.jclouds.trmk.ecloud.TerremarkECloudPropertiesBuilder -trmk-enterprisecloud.contextbuilder=org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudContextBuilder -trmk-enterprisecloud.propertiesbuilder=org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudPropertiesBuilder +tmrk-enterprisecloud.contextbuilder=org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudContextBuilder +tmrk-enterprisecloud.propertiesbuilder=org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudPropertiesBuilder chef.contextbuilder=org.jclouds.chef.ChefContextBuilder chef.propertiesbuilder=org.jclouds.chef.ChefPropertiesBuilder diff --git a/sandbox-providers/trmk-enterprisecloud/pom.xml b/sandbox-providers/tmrk-enterprisecloud/pom.xml similarity index 83% rename from sandbox-providers/trmk-enterprisecloud/pom.xml rename to sandbox-providers/tmrk-enterprisecloud/pom.xml index b624a5d8bc..99c50bc75c 100644 --- a/sandbox-providers/trmk-enterprisecloud/pom.xml +++ b/sandbox-providers/tmrk-enterprisecloud/pom.xml @@ -28,7 +28,7 @@ ../../project/pom.xml org.jclouds.provider - trmk-enterprisecloud + tmrk-enterprisecloud jclouds Terremark Enterprise Cloud core jclouds components to access Terremark Enterprise Cloud bundle @@ -48,11 +48,11 @@ - https://services-beta.enterprisecloud.terremark.com/cloudapi/ecloud - 2011-07-01 - FIXME - FIXME - + https://services-beta.enterprisecloud.terremark.com/cloudapi/ecloud + 2011-07-01 + FIXME + FIXME + @@ -105,24 +105,24 @@ - test.trmk-enterprisecloud.endpoint - ${test.trmk-enterprisecloud.endpoint} + test.tmrk-enterprisecloud.endpoint + ${test.tmrk-enterprisecloud.endpoint} - test.trmk-enterprisecloud.apiversion - ${test.trmk-enterprisecloud.apiversion} + test.tmrk-enterprisecloud.apiversion + ${test.tmrk-enterprisecloud.apiversion} - test.trmk-enterprisecloud.identity - ${test.trmk-enterprisecloud.identity} + test.tmrk-enterprisecloud.identity + ${test.tmrk-enterprisecloud.identity} - test.trmk-enterprisecloud.credential - ${test.trmk-enterprisecloud.credential} + test.tmrk-enterprisecloud.credential + ${test.tmrk-enterprisecloud.credential} - test.trmk-enterprisecloud.image-id - ${test.trmk-enterprisecloud.image-id} + test.tmrk-enterprisecloud.image-id + ${test.tmrk-enterprisecloud.image-id} @@ -142,7 +142,7 @@ ${project.artifactId} - org.jclouds.trmk.enterprisecloud.*;version="${project.version}" + org.jclouds.tmrk.enterprisecloud.*;version="${project.version}" org.jclouds.*;version="${project.version}",* diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudAsyncClient.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudAsyncClient.java similarity index 92% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudAsyncClient.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudAsyncClient.java index 1aaddc622b..99d7e734f2 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudAsyncClient.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudAsyncClient.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud; +package org.jclouds.tmrk.enterprisecloud; import org.jclouds.rest.annotations.Delegate; -import org.jclouds.trmk.enterprisecloud.features.TaskAsyncClient; +import org.jclouds.tmrk.enterprisecloud.features.TaskAsyncClient; /** * Provides asynchronous access to TerremarkEnterpriseCloud via their REST API. diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudClient.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudClient.java similarity index 93% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudClient.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudClient.java index 5040bc888c..cd3741c797 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudClient.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudClient.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud; +package org.jclouds.tmrk.enterprisecloud; import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; import org.jclouds.rest.annotations.Delegate; -import org.jclouds.trmk.enterprisecloud.features.TaskClient; +import org.jclouds.tmrk.enterprisecloud.features.TaskClient; /** * Provides synchronous access to TerremarkEnterpriseCloud. diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudContextBuilder.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudContextBuilder.java similarity index 93% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudContextBuilder.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudContextBuilder.java index af79376876..f5c2cc7254 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudContextBuilder.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudContextBuilder.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud; +package org.jclouds.tmrk.enterprisecloud; import java.util.List; import java.util.Properties; import org.jclouds.rest.RestContextBuilder; -import org.jclouds.trmk.enterprisecloud.config.TerremarkEnterpriseCloudRestClientModule; +import org.jclouds.tmrk.enterprisecloud.config.TerremarkEnterpriseCloudRestClientModule; import com.google.inject.Module; diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudPropertiesBuilder.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudPropertiesBuilder.java similarity index 97% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudPropertiesBuilder.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudPropertiesBuilder.java index 79f373d39f..96383460da 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudPropertiesBuilder.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudPropertiesBuilder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud; +package org.jclouds.tmrk.enterprisecloud; import static org.jclouds.Constants.PROPERTY_API_VERSION; import static org.jclouds.Constants.PROPERTY_ENDPOINT; diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudProviderMetadata.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudProviderMetadata.java similarity index 93% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudProviderMetadata.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudProviderMetadata.java index 8f4975f716..41d3e79815 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudProviderMetadata.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudProviderMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud; +package org.jclouds.tmrk.enterprisecloud; import java.net.URI; import java.util.Set; @@ -39,7 +39,7 @@ public class TerremarkEnterpriseCloudProviderMetadata extends BaseProviderMetada */ @Override public String getId() { - return "trmk-enterprisecloud"; + return "tmrk-enterprisecloud"; } /** @@ -103,7 +103,7 @@ public class TerremarkEnterpriseCloudProviderMetadata extends BaseProviderMetada */ @Override public Set getLinkedServices() { - return ImmutableSet.of("trmk-enterprisecloud", "trmk-ecloud", "trmk-vcloudexpress"); + return ImmutableSet.of("tmrk-enterprisecloud", "tmrk-ecloud", "tmrk-vcloudexpress"); } /** diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/config/TerremarkEnterpriseCloudRestClientModule.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/config/TerremarkEnterpriseCloudRestClientModule.java similarity index 87% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/config/TerremarkEnterpriseCloudRestClientModule.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/config/TerremarkEnterpriseCloudRestClientModule.java index 87047033ae..37eaa46335 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/config/TerremarkEnterpriseCloudRestClientModule.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/config/TerremarkEnterpriseCloudRestClientModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.config; +package org.jclouds.tmrk.enterprisecloud.config; import java.util.Map; @@ -29,11 +29,11 @@ import org.jclouds.http.annotation.ServerError; import org.jclouds.http.handlers.BackoffLimitedRetryHandler; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.config.RestClientModule; -import org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudAsyncClient; -import org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudClient; -import org.jclouds.trmk.enterprisecloud.features.TaskAsyncClient; -import org.jclouds.trmk.enterprisecloud.features.TaskClient; -import org.jclouds.trmk.enterprisecloud.handlers.TerremarkEnterpriseCloudErrorHandler; +import org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudAsyncClient; +import org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudClient; +import org.jclouds.tmrk.enterprisecloud.features.TaskAsyncClient; +import org.jclouds.tmrk.enterprisecloud.features.TaskClient; +import org.jclouds.tmrk.enterprisecloud.handlers.TerremarkEnterpriseCloudErrorHandler; import com.google.common.collect.ImmutableMap; diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Action.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Action.java similarity index 97% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Action.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Action.java index df959d8206..e5bac267fe 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Action.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Action.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.domain; +package org.jclouds.tmrk.enterprisecloud.domain; import static com.google.common.base.CaseFormat.LOWER_CAMEL; import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE; @@ -26,8 +26,8 @@ import java.net.URI; import java.util.Map; import org.jclouds.javax.annotation.Nullable; -import org.jclouds.trmk.enterprisecloud.domain.internal.BaseNamedResource; -import org.jclouds.trmk.enterprisecloud.domain.internal.BaseResource; +import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseNamedResource; +import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseResource; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlEnum; diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Actions.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Actions.java similarity index 97% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Actions.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Actions.java index 2641ebc48a..e61060c6a8 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Actions.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Actions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.domain; +package org.jclouds.tmrk.enterprisecloud.domain; import com.google.common.collect.Sets; diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Group.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Group.java similarity index 85% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Group.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Group.java index 5692ac0148..48d02a5fc5 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Group.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Group.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.domain; +package org.jclouds.tmrk.enterprisecloud.domain; -import org.jclouds.trmk.enterprisecloud.domain.internal.BaseNamedResource; +import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseNamedResource; import javax.xml.bind.annotation.XmlRootElement; @@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement; * @author Jason King */ @XmlRootElement(name = "Group") -public class Group extends BaseNamedResource{ +public class Group extends BaseNamedResource { public Group() { //For JAXB diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Layout.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Layout.java similarity index 98% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Layout.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Layout.java index e8c9baeea9..97fbcacc6f 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Layout.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Layout.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.domain; +package org.jclouds.tmrk.enterprisecloud.domain; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Link.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Link.java similarity index 96% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Link.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Link.java index 32ea105ec4..0c2d9588ba 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Link.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Link.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.domain; +package org.jclouds.tmrk.enterprisecloud.domain; import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.Map; -import org.jclouds.trmk.enterprisecloud.domain.internal.BaseNamedResource; -import org.jclouds.trmk.enterprisecloud.domain.internal.BaseResource; +import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseNamedResource; +import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseResource; import javax.xml.bind.annotation.*; diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Links.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Links.java similarity index 96% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Links.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Links.java index f1d71a2dfe..cadf5494b6 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Links.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Links.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.domain; +package org.jclouds.tmrk.enterprisecloud.domain; import com.google.common.collect.Sets; diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/NamedResource.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/NamedResource.java similarity index 93% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/NamedResource.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/NamedResource.java index 83b7aa8a25..b9b3a3a44d 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/NamedResource.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/NamedResource.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.domain; +package org.jclouds.tmrk.enterprisecloud.domain; import java.net.URI; import java.util.Map; -import org.jclouds.trmk.enterprisecloud.domain.internal.BaseNamedResource; -import org.jclouds.trmk.enterprisecloud.domain.internal.BaseResource; +import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseNamedResource; +import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseResource; /** * diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Row.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Row.java similarity index 85% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Row.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Row.java index a7d439fc08..e294af7df3 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Row.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Row.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.domain; +package org.jclouds.tmrk.enterprisecloud.domain; -import org.jclouds.trmk.enterprisecloud.domain.internal.BaseNamedResource; +import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseNamedResource; import javax.xml.bind.annotation.XmlRootElement; @@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement; * @author Jason King */ @XmlRootElement(name = "Row") -public class Row extends BaseNamedResource{ +public class Row extends BaseNamedResource { public Row() { //For JAXB } diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Task.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Task.java similarity index 98% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Task.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Task.java index ea266543bb..4e36f8256d 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Task.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Task.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.domain; +package org.jclouds.tmrk.enterprisecloud.domain; import static com.google.common.base.CaseFormat.UPPER_CAMEL; import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE; @@ -27,7 +27,7 @@ import java.util.Date; import java.util.Map; import org.jclouds.javax.annotation.Nullable; -import org.jclouds.trmk.enterprisecloud.domain.internal.BaseResource; +import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseResource; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlEnum; diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Tasks.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Tasks.java similarity index 96% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Tasks.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Tasks.java index 9ccdd0bed5..671a898314 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Tasks.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Tasks.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.domain; +package org.jclouds.tmrk.enterprisecloud.domain; import com.google.common.collect.Sets; diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/VirtualMachine.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/VirtualMachine.java similarity index 97% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/VirtualMachine.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/VirtualMachine.java index 1f76551e9b..6625415898 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/VirtualMachine.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/VirtualMachine.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.domain; +package org.jclouds.tmrk.enterprisecloud.domain; -import org.jclouds.trmk.enterprisecloud.domain.internal.BaseNamedResource; -import org.jclouds.trmk.enterprisecloud.domain.internal.BaseResource; +import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseNamedResource; +import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseResource; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/internal/BaseNamedResource.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/internal/BaseNamedResource.java similarity index 98% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/internal/BaseNamedResource.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/internal/BaseNamedResource.java index 273666b5ca..b93928501f 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/internal/BaseNamedResource.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/internal/BaseNamedResource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.domain.internal; +package org.jclouds.tmrk.enterprisecloud.domain.internal; import javax.xml.bind.annotation.XmlAttribute; diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/internal/BaseResource.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/internal/BaseResource.java similarity index 98% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/internal/BaseResource.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/internal/BaseResource.java index 284583728c..73d46f998b 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/internal/BaseResource.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/internal/BaseResource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.domain.internal; +package org.jclouds.tmrk.enterprisecloud.domain.internal; import javax.xml.bind.annotation.XmlAttribute; diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/TaskAsyncClient.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/TaskAsyncClient.java similarity index 89% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/TaskAsyncClient.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/TaskAsyncClient.java index 5f01c5ee15..0b17028b33 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/TaskAsyncClient.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/TaskAsyncClient.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.features; +package org.jclouds.tmrk.enterprisecloud.features; import com.google.common.util.concurrent.ListenableFuture; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.rest.annotations.*; import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; -import org.jclouds.trmk.enterprisecloud.domain.Task; -import org.jclouds.trmk.enterprisecloud.domain.Tasks; +import org.jclouds.tmrk.enterprisecloud.domain.Task; +import org.jclouds.tmrk.enterprisecloud.domain.Tasks; import javax.ws.rs.Consumes; import javax.ws.rs.GET; @@ -43,7 +43,8 @@ import java.net.URI; * @author Adrian Cole */ @RequestFilters(BasicAuthentication.class) -@Headers(keys = "x-trmk-version", values = "{jclouds.api-version}") +@Headers(keys = "x-tmrk-version", values = "{jclouds.api-version}") +//@VirtualHost public interface TaskAsyncClient { /** diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/TaskClient.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/TaskClient.java similarity index 91% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/TaskClient.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/TaskClient.java index 6cf20ae842..4c1abad754 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/TaskClient.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/TaskClient.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.features; +package org.jclouds.tmrk.enterprisecloud.features; import org.jclouds.concurrent.Timeout; -import org.jclouds.trmk.enterprisecloud.domain.Task; -import org.jclouds.trmk.enterprisecloud.domain.Tasks; +import org.jclouds.tmrk.enterprisecloud.domain.Task; +import org.jclouds.tmrk.enterprisecloud.domain.Tasks; import java.net.URI; import java.util.concurrent.TimeUnit; diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/VirtualMachineAsyncClient.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClient.java similarity index 85% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/VirtualMachineAsyncClient.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClient.java index 4a3b720440..04ebabd2b5 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/VirtualMachineAsyncClient.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.features; +package org.jclouds.tmrk.enterprisecloud.features; import com.google.common.util.concurrent.ListenableFuture; import org.jclouds.http.filters.BasicAuthentication; @@ -25,7 +25,7 @@ import org.jclouds.rest.annotations.Headers; import org.jclouds.rest.annotations.JAXBResponseParser; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; -import org.jclouds.trmk.enterprisecloud.domain.VirtualMachine; +import org.jclouds.tmrk.enterprisecloud.domain.VirtualMachine; import javax.ws.rs.Consumes; import javax.ws.rs.GET; @@ -36,18 +36,18 @@ import javax.ws.rs.PathParam; * Provides asynchronous access to VirtualMachine via their REST API. *

* - * @see org.jclouds.trmk.enterprisecloud.features.TaskClient + * @see TaskClient * @see * @author Adrian Cole */ @RequestFilters(BasicAuthentication.class) -@Headers(keys = "x-trmk-version", values = "{jclouds.api-version}") +@Headers(keys = "x-tmrk-version", values = "{jclouds.api-version}") public interface VirtualMachineAsyncClient { /** - * @see org.jclouds.trmk.enterprisecloud.features.VirtualMachineClient#getVirtualMachine + * @see VirtualMachineClient#getVirtualMachine */ @GET @Path("/virtualMachines/{id}") diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/VirtualMachineClient.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineClient.java similarity index 88% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/VirtualMachineClient.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineClient.java index fd846db66f..62a3442e34 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/VirtualMachineClient.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineClient.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.features; +package org.jclouds.tmrk.enterprisecloud.features; import org.jclouds.concurrent.Timeout; -import org.jclouds.trmk.enterprisecloud.domain.VirtualMachine; +import org.jclouds.tmrk.enterprisecloud.domain.VirtualMachine; import java.util.concurrent.TimeUnit; @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit; * Provides synchronous access to VirtualMachine. *

* - * @see org.jclouds.trmk.enterprisecloud.features.VirtualMachineAsyncClient + * @see VirtualMachineAsyncClient * @see diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/handlers/TerremarkEnterpriseCloudErrorHandler.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/handlers/TerremarkEnterpriseCloudErrorHandler.java similarity index 98% rename from sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/handlers/TerremarkEnterpriseCloudErrorHandler.java rename to sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/handlers/TerremarkEnterpriseCloudErrorHandler.java index f3645de2e9..2cd12eee23 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/handlers/TerremarkEnterpriseCloudErrorHandler.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/handlers/TerremarkEnterpriseCloudErrorHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.handlers; +package org.jclouds.tmrk.enterprisecloud.handlers; import java.io.IOException; diff --git a/sandbox-providers/tmrk-enterprisecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/sandbox-providers/tmrk-enterprisecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata new file mode 100644 index 0000000000..99cee4162d --- /dev/null +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata @@ -0,0 +1 @@ +org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudProviderMetadata \ No newline at end of file diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudAsyncClientTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudAsyncClientTest.java similarity index 96% rename from sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudAsyncClientTest.java rename to sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudAsyncClientTest.java index e1d3070c45..fd167b5e8c 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudAsyncClientTest.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudAsyncClientTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud; +package org.jclouds.tmrk.enterprisecloud; import java.io.IOException; import java.util.concurrent.ExecutionException; import org.jclouds.http.HttpRequest; import org.jclouds.rest.internal.RestAnnotationProcessor; -import org.jclouds.trmk.enterprisecloud.features.BaseTerremarkEnterpriseCloudAsyncClientTest; +import org.jclouds.tmrk.enterprisecloud.features.BaseTerremarkEnterpriseCloudAsyncClientTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudErrorHandlerTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudErrorHandlerTest.java similarity index 92% rename from sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudErrorHandlerTest.java rename to sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudErrorHandlerTest.java index 21b7d7aad1..f4a82c6fa0 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudErrorHandlerTest.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudErrorHandlerTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud; +package org.jclouds.tmrk.enterprisecloud; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.reportMatcher; @@ -33,7 +33,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.io.Payloads; import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.ResourceNotFoundException; -import org.jclouds.trmk.enterprisecloud.handlers.TerremarkEnterpriseCloudErrorHandler; +import org.jclouds.tmrk.enterprisecloud.handlers.TerremarkEnterpriseCloudErrorHandler; import org.jclouds.util.Strings2; import org.testng.annotations.Test; @@ -48,13 +48,13 @@ public class TerremarkEnterpriseCloudErrorHandlerTest { @Test public void test401MakesAuthorizationException() { - assertCodeMakes("GET", URI.create("https://api.trmk-enterprisecloud.com/foo"), 401, "", "Unauthorized", + assertCodeMakes("GET", URI.create("https://api.tmrk-enterprisecloud.com/foo"), 401, "", "Unauthorized", AuthorizationException.class); } @Test public void test404MakesResourceNotFoundException() { - assertCodeMakes("GET", URI.create("https://api.trmk-enterprisecloud.com/foo"), 404, "", "Not Found", + assertCodeMakes("GET", URI.create("https://api.tmrk-enterprisecloud.com/foo"), 404, "", "Not Found", ResourceNotFoundException.class); } @@ -62,7 +62,7 @@ public class TerremarkEnterpriseCloudErrorHandlerTest { public void test409AlreadyExists4MakesIllegalStateExceptionException() { assertCodeMakes( "GET", - URI.create("https://api.trmk-enterprisecloud.com/foo"), + URI.create("https://api.tmrk-enterprisecloud.com/foo"), 409, "", "", diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudProviderTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudProviderTest.java similarity index 96% rename from sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudProviderTest.java rename to sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudProviderTest.java index cc8be97093..e79f09aa2a 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudProviderTest.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudProviderTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud; +package org.jclouds.tmrk.enterprisecloud; import org.jclouds.providers.BaseProviderMetadataTest; import org.jclouds.providers.ProviderMetadata; diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/BaseTerremarkEnterpriseCloudAsyncClientTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/BaseTerremarkEnterpriseCloudAsyncClientTest.java similarity index 87% rename from sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/BaseTerremarkEnterpriseCloudAsyncClientTest.java rename to sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/BaseTerremarkEnterpriseCloudAsyncClientTest.java index e9eab59db9..1a25ffb5e1 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/BaseTerremarkEnterpriseCloudAsyncClientTest.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/BaseTerremarkEnterpriseCloudAsyncClientTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.features; +package org.jclouds.tmrk.enterprisecloud.features; import static org.testng.Assert.assertEquals; @@ -27,8 +27,8 @@ import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextSpec; -import org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudAsyncClient; -import org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudClient; +import org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudAsyncClient; +import org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudClient; /** * @author Adrian Cole @@ -44,7 +44,7 @@ public abstract class BaseTerremarkEnterpriseCloudAsyncClientTest extends Res @Override public RestContextSpec createContextSpec() { Properties props = new Properties(); - return new RestContextFactory().createContextSpec("trmk-enterprisecloud", "apiKey", "secretKey", props); + return new RestContextFactory().createContextSpec("tmrk-enterprisecloud", "apiKey", "secretKey", props); } } diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/BaseTerremarkEnterpriseCloudClientLiveTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/BaseTerremarkEnterpriseCloudClientLiveTest.java similarity index 90% rename from sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/BaseTerremarkEnterpriseCloudClientLiveTest.java rename to sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/BaseTerremarkEnterpriseCloudClientLiveTest.java index 27bc89286e..44e4910668 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/BaseTerremarkEnterpriseCloudClientLiveTest.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/BaseTerremarkEnterpriseCloudClientLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.features; +package org.jclouds.tmrk.enterprisecloud.features; import java.util.Properties; @@ -25,8 +25,8 @@ import org.jclouds.logging.log4j.config.Log4JLoggingModule; import org.jclouds.rest.RestContext; import org.jclouds.rest.RestContextFactory; import org.jclouds.sshj.config.SshjSshClientModule; -import org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudAsyncClient; -import org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudClient; +import org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudAsyncClient; +import org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudClient; import org.testng.annotations.AfterGroups; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; @@ -46,7 +46,7 @@ public class BaseTerremarkEnterpriseCloudClientLiveTest extends BaseVersionedSer protected Module module; public BaseTerremarkEnterpriseCloudClientLiveTest() { - provider = "trmk-enterprisecloud"; + provider = "tmrk-enterprisecloud"; } @BeforeGroups(groups = { "live" }) diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/TaskAsyncClientTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/TaskAsyncClientTest.java similarity index 95% rename from sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/TaskAsyncClientTest.java rename to sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/TaskAsyncClientTest.java index d299c2010b..80aacd22b5 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/TaskAsyncClientTest.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/TaskAsyncClientTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.features; +package org.jclouds.tmrk.enterprisecloud.features; import com.google.inject.TypeLiteral; import org.jclouds.http.HttpRequest; @@ -44,7 +44,7 @@ public class TaskAsyncClientTest extends BaseTerremarkEnterpriseCloudAsyncClient assertRequestLineEquals(httpRequest, "GET https://services-beta.enterprisecloud.terremark.com/cloudapi/ecloud/tasks/environments/1 HTTP/1.1"); assertNonPayloadHeadersEqual(httpRequest, - "Accept: application/vnd.tmrk.cloud.task; type=collection\nx-trmk-version: 2011-07-01\n"); + "Accept: application/vnd.tmrk.cloud.task; type=collection\nx-tmrk-version: 2011-07-01\n"); assertPayloadEquals(httpRequest, null, null, false); assertResponseParserClassEquals(method, httpRequest, ParseXMLWithJAXB.class); @@ -59,7 +59,7 @@ public class TaskAsyncClientTest extends BaseTerremarkEnterpriseCloudAsyncClient HttpRequest httpRequest = processor.createRequest(method, URI.create("https://services-beta.enterprisecloud.terremark.com/cloudapi/ecloud/tasks/1")); assertRequestLineEquals(httpRequest, "GET https://services-beta.enterprisecloud.terremark.com/cloudapi/ecloud/tasks/1 HTTP/1.1"); - assertNonPayloadHeadersEqual(httpRequest, "Accept: application/vnd.tmrk.cloud.task\nx-trmk-version: 2011-07-01\n"); + assertNonPayloadHeadersEqual(httpRequest, "Accept: application/vnd.tmrk.cloud.task\nx-tmrk-version: 2011-07-01\n"); assertPayloadEquals(httpRequest, null, null, false); assertResponseParserClassEquals(method, httpRequest, ParseXMLWithJAXB.class); diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/TaskClientLiveTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/TaskClientLiveTest.java similarity index 92% rename from sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/TaskClientLiveTest.java rename to sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/TaskClientLiveTest.java index 6e6ebee08d..b3d92e7fba 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/TaskClientLiveTest.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/TaskClientLiveTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.features; +package org.jclouds.tmrk.enterprisecloud.features; -import org.jclouds.trmk.enterprisecloud.domain.Task; -import org.jclouds.trmk.enterprisecloud.domain.Tasks; +import org.jclouds.tmrk.enterprisecloud.domain.Task; +import org.jclouds.tmrk.enterprisecloud.domain.Tasks; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/VirtualMachineAsyncClientTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClientTest.java similarity index 95% rename from sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/VirtualMachineAsyncClientTest.java rename to sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClientTest.java index 5f41cf7b53..9fd2ca8be5 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/VirtualMachineAsyncClientTest.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClientTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.features; +package org.jclouds.tmrk.enterprisecloud.features; import com.google.inject.TypeLiteral; import org.jclouds.http.HttpRequest; @@ -41,7 +41,7 @@ public class VirtualMachineAsyncClientTest extends BaseTerremarkEnterpriseCloudA HttpRequest httpRequest = processor.createRequest(method, 1); assertRequestLineEquals(httpRequest, "GET https://services-beta.enterprisecloud.terremark.com/cloudapi/ecloud/virtualMachines/1 HTTP/1.1"); - assertNonPayloadHeadersEqual(httpRequest, "Accept: application/vnd.tmrk.cloud.virtualMachine\nx-trmk-version: 2011-07-01\n"); + assertNonPayloadHeadersEqual(httpRequest, "Accept: application/vnd.tmrk.cloud.virtualMachine\nx-tmrk-version: 2011-07-01\n"); assertPayloadEquals(httpRequest, null, null, false); assertResponseParserClassEquals(method, httpRequest, ParseXMLWithJAXB.class); diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/xml/TaskJAXBParsingTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/TaskJAXBParsingTest.java similarity index 95% rename from sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/xml/TaskJAXBParsingTest.java rename to sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/TaskJAXBParsingTest.java index 5ee0610af3..d01c88a3f5 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/xml/TaskJAXBParsingTest.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/TaskJAXBParsingTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.xml; +package org.jclouds.tmrk.enterprisecloud.xml; import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; @@ -34,10 +34,10 @@ import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.BaseRestClientTest; import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; -import org.jclouds.trmk.enterprisecloud.domain.NamedResource; -import org.jclouds.trmk.enterprisecloud.domain.Task; -import org.jclouds.trmk.enterprisecloud.domain.Tasks; -import org.jclouds.trmk.enterprisecloud.features.TaskAsyncClient; +import org.jclouds.tmrk.enterprisecloud.domain.NamedResource; +import org.jclouds.tmrk.enterprisecloud.domain.Task; +import org.jclouds.tmrk.enterprisecloud.domain.Tasks; +import org.jclouds.tmrk.enterprisecloud.features.TaskAsyncClient; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/xml/VirtualMachineJAXBParsingTest.java b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/VirtualMachineJAXBParsingTest.java similarity index 93% rename from sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/xml/VirtualMachineJAXBParsingTest.java rename to sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/VirtualMachineJAXBParsingTest.java index b0f6ea9fb6..8c698842d0 100644 --- a/sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/xml/VirtualMachineJAXBParsingTest.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/VirtualMachineJAXBParsingTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.trmk.enterprisecloud.xml; +package org.jclouds.tmrk.enterprisecloud.xml; import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; @@ -34,9 +34,9 @@ import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.BaseRestClientTest; import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; -import org.jclouds.trmk.enterprisecloud.domain.Layout; -import org.jclouds.trmk.enterprisecloud.domain.VirtualMachine; -import org.jclouds.trmk.enterprisecloud.features.VirtualMachineAsyncClient; +import org.jclouds.tmrk.enterprisecloud.domain.Layout; +import org.jclouds.tmrk.enterprisecloud.domain.VirtualMachine; +import org.jclouds.tmrk.enterprisecloud.features.VirtualMachineAsyncClient; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -112,7 +112,7 @@ public class VirtualMachineJAXBParsingTest extends BaseRestClientTest { private void assertLayout(Layout layout) { assertNotNull(layout); - assertEquals("test row",layout.getRow().getName()); + assertEquals("test row", layout.getRow().getName()); assertEquals("test group",layout.getGroup().getName()); } } diff --git a/sandbox-providers/tmrk-enterprisecloud/src/test/resources/eCloudAPI-2011-07-01.xsd b/sandbox-providers/tmrk-enterprisecloud/src/test/resources/eCloudAPI-2011-07-01.xsd new file mode 100644 index 0000000000..597bd7ea46 --- /dev/null +++ b/sandbox-providers/tmrk-enterprisecloud/src/test/resources/eCloudAPI-2011-07-01.xsd @@ -0,0 +1,3187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/resources/log4j.xml b/sandbox-providers/tmrk-enterprisecloud/src/test/resources/log4j.xml similarity index 100% rename from sandbox-providers/trmk-enterprisecloud/src/test/resources/log4j.xml rename to sandbox-providers/tmrk-enterprisecloud/src/test/resources/log4j.xml diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/resources/task.xml b/sandbox-providers/tmrk-enterprisecloud/src/test/resources/task.xml similarity index 100% rename from sandbox-providers/trmk-enterprisecloud/src/test/resources/task.xml rename to sandbox-providers/tmrk-enterprisecloud/src/test/resources/task.xml diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/resources/tasks.xml b/sandbox-providers/tmrk-enterprisecloud/src/test/resources/tasks.xml similarity index 100% rename from sandbox-providers/trmk-enterprisecloud/src/test/resources/tasks.xml rename to sandbox-providers/tmrk-enterprisecloud/src/test/resources/tasks.xml diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/resources/virtualMachine.xml b/sandbox-providers/tmrk-enterprisecloud/src/test/resources/virtualMachine.xml similarity index 100% rename from sandbox-providers/trmk-enterprisecloud/src/test/resources/virtualMachine.xml rename to sandbox-providers/tmrk-enterprisecloud/src/test/resources/virtualMachine.xml diff --git a/sandbox-providers/trmk-enterprisecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/sandbox-providers/trmk-enterprisecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 73821bd35a..0000000000 --- a/sandbox-providers/trmk-enterprisecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudProviderMetadata \ No newline at end of file diff --git a/sandbox-providers/trmk-enterprisecloud/src/test/resources/schema.xsd b/sandbox-providers/trmk-enterprisecloud/src/test/resources/schema.xsd deleted file mode 100644 index f0a7b64dc4..0000000000 --- a/sandbox-providers/trmk-enterprisecloud/src/test/resources/schema.xsd +++ /dev/null @@ -1,4198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 925 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 926 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 927 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 928 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 929 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 Version 2011-07-01 - terremark.com Page | 930 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 931 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 932 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 933 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 934 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 935 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 936 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 937 - - - - - - - - - - - - - - - - - - - - - name="MultifactorSummary" nillable="true" - name="SupportAccess" nillable="true" type="SupportAccess"/> - - name="PasswordComplexityRules" nillable="true" - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 938 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 939 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 940 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - name="Default" nillable="true" type="xs:boolean"/> name="FingerPrint" - nillable="true" type="xs:string"/> name="PrivateKey" nillable="true" - type="xs:string"/> - Version 2011-07-01 Page | 941 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 942 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 943 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 944 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 945 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - name="LastName" nillable="true" type="xs:string"/> - name="Status" type="UserStatus"/> name="LastLogin" - nillable="true" type="xs:dateTime"/> - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 Version 2011-07-01 - terremark.com Page | 946 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 947 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 948 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne - Blvd. Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 949 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - name="Status" type="CatalogEntryStatus"/> name="Alerts" - nillable="true" type="CatalogAlerts"/> name="Files" nillable="true" - type="CatalogItemFiles"/> name="Configuration" nillable="true" - type="Reference"/> - nillable="true" type="CatalogEntry"/> - Version 2011-07-01 Page | 950 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 951 - - - - - - - - - - - - - - - - - - - - - - - - - - - name="ProcessorCount" type="xs:int"/> name="Memory" nillable="true" - type="ResourceCapacity"/> name="OperatingSystem" nillable="true" - type="xs:string"/> name="Disks" nillable="true" type="Disks"/> - name="NetworkAdapters" type="xs:int"/> name="NetworkMappings" - nillable="true" - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 952 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 953 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 954 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 955 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 956 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 957 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 958 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 959 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 terremark.com - name="Classification" nillable="true" type="xs:string"/> - name="Model" nillable="true" type="xs:string"/> - Version 2011-07-01 Page | 960 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 961 - - - - - - - name="SerialNumber" nillable="true" type="xs:string"/> - name="LightsOutIp" nillable="true" type="xs:string"/> - name="OperatingSystem" nillable="true" type="xs:string"/> - name="AssignedIpAddresses" nillable="true" - name="LicensedSoftware" nillable="true" - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 962 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 Version 2011-07-01 - terremark.com Page | 963 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 964 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - name="AssignedIpAddresses" nillable="true" name="DetectedIpAddresses" - nillable="true" type="DeviceIps"/> - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 965 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 Version 2011-07-01 - terremark.com Page | 966 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 967 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne - Blvd. Ste 2900 Miami, FL 33131 Version 2011-07-01 terremark.com - Page | 968 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 969 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 970 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 Version 2011-07-01 - terremark.com Page | 971 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - name="Description" nillable="true" type="xs:string"/> - name="ComputeMatrix" nillable="true" type="ComputeMatrix"/> - name="Processor" nillable="true" type="ConfigurationOptionRange"/> - name="Memory" nillable="true" type="ResourceCapacityRange"/> - name="Storage" nillable="true" type="TemplateStorage"/> - name="NetworkAdapters" type="xs:int"/> - name="Customization" nillable="true" type="CustomizationOption"/> - name="LicensedSoftware" nillable="true" - Version 2011-07-01 Page | 972 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 Version 2011-07-01 - terremark.com Page | 973 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 974 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 975 - - - - - - - - - - - name="Networks" nillable="true" type="NetworkReferences"/> - name="PhysicalDevices" nillable="true" - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 976 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 977 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 Version 2011-07-01 - terremark.com Page | 978 - - - - - - - - - - - - - - - - - - - - - name="IpAddress" nillable="true" type="IpAddressReference"/> - name="Protocol" type="ProtocolType"/> name="Port" - type="xs:unsignedInt"/> - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 979 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - name="Permission" type="AclPermissionType"/> name="AclType" - type="AclType"/> name="PortType" type="AclPortType"/> name="Protocol" - type="ProtocolType"/> name="Source" nillable="true" - type="FirewallAclEndpoint"/> name="Destination" nillable="true" - type="FirewallAclEndpoint"/> name="PortRange" nillable="true" - type="PortRange"/> - Version 2011-07-01 Page | 980 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 981 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 982 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 983 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 984 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne - Blvd. Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 985 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 986 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 987 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 988 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 989 - - - - - - - - - - - - - - - - name="Enabled" type="xs:boolean"/> name="Description" - nillable="true" type="xs:string"/> - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 990 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 Version 2011-07-01 - terremark.com Page | 991 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 992 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 993 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 994 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 995 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 996 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 Version 2011-07-01 - terremark.com Page | 997 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 998 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 Version 2011-07-01 - terremark.com Page | 999 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne - Blvd. Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 1000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne - Blvd. Ste 2900 Miami, FL 33131 Version 2011-07-01 terremark.com - Page | 1001 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 1002 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 1003 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 Version 2011-07-01 terremark.com Page | 1004 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 1005 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 1006 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - name="VirtualMachines" nillable="true" type="VirtualMachines"/> - name="Purchased" nillable="true" type="ComputePoolCapacity"/> - name="CpuBurst" nillable="true" type="ResourceBurst"/> - name="MemoryBurst" nillable="true" type="ResourceBurst"/> - Version 2011-07-01 Page | 1007 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 1008 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South - Biscayne Blvd. Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 1009 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. Ste - 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 1010 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Terremark Worldwide, Inc. One Biscayne Tower, 2 South Biscayne Blvd. - Ste 2900 Miami, FL 33131 terremark.com - Version 2011-07-01 Page | 1011 - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file