mirror of https://github.com/apache/jclouds.git
Issue 695: Renamed trmk to tmrk
This commit is contained in:
parent
1c9bde8015
commit
12cb9e98f2
|
@ -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
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<relativePath>../../project/pom.xml</relativePath>
|
||||
</parent>
|
||||
<groupId>org.jclouds.provider</groupId>
|
||||
<artifactId>trmk-enterprisecloud</artifactId>
|
||||
<artifactId>tmrk-enterprisecloud</artifactId>
|
||||
<name>jclouds Terremark Enterprise Cloud core</name>
|
||||
<description>jclouds components to access Terremark Enterprise Cloud</description>
|
||||
<packaging>bundle</packaging>
|
||||
|
@ -48,11 +48,11 @@
|
|||
</repositories>
|
||||
|
||||
<properties>
|
||||
<test.trmk-enterprisecloud.endpoint>https://services-beta.enterprisecloud.terremark.com/cloudapi/ecloud</test.trmk-enterprisecloud.endpoint>
|
||||
<test.trmk-enterprisecloud.apiversion>2011-07-01</test.trmk-enterprisecloud.apiversion>
|
||||
<test.trmk-enterprisecloud.identity>FIXME</test.trmk-enterprisecloud.identity>
|
||||
<test.trmk-enterprisecloud.credential>FIXME</test.trmk-enterprisecloud.credential>
|
||||
<test.trmk-enterprisecloud.image-id></test.trmk-enterprisecloud.image-id>
|
||||
<test.tmrk-enterprisecloud.endpoint>https://services-beta.enterprisecloud.terremark.com/cloudapi/ecloud</test.tmrk-enterprisecloud.endpoint>
|
||||
<test.tmrk-enterprisecloud.apiversion>2011-07-01</test.tmrk-enterprisecloud.apiversion>
|
||||
<test.tmrk-enterprisecloud.identity>FIXME</test.tmrk-enterprisecloud.identity>
|
||||
<test.tmrk-enterprisecloud.credential>FIXME</test.tmrk-enterprisecloud.credential>
|
||||
<test.tmrk-enterprisecloud.image-id></test.tmrk-enterprisecloud.image-id>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
@ -105,24 +105,24 @@
|
|||
<configuration>
|
||||
<systemProperties>
|
||||
<property>
|
||||
<name>test.trmk-enterprisecloud.endpoint</name>
|
||||
<value>${test.trmk-enterprisecloud.endpoint}</value>
|
||||
<name>test.tmrk-enterprisecloud.endpoint</name>
|
||||
<value>${test.tmrk-enterprisecloud.endpoint}</value>
|
||||
</property>
|
||||
<property>
|
||||
<name>test.trmk-enterprisecloud.apiversion</name>
|
||||
<value>${test.trmk-enterprisecloud.apiversion}</value>
|
||||
<name>test.tmrk-enterprisecloud.apiversion</name>
|
||||
<value>${test.tmrk-enterprisecloud.apiversion}</value>
|
||||
</property>
|
||||
<property>
|
||||
<name>test.trmk-enterprisecloud.identity</name>
|
||||
<value>${test.trmk-enterprisecloud.identity}</value>
|
||||
<name>test.tmrk-enterprisecloud.identity</name>
|
||||
<value>${test.tmrk-enterprisecloud.identity}</value>
|
||||
</property>
|
||||
<property>
|
||||
<name>test.trmk-enterprisecloud.credential</name>
|
||||
<value>${test.trmk-enterprisecloud.credential}</value>
|
||||
<name>test.tmrk-enterprisecloud.credential</name>
|
||||
<value>${test.tmrk-enterprisecloud.credential}</value>
|
||||
</property>
|
||||
<property>
|
||||
<name>test.trmk-enterprisecloud.image-id</name>
|
||||
<value>${test.trmk-enterprisecloud.image-id}</value>
|
||||
<name>test.tmrk-enterprisecloud.image-id</name>
|
||||
<value>${test.tmrk-enterprisecloud.image-id}</value>
|
||||
</property>
|
||||
</systemProperties>
|
||||
</configuration>
|
||||
|
@ -142,7 +142,7 @@
|
|||
<configuration>
|
||||
<instructions>
|
||||
<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>
|
||||
</instructions>
|
||||
</configuration>
|
|
@ -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.
|
|
@ -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.
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -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<String> getLinkedServices() {
|
||||
return ImmutableSet.of("trmk-enterprisecloud", "trmk-ecloud", "trmk-vcloudexpress");
|
||||
return ImmutableSet.of("tmrk-enterprisecloud", "tmrk-ecloud", "tmrk-vcloudexpress");
|
||||
}
|
||||
|
||||
/**
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
@ -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<Group>{
|
||||
public class Group extends BaseNamedResource<Group> {
|
||||
|
||||
public Group() {
|
||||
//For JAXB
|
|
@ -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;
|
|
@ -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.*;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
||||
/**
|
||||
*
|
|
@ -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<Row>{
|
||||
public class Row extends BaseNamedResource<Row> {
|
||||
public Row() {
|
||||
//For JAXB
|
||||
}
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -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;
|
|
@ -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,7 +36,7 @@ import javax.ws.rs.PathParam;
|
|||
* Provides asynchronous access to VirtualMachine via their REST API.
|
||||
* <p/>
|
||||
*
|
||||
* @see org.jclouds.trmk.enterprisecloud.features.TaskClient
|
||||
* @see TaskClient
|
||||
* @see <a href=
|
||||
* "http://support.theenterprisecloud.com/kb/default.asp?id=984&Lang=1&SID="
|
||||
* />
|
||||
|
@ -47,7 +47,7 @@ import javax.ws.rs.PathParam;
|
|||
public interface VirtualMachineAsyncClient {
|
||||
|
||||
/**
|
||||
* @see org.jclouds.trmk.enterprisecloud.features.VirtualMachineClient#getVirtualMachine
|
||||
* @see VirtualMachineClient#getVirtualMachine
|
||||
*/
|
||||
@GET
|
||||
@Path("/virtualMachines/{id}")
|
|
@ -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.
|
||||
* <p/>
|
||||
*
|
||||
* @see org.jclouds.trmk.enterprisecloud.features.VirtualMachineAsyncClient
|
||||
* @see VirtualMachineAsyncClient
|
||||
* @see <a href=
|
||||
* "http://support.theenterprisecloud.com/kb/default.asp?id=984&Lang=1&SID="
|
||||
* />
|
|
@ -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;
|
||||
|
|
@ -0,0 +1 @@
|
|||
org.jclouds.tmrk.enterprisecloud.TerremarkEnterpriseCloudProviderMetadata
|
|
@ -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;
|
||||
|
|
@ -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,
|
||||
"",
|
||||
"<Error message=\"Catalog item with that name already exists.\" majorErrorCode=\"409\" minorErrorCode=\"CatalogItemAlreadyExists\"/>",
|
|
@ -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;
|
|
@ -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<T> extends Res
|
|||
@Override
|
||||
public RestContextSpec<TerremarkEnterpriseCloudClient, TerremarkEnterpriseCloudAsyncClient> createContextSpec() {
|
||||
Properties props = new Properties();
|
||||
return new RestContextFactory().createContextSpec("trmk-enterprisecloud", "apiKey", "secretKey", props);
|
||||
return new RestContextFactory().createContextSpec("tmrk-enterprisecloud", "apiKey", "secretKey", props);
|
||||
}
|
||||
|
||||
}
|
|
@ -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" })
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -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;
|
|
@ -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());
|
||||
}
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
org.jclouds.trmk.enterprisecloud.TerremarkEnterpriseCloudProviderMetadata
|
Loading…
Reference in New Issue