Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154 from jsonking/master 

Fixed schema, fixed api version header and renamed project to tmrk from trmk
This commit is contained in:
Adrian Cole 2011-11-15 04:24:41 -08:00
parent 6b834c9d44 b86598cf49
commit 9455d146a5
44 changed files with 3300 additions and 4310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/resources/rest.properties
View File

@ -50,8 +50,8 @@ trmk-vcloudexpress.propertiesbuilder=org.jclouds.trmk.vcloudexpress.TerremarkVCl
trmk-ecloud.contextbuilder=org.jclouds.trmk.ecloud.TerremarkECloudContextBuilder trmk-ecloud.contextbuilder=org.jclouds.trmk.ecloud.TerremarkECloudContextBuilder
trmk-ecloud.propertiesbuilder=org.jclouds.trmk.ecloud.TerremarkECloudPropertiesBuilder trmk-ecloud.propertiesbuilder=org.jclouds.trmk.ecloud.TerremarkECloudPropertiesBuilder
trmk-enterprisecloud.contextbuilder=org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudContextBuilder tmrk-enterprisecloud.contextbuilder=org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudContextBuilder
trmk-enterprisecloud.propertiesbuilder=org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudPropertiesBuilder tmrk-enterprisecloud.propertiesbuilder=org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudPropertiesBuilder
chef.contextbuilder=org.jclouds.chef.ChefContextBuilder chef.contextbuilder=org.jclouds.chef.ChefContextBuilder
chef.propertiesbuilder=org.jclouds.chef.ChefPropertiesBuilder chef.propertiesbuilder=org.jclouds.chef.ChefPropertiesBuilder

34
sandbox-providers/trmk-enterprisecloud/pom.xml → sandbox-providers/tmrk-enterprisecloud/pom.xml
View File

@ -28,7 +28,7 @@
<relativePath>../../project/pom.xml</relativePath> <relativePath>../../project/pom.xml</relativePath>
</parent> </parent>
<groupId>org.jclouds.provider</groupId> <groupId>org.jclouds.provider</groupId>
<artifactId>trmk-enterprisecloud</artifactId> <artifactId>tmrk-enterprisecloud</artifactId>
<name>jclouds Terremark Enterprise Cloud core</name> <name>jclouds Terremark Enterprise Cloud core</name>
<description>jclouds components to access Terremark Enterprise Cloud</description> <description>jclouds components to access Terremark Enterprise Cloud</description>
<packaging>bundle</packaging> <packaging>bundle</packaging>
@ -48,11 +48,11 @@
</repositories> </repositories>
<properties> <properties>
<test.trmk-enterprisecloud.endpoint>https://services-beta.enterprisecloud.terremark.com/cloudapi/ecloud</test.trmk-enterprisecloud.endpoint> <test.tmrk-enterprisecloud.endpoint>https://services-beta.enterprisecloud.terremark.com/cloudapi/ecloud</test.tmrk-enterprisecloud.endpoint>
<test.trmk-enterprisecloud.apiversion>2011-07-01</test.trmk-enterprisecloud.apiversion> <test.tmrk-enterprisecloud.apiversion>2011-07-01</test.tmrk-enterprisecloud.apiversion>
<test.trmk-enterprisecloud.identity>FIXME</test.trmk-enterprisecloud.identity> <test.tmrk-enterprisecloud.identity>FIXME</test.tmrk-enterprisecloud.identity>
<test.trmk-enterprisecloud.credential>FIXME</test.trmk-enterprisecloud.credential> <test.tmrk-enterprisecloud.credential>FIXME</test.tmrk-enterprisecloud.credential>
<test.trmk-enterprisecloud.image-id></test.trmk-enterprisecloud.image-id> <test.tmrk-enterprisecloud.image-id></test.tmrk-enterprisecloud.image-id>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
@ -105,24 +105,24 @@
<configuration> <configuration>
<systemProperties> <systemProperties>
<property> <property>
<name>test.trmk-enterprisecloud.endpoint</name> <name>test.tmrk-enterprisecloud.endpoint</name>
<value>${test.trmk-enterprisecloud.endpoint}</value> <value>${test.tmrk-enterprisecloud.endpoint}</value>
</property> </property>
<property> <property>
<name>test.trmk-enterprisecloud.apiversion</name> <name>test.tmrk-enterprisecloud.apiversion</name>
<value>${test.trmk-enterprisecloud.apiversion}</value> <value>${test.tmrk-enterprisecloud.apiversion}</value>
</property> </property>
<property> <property>
<name>test.trmk-enterprisecloud.identity</name> <name>test.tmrk-enterprisecloud.identity</name>
<value>${test.trmk-enterprisecloud.identity}</value> <value>${test.tmrk-enterprisecloud.identity}</value>
</property> </property>
<property> <property>
<name>test.trmk-enterprisecloud.credential</name> <name>test.tmrk-enterprisecloud.credential</name>
<value>${test.trmk-enterprisecloud.credential}</value> <value>${test.tmrk-enterprisecloud.credential}</value>
</property> </property>
<property> <property>
<name>test.trmk-enterprisecloud.image-id</name> <name>test.tmrk-enterprisecloud.image-id</name>
<value>${test.trmk-enterprisecloud.image-id}</value> <value>${test.tmrk-enterprisecloud.image-id}</value>
</property> </property>
</systemProperties> </systemProperties>
</configuration> </configuration>
@ -142,7 +142,7 @@
<configuration> <configuration>
<instructions> <instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.jclouds.trmk.enterprisecloud.*;version="${project.version}"</Export-Package> <Export-Package>org.jclouds.tmrk.enterprisecloud.*;version="${project.version}"</Export-Package>
<Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package> <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>

4
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudAsyncClient.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudAsyncClient.java
View File

@ -16,10 +16,10 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud; package org.jclouds.tmrk.enterprisecloud;
import org.jclouds.rest.annotations.Delegate; 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. * Provides asynchronous access to TerremarkEnterpriseCloud via their REST API.

4
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudClient.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudClient.java
View File

@ -16,13 +16,13 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud; package org.jclouds.tmrk.enterprisecloud;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout; import org.jclouds.concurrent.Timeout;
import org.jclouds.rest.annotations.Delegate; 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. * Provides synchronous access to TerremarkEnterpriseCloud.

4
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudContextBuilder.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudContextBuilder.java
View File

@ -16,13 +16,13 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud; package org.jclouds.tmrk.enterprisecloud;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
import org.jclouds.rest.RestContextBuilder; import org.jclouds.rest.RestContextBuilder;
import org.jclouds.trmk.enterprisecloud.config.TerremarkEnterpriseCloudRestClientModule; import org.jclouds.tmrk.enterprisecloud.config.TerremarkEnterpriseCloudRestClientModule;
import com.google.inject.Module; import com.google.inject.Module;

2
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudPropertiesBuilder.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudPropertiesBuilder.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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_API_VERSION;
import static org.jclouds.Constants.PROPERTY_ENDPOINT; import static org.jclouds.Constants.PROPERTY_ENDPOINT;

6
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudProviderMetadata.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudProviderMetadata.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud; package org.jclouds.tmrk.enterprisecloud;
import java.net.URI; import java.net.URI;
import java.util.Set; import java.util.Set;
@ -39,7 +39,7 @@ public class TerremarkEnterpriseCloudProviderMetadata extends BaseProviderMetada
*/ */
@Override @Override
public String getId() { public String getId() {
return "trmk-enterprisecloud"; return "tmrk-enterprisecloud";
} }
/** /**
@ -103,7 +103,7 @@ public class TerremarkEnterpriseCloudProviderMetadata extends BaseProviderMetada
*/ */
@Override @Override
public Set<String> getLinkedServices() { public Set<String> getLinkedServices() {
return ImmutableSet.of("trmk-enterprisecloud", "trmk-ecloud", "trmk-vcloudexpress"); return ImmutableSet.of("tmrk-enterprisecloud", "tmrk-ecloud", "tmrk-vcloudexpress");
} }
/** /**

12
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/config/TerremarkEnterpriseCloudRestClientModule.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/config/TerremarkEnterpriseCloudRestClientModule.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.config; package org.jclouds.tmrk.enterprisecloud.config;
import java.util.Map; import java.util.Map;
@ -29,11 +29,11 @@ import org.jclouds.http.annotation.ServerError;
import org.jclouds.http.handlers.BackoffLimitedRetryHandler; import org.jclouds.http.handlers.BackoffLimitedRetryHandler;
import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.ConfiguresRestClient;
import org.jclouds.rest.config.RestClientModule; import org.jclouds.rest.config.RestClientModule;
import org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudAsyncClient; import org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudAsyncClient;
import org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudClient; import org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudClient;
import org.jclouds.trmk.enterprisecloud.features.TaskAsyncClient; import org.jclouds.tmrk.enterprisecloud.features.TaskAsyncClient;
import org.jclouds.trmk.enterprisecloud.features.TaskClient; import org.jclouds.tmrk.enterprisecloud.features.TaskClient;
import org.jclouds.trmk.enterprisecloud.handlers.TerremarkEnterpriseCloudErrorHandler; import org.jclouds.tmrk.enterprisecloud.handlers.TerremarkEnterpriseCloudErrorHandler;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;

6
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Action.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Action.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.LOWER_CAMEL;
import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE; import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
@ -26,8 +26,8 @@ import java.net.URI;
import java.util.Map; import java.util.Map;
import org.jclouds.javax.annotation.Nullable; import org.jclouds.javax.annotation.Nullable;
import org.jclouds.trmk.enterprisecloud.domain.internal.BaseNamedResource; import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseNamedResource;
import org.jclouds.trmk.enterprisecloud.domain.internal.BaseResource; import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseResource;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnum;

2
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Actions.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Actions.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.domain; package org.jclouds.tmrk.enterprisecloud.domain;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;

6
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Group.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Group.java
View File

@ -16,9 +16,9 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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; import javax.xml.bind.annotation.XmlRootElement;
@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement;
* @author Jason King * @author Jason King
*/ */
@XmlRootElement(name = "Group") @XmlRootElement(name = "Group")
public class Group extends BaseNamedResource<Group>{ public class Group extends BaseNamedResource<Group> {
public Group() { public Group() {
//For JAXB //For JAXB

2
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Layout.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Layout.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;

6
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Link.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Link.java
View File

@ -16,15 +16,15 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.domain; package org.jclouds.tmrk.enterprisecloud.domain;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI; import java.net.URI;
import java.util.Map; import java.util.Map;
import org.jclouds.trmk.enterprisecloud.domain.internal.BaseNamedResource; import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseNamedResource;
import org.jclouds.trmk.enterprisecloud.domain.internal.BaseResource; import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseResource;
import javax.xml.bind.annotation.*; import javax.xml.bind.annotation.*;

2
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Links.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Links.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.domain; package org.jclouds.tmrk.enterprisecloud.domain;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;

6
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/NamedResource.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/NamedResource.java
View File

@ -16,13 +16,13 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.domain; package org.jclouds.tmrk.enterprisecloud.domain;
import java.net.URI; import java.net.URI;
import java.util.Map; import java.util.Map;
import org.jclouds.trmk.enterprisecloud.domain.internal.BaseNamedResource; import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseNamedResource;
import org.jclouds.trmk.enterprisecloud.domain.internal.BaseResource; import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseResource;
/** /**
* *

6
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Row.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Row.java
View File

@ -16,9 +16,9 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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; import javax.xml.bind.annotation.XmlRootElement;
@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement;
* @author Jason King * @author Jason King
*/ */
@XmlRootElement(name = "Row") @XmlRootElement(name = "Row")
public class Row extends BaseNamedResource<Row>{ public class Row extends BaseNamedResource<Row> {
public Row() { public Row() {
//For JAXB //For JAXB
} }

4
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Task.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Task.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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_CAMEL;
import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE; import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
@ -27,7 +27,7 @@ import java.util.Date;
import java.util.Map; import java.util.Map;
import org.jclouds.javax.annotation.Nullable; 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.XmlElement;
import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnum;

2
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/Tasks.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Tasks.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.domain; package org.jclouds.tmrk.enterprisecloud.domain;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;

6
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/VirtualMachine.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/VirtualMachine.java
View File

@ -16,10 +16,10 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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 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.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;

2
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/internal/BaseNamedResource.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/internal/BaseNamedResource.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.domain.internal; package org.jclouds.tmrk.enterprisecloud.domain.internal;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;

2
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/domain/internal/BaseResource.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/internal/BaseResource.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.domain.internal; package org.jclouds.tmrk.enterprisecloud.domain.internal;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;

9
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/TaskAsyncClient.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/TaskAsyncClient.java
View File

@ -16,15 +16,15 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.features; package org.jclouds.tmrk.enterprisecloud.features;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.http.filters.BasicAuthentication;
import org.jclouds.rest.annotations.*; import org.jclouds.rest.annotations.*;
import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
import org.jclouds.trmk.enterprisecloud.domain.Task; import org.jclouds.tmrk.enterprisecloud.domain.Task;
import org.jclouds.trmk.enterprisecloud.domain.Tasks; import org.jclouds.tmrk.enterprisecloud.domain.Tasks;
import javax.ws.rs.Consumes; import javax.ws.rs.Consumes;
import javax.ws.rs.GET; import javax.ws.rs.GET;
@ -43,7 +43,8 @@ import java.net.URI;
* @author Adrian Cole * @author Adrian Cole
*/ */
@RequestFilters(BasicAuthentication.class) @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 { public interface TaskAsyncClient {
/** /**

6
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/TaskClient.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/TaskClient.java
View File

@ -16,11 +16,11 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.features; package org.jclouds.tmrk.enterprisecloud.features;
import org.jclouds.concurrent.Timeout; import org.jclouds.concurrent.Timeout;
import org.jclouds.trmk.enterprisecloud.domain.Task; import org.jclouds.tmrk.enterprisecloud.domain.Task;
import org.jclouds.trmk.enterprisecloud.domain.Tasks; import org.jclouds.tmrk.enterprisecloud.domain.Tasks;
import java.net.URI; import java.net.URI;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

10
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/VirtualMachineAsyncClient.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClient.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.features; package org.jclouds.tmrk.enterprisecloud.features;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import org.jclouds.http.filters.BasicAuthentication; 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.JAXBResponseParser;
import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.RequestFilters;
import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; 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.Consumes;
import javax.ws.rs.GET; import javax.ws.rs.GET;
@ -36,18 +36,18 @@ import javax.ws.rs.PathParam;
* Provides asynchronous access to VirtualMachine via their REST API. * Provides asynchronous access to VirtualMachine via their REST API.
* <p/> * <p/>
* *
* @see org.jclouds.trmk.enterprisecloud.features.TaskClient * @see TaskClient
* @see <a href= * @see <a href=
* "http://support.theenterprisecloud.com/kb/default.asp?id=984&Lang=1&SID=" * "http://support.theenterprisecloud.com/kb/default.asp?id=984&Lang=1&SID="
* /> * />
* @author Adrian Cole * @author Adrian Cole
*/ */
@RequestFilters(BasicAuthentication.class) @RequestFilters(BasicAuthentication.class)
@Headers(keys = "x-trmk-version", values = "{jclouds.api-version}") @Headers(keys = "x-tmrk-version", values = "{jclouds.api-version}")
public interface VirtualMachineAsyncClient { public interface VirtualMachineAsyncClient {
/** /**
* @see org.jclouds.trmk.enterprisecloud.features.VirtualMachineClient#getVirtualMachine * @see VirtualMachineClient#getVirtualMachine
*/ */
@GET @GET
@Path("/virtualMachines/{id}") @Path("/virtualMachines/{id}")

6
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/features/VirtualMachineClient.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineClient.java
View File

@ -16,10 +16,10 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.features; package org.jclouds.tmrk.enterprisecloud.features;
import org.jclouds.concurrent.Timeout; import org.jclouds.concurrent.Timeout;
import org.jclouds.trmk.enterprisecloud.domain.VirtualMachine; import org.jclouds.tmrk.enterprisecloud.domain.VirtualMachine;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
* Provides synchronous access to VirtualMachine. * Provides synchronous access to VirtualMachine.
* <p/> * <p/>
* *
* @see org.jclouds.trmk.enterprisecloud.features.VirtualMachineAsyncClient * @see VirtualMachineAsyncClient
* @see <a href= * @see <a href=
* "http://support.theenterprisecloud.com/kb/default.asp?id=984&Lang=1&SID=" * "http://support.theenterprisecloud.com/kb/default.asp?id=984&Lang=1&SID="
* /> * />

2
sandbox-providers/trmk-enterprisecloud/src/main/java/org/jclouds/trmk/enterprisecloud/handlers/TerremarkEnterpriseCloudErrorHandler.java → sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/handlers/TerremarkEnterpriseCloudErrorHandler.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.handlers; package org.jclouds.tmrk.enterprisecloud.handlers;
import java.io.IOException; import java.io.IOException;

1
sandbox-providers/tmrk-enterprisecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata Normal file
View File

@ -0,0 +1 @@
org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudProviderMetadata

4
sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudAsyncClientTest.java → sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudAsyncClientTest.java
View File

@ -16,14 +16,14 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud; package org.jclouds.tmrk.enterprisecloud;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
import org.jclouds.rest.internal.RestAnnotationProcessor; 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.BeforeClass;
import org.testng.annotations.Test; import org.testng.annotations.Test;

10
sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudErrorHandlerTest.java → sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudErrorHandlerTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud; package org.jclouds.tmrk.enterprisecloud;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.reportMatcher; import static org.easymock.EasyMock.reportMatcher;
@ -33,7 +33,7 @@ import org.jclouds.http.HttpResponse;
import org.jclouds.io.Payloads; import org.jclouds.io.Payloads;
import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.ResourceNotFoundException; 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.jclouds.util.Strings2;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -48,13 +48,13 @@ public class TerremarkEnterpriseCloudErrorHandlerTest {
@Test @Test
public void test401MakesAuthorizationException() { 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); AuthorizationException.class);
} }
@Test @Test
public void test404MakesResourceNotFoundException() { 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); ResourceNotFoundException.class);
} }
@ -62,7 +62,7 @@ public class TerremarkEnterpriseCloudErrorHandlerTest {
public void test409AlreadyExists4MakesIllegalStateExceptionException() { public void test409AlreadyExists4MakesIllegalStateExceptionException() {
assertCodeMakes( assertCodeMakes(
"GET", "GET",
URI.create("https://api.trmk-enterprisecloud.com/foo"), URI.create("https://api.tmrk-enterprisecloud.com/foo"),
409, 409,
"", "",
"<Error message=\"Catalog item with that name already exists.\" majorErrorCode=\"409\" minorErrorCode=\"CatalogItemAlreadyExists\"/>", "<Error message=\"Catalog item with that name already exists.\" majorErrorCode=\"409\" minorErrorCode=\"CatalogItemAlreadyExists\"/>",

2
sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/TerremarkEnterpriseCloudProviderTest.java → sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/TerremarkEnterpriseCloudProviderTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud; package org.jclouds.tmrk.enterprisecloud;
import org.jclouds.providers.BaseProviderMetadataTest; import org.jclouds.providers.BaseProviderMetadataTest;
import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.ProviderMetadata;

8
sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/BaseTerremarkEnterpriseCloudAsyncClientTest.java → sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/BaseTerremarkEnterpriseCloudAsyncClientTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.features; package org.jclouds.tmrk.enterprisecloud.features;
import static org.testng.Assert.assertEquals; 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.RestClientTest;
import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextFactory;
import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.RestContextSpec;
import org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudAsyncClient; import org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudAsyncClient;
import org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudClient; import org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudClient;
/** /**
* @author Adrian Cole * @author Adrian Cole
@ -44,7 +44,7 @@ public abstract class BaseTerremarkEnterpriseCloudAsyncClientTest<T> extends Res
@Override @Override
public RestContextSpec<TerremarkEnterpriseCloudClient, TerremarkEnterpriseCloudAsyncClient> createContextSpec() { public RestContextSpec<TerremarkEnterpriseCloudClient, TerremarkEnterpriseCloudAsyncClient> createContextSpec() {
Properties props = new Properties(); Properties props = new Properties();
return new RestContextFactory().createContextSpec("trmk-enterprisecloud", "apiKey", "secretKey", props); return new RestContextFactory().createContextSpec("tmrk-enterprisecloud", "apiKey", "secretKey", props);
} }
} }

8
sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/BaseTerremarkEnterpriseCloudClientLiveTest.java → sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/BaseTerremarkEnterpriseCloudClientLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.features; package org.jclouds.tmrk.enterprisecloud.features;
import java.util.Properties; import java.util.Properties;
@ -25,8 +25,8 @@ import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import org.jclouds.rest.RestContext; import org.jclouds.rest.RestContext;
import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextFactory;
import org.jclouds.sshj.config.SshjSshClientModule; import org.jclouds.sshj.config.SshjSshClientModule;
import org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudAsyncClient; import org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudAsyncClient;
import org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudClient; import org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudClient;
import org.testng.annotations.AfterGroups; import org.testng.annotations.AfterGroups;
import org.testng.annotations.BeforeGroups; import org.testng.annotations.BeforeGroups;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -46,7 +46,7 @@ public class BaseTerremarkEnterpriseCloudClientLiveTest extends BaseVersionedSer
protected Module module; protected Module module;
public BaseTerremarkEnterpriseCloudClientLiveTest() { public BaseTerremarkEnterpriseCloudClientLiveTest() {
provider = "trmk-enterprisecloud"; provider = "tmrk-enterprisecloud";
} }
@BeforeGroups(groups = { "live" }) @BeforeGroups(groups = { "live" })

6
sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/TaskAsyncClientTest.java → sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/TaskAsyncClientTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.features; package org.jclouds.tmrk.enterprisecloud.features;
import com.google.inject.TypeLiteral; import com.google.inject.TypeLiteral;
import org.jclouds.http.HttpRequest; 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"); assertRequestLineEquals(httpRequest, "GET https://services-beta.enterprisecloud.terremark.com/cloudapi/ecloud/tasks/environments/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, 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); assertPayloadEquals(httpRequest, null, null, false);
assertResponseParserClassEquals(method, httpRequest, ParseXMLWithJAXB.class); 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")); 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"); 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); assertPayloadEquals(httpRequest, null, null, false);
assertResponseParserClassEquals(method, httpRequest, ParseXMLWithJAXB.class); assertResponseParserClassEquals(method, httpRequest, ParseXMLWithJAXB.class);

6
sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/TaskClientLiveTest.java → sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/TaskClientLiveTest.java
View File

@ -16,10 +16,10 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.tmrk.enterprisecloud.domain.Task;
import org.jclouds.trmk.enterprisecloud.domain.Tasks; import org.jclouds.tmrk.enterprisecloud.domain.Tasks;
import org.testng.annotations.BeforeGroups; import org.testng.annotations.BeforeGroups;
import org.testng.annotations.Test; import org.testng.annotations.Test;

4
sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/features/VirtualMachineAsyncClientTest.java → sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/features/VirtualMachineAsyncClientTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.trmk.enterprisecloud.features; package org.jclouds.tmrk.enterprisecloud.features;
import com.google.inject.TypeLiteral; import com.google.inject.TypeLiteral;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
@ -41,7 +41,7 @@ public class VirtualMachineAsyncClientTest extends BaseTerremarkEnterpriseCloudA
HttpRequest httpRequest = processor.createRequest(method, 1); HttpRequest httpRequest = processor.createRequest(method, 1);
assertRequestLineEquals(httpRequest, "GET https://services-beta.enterprisecloud.terremark.com/cloudapi/ecloud/virtualMachines/1 HTTP/1.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); assertPayloadEquals(httpRequest, null, null, false);
assertResponseParserClassEquals(method, httpRequest, ParseXMLWithJAXB.class); assertResponseParserClassEquals(method, httpRequest, ParseXMLWithJAXB.class);

10
sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/xml/TaskJAXBParsingTest.java → sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/TaskJAXBParsingTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.base.Function;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
@ -34,10 +34,10 @@ import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.BaseRestClientTest; import org.jclouds.rest.BaseRestClientTest;
import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.RestContextSpec;
import org.jclouds.rest.internal.RestAnnotationProcessor; import org.jclouds.rest.internal.RestAnnotationProcessor;
import org.jclouds.trmk.enterprisecloud.domain.NamedResource; import org.jclouds.tmrk.enterprisecloud.domain.NamedResource;
import org.jclouds.trmk.enterprisecloud.domain.Task; import org.jclouds.tmrk.enterprisecloud.domain.Task;
import org.jclouds.trmk.enterprisecloud.domain.Tasks; import org.jclouds.tmrk.enterprisecloud.domain.Tasks;
import org.jclouds.trmk.enterprisecloud.features.TaskAsyncClient; import org.jclouds.tmrk.enterprisecloud.features.TaskAsyncClient;
import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;

10
sandbox-providers/trmk-enterprisecloud/src/test/java/org/jclouds/trmk/enterprisecloud/xml/VirtualMachineJAXBParsingTest.java → sandbox-providers/tmrk-enterprisecloud/src/test/java/org/jclouds/tmrk/enterprisecloud/xml/VirtualMachineJAXBParsingTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.base.Function;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
@ -34,9 +34,9 @@ import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.BaseRestClientTest; import org.jclouds.rest.BaseRestClientTest;
import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.RestContextSpec;
import org.jclouds.rest.internal.RestAnnotationProcessor; import org.jclouds.rest.internal.RestAnnotationProcessor;
import org.jclouds.trmk.enterprisecloud.domain.Layout; import org.jclouds.tmrk.enterprisecloud.domain.Layout;
import org.jclouds.trmk.enterprisecloud.domain.VirtualMachine; import org.jclouds.tmrk.enterprisecloud.domain.VirtualMachine;
import org.jclouds.trmk.enterprisecloud.features.VirtualMachineAsyncClient; import org.jclouds.tmrk.enterprisecloud.features.VirtualMachineAsyncClient;
import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -112,7 +112,7 @@ public class VirtualMachineJAXBParsingTest extends BaseRestClientTest {
private void assertLayout(Layout layout) { private void assertLayout(Layout layout) {
assertNotNull(layout); assertNotNull(layout);
assertEquals("test row",layout.getRow().getName()); assertEquals("test row", layout.getRow().getName());
assertEquals("test group",layout.getGroup().getName()); assertEquals("test group",layout.getGroup().getName());
} }
} }

3187
sandbox-providers/tmrk-enterprisecloud/src/test/resources/eCloudAPI-2011-07-01.xsd Normal file
View File

File diff suppressed because it is too large Load Diff

0
sandbox-providers/trmk-enterprisecloud/src/test/resources/log4j.xml → sandbox-providers/tmrk-enterprisecloud/src/test/resources/log4j.xml
View File

0
sandbox-providers/trmk-enterprisecloud/src/test/resources/task.xml → sandbox-providers/tmrk-enterprisecloud/src/test/resources/task.xml
View File

0
sandbox-providers/trmk-enterprisecloud/src/test/resources/tasks.xml → sandbox-providers/tmrk-enterprisecloud/src/test/resources/tasks.xml
View File

0
sandbox-providers/trmk-enterprisecloud/src/test/resources/virtualMachine.xml → sandbox-providers/tmrk-enterprisecloud/src/test/resources/virtualMachine.xml
View File

1
sandbox-providers/trmk-enterprisecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
View File

@ -1 +0,0 @@
org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudProviderMetadata

4198
sandbox-providers/trmk-enterprisecloud/src/test/resources/schema.xsd
View File

File diff suppressed because it is too large Load Diff