diff --git a/README.txt b/README.txt index a2e1cd7264..20b8a9e591 100644 --- a/README.txt +++ b/README.txt @@ -26,8 +26,9 @@ freedom to use portable abstractions or cloud-specific features. our current version is 1.0-beta-6 our dev version is 1.0-SNAPSHOT -our compute api supports: ec2, gogrid, rackspace, rimuhosting, vcloud, terremark, - eucalyptus, hosting.com, bluelock, ibmdev, slicehost +our compute api supports: ec2, gogrid, rackspace, rimuhosting, vcloud, trmk-ecloud, + trmk-vcloudexpress, eucalyptus, bluelock-vclouddirector, + bluelock-vcloudexpress, ibmdev, slicehost * note * the pom dependency org.jclouds/jclouds-allcompute gives you access to to all of these providers diff --git a/assemblies/src/main/resources/assemblies/package-descriptor.xml b/assemblies/src/main/resources/assemblies/package-descriptor.xml index e4df2f5385..9afba8c97c 100644 --- a/assemblies/src/main/resources/assemblies/package-descriptor.xml +++ b/assemblies/src/main/resources/assemblies/package-descriptor.xml @@ -243,33 +243,6 @@ providers/azure - - - vcloud/hostingdotcom/target - - jclouds-hostingdotcom-${project.version}.jar - - providers/hostingdotcom/lib - - - vcloud/hostingdotcom/target - - jclouds-hostingdotcom-${project.version}-sources.jar - - providers/hostingdotcom/src - - - vcloud/hostingdotcom/target/apidocs - providers/hostingdotcom/docs - - - vcloud/hostingdotcom - - README.txt - - providers/hostingdotcom - - mezeo/pcs2/target diff --git a/compute/src/main/clojure/org/jclouds/compute.clj b/compute/src/main/clojure/org/jclouds/compute.clj index 0583635680..bfc99fb758 100644 --- a/compute/src/main/clojure/org/jclouds/compute.clj +++ b/compute/src/main/clojure/org/jclouds/compute.clj @@ -22,7 +22,7 @@ Current supported services are: [ec2, rimuhosting, cloudservers, trmk-ecloud, trmk-vcloudexpress, vcloud, bluelock, - ibmdev, eucalyptus, hostingdotcom, slicehost] + ibmdev, eucalyptus, slicehost] Here's an example of getting some compute configuration from rackspace: diff --git a/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java index 4500537cae..133243b8df 100755 --- a/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java @@ -64,7 +64,6 @@ import org.jclouds.compute.predicates.OperatingSystemPredicates; import org.jclouds.domain.Credentials; import org.jclouds.domain.Location; import org.jclouds.domain.LocationScope; -import org.jclouds.http.HttpResponseException; import org.jclouds.logging.log4j.config.Log4JLoggingModule; import org.jclouds.net.IPSocket; import org.jclouds.predicates.RetryablePredicate; @@ -266,8 +265,6 @@ public abstract class BaseComputeServiceLiveTest { public void testCreateTwoNodesWithRunScript() throws Exception { try { client.destroyNodesMatching(withTag(tag)); - } catch (HttpResponseException e) { - // TODO hosting.com throws 400 when we try to delete a vApp } catch (NoSuchElementException e) { } diff --git a/core/src/main/resources/rest.properties b/core/src/main/resources/rest.properties index a3d20f6e5f..520c44adc7 100644 --- a/core/src/main/resources/rest.properties +++ b/core/src/main/resources/rest.properties @@ -59,9 +59,6 @@ trmk-vcloudexpress.propertiesbuilder=org.jclouds.vcloud.terremark.TerremarkVClou trmk-ecloud.contextbuilder=org.jclouds.vcloud.terremark.TerremarkECloudContextBuilder trmk-ecloud.propertiesbuilder=org.jclouds.vcloud.terremark.TerremarkECloudPropertiesBuilder -hostingdotcom.contextbuilder=org.jclouds.vcloud.hostingdotcom.HostingDotComVCloudContextBuilder -hostingdotcom.propertiesbuilder=org.jclouds.vcloud.hostingdotcom.HostingDotComVCloudPropertiesBuilder - chef.contextbuilder=org.jclouds.chef.ChefContextBuilder chef.propertiesbuilder=org.jclouds.chef.ChefPropertiesBuilder diff --git a/core/src/test/java/org/jclouds/domain/CredentialsTest.java b/core/src/test/java/org/jclouds/domain/CredentialsTest.java index bc0af26ddb..767889bdfd 100644 --- a/core/src/test/java/org/jclouds/domain/CredentialsTest.java +++ b/core/src/test/java/org/jclouds/domain/CredentialsTest.java @@ -45,7 +45,7 @@ public class CredentialsTest { assertEquals(creds.credential, "Base64=="); } - public void testHosting() { + public void testDollar() { Credentials creds = Credentials.parse(URI .create("compute://user%40domain:pa%24sword@hostingdotcom")); assertEquals(creds.identity, "user@domain"); diff --git a/core/src/test/java/org/jclouds/util/HttpUtilsTest.java b/core/src/test/java/org/jclouds/util/HttpUtilsTest.java index 6e1282ebec..9d1b49b41f 100644 --- a/core/src/test/java/org/jclouds/util/HttpUtilsTest.java +++ b/core/src/test/java/org/jclouds/util/HttpUtilsTest.java @@ -136,10 +136,10 @@ public class HttpUtilsTest extends PerformanceTest { assertEquals(creds, URI.create("compute://identity:Base64==@azureblob/container-hyphen/prefix")); } - public void testHosting() { - URI creds = HttpUtils.createUri("compute://user@domain:pa$sword@hostingdotcom"); + public void testDollar() { + URI creds = HttpUtils.createUri("compute://user@domain:pa$sword@host"); assertEquals(creds.getUserInfo(), "user@domain:pa$sword"); - assertEquals(creds, URI.create("compute://user%40domain:pa%24sword@hostingdotcom")); + assertEquals(creds, URI.create("compute://user%40domain:pa%24sword@host")); } public void testTerremark() { diff --git a/tools/antcontrib/samples/cargooverssh/build.xml b/tools/antcontrib/samples/cargooverssh/build.xml index fa4302117a..409ea99620 100644 --- a/tools/antcontrib/samples/cargooverssh/build.xml +++ b/tools/antcontrib/samples/cargooverssh/build.xml @@ -39,14 +39,14 @@ --> diff --git a/tools/antcontrib/samples/compute/build.xml b/tools/antcontrib/samples/compute/build.xml index aa75b99227..043f0ad227 100644 --- a/tools/antcontrib/samples/compute/build.xml +++ b/tools/antcontrib/samples/compute/build.xml @@ -30,14 +30,14 @@ diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java b/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java index 6f642ff1b8..8757d0fc4e 100644 --- a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java +++ b/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java @@ -59,7 +59,7 @@ public class VAppImpl implements VApp { this.name = checkNotNull(name, "name"); this.id = checkNotNull(id, "id"); this.status = checkNotNull(status, "status"); - this.size = size;// hostingdotcom + this.size = size; this.vDC = vDC; this.networkToAddresses = checkNotNull(networkToAddresses, "networkToAddresses"); this.osType = osType; diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java index 90f4c33afa..4b336537cf 100644 --- a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java +++ b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java @@ -748,7 +748,8 @@ public class VCloudExpressAsyncClientTest extends RestClientTest of("vdc", new NamedResourceImpl("vdc", VCloudExpressMediaType.VDC_XML, - URI.create("https://vcloud.safesecureweb.com/api/v0.8/vdc/1"))), null, + URI.create("https://vcloud.safesecureweb.com/api/v0.8/vdc/1"))), ImmutableMap + . of(), new NamedResourceImpl("tasksList", VCloudExpressMediaType.TASKSLIST_XML, URI .create("https://vcloud.safesecureweb.com/api/v0.8/tasksList/1")), ImmutableList . of())); diff --git a/vcloud/hostingdotcom/README.txt b/vcloud/hostingdotcom/README.txt deleted file mode 100644 index e19e1d06cb..0000000000 --- a/vcloud/hostingdotcom/README.txt +++ /dev/null @@ -1,25 +0,0 @@ -==== - - Copyright (C) 2010 Cloud Conscious, LLC. - - ==================================================================== - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ==================================================================== -==== - -# -# The jclouds provider for Hosting.com's vCloud Express (http://www.hosting.com/vcloudexpress/) platform. -# -# TODO: Implementation status. -# TODO: Supported features. -# TODO: Usage example. \ No newline at end of file diff --git a/vcloud/hostingdotcom/pom.xml b/vcloud/hostingdotcom/pom.xml deleted file mode 100644 index e582079c2f..0000000000 --- a/vcloud/hostingdotcom/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - 4.0.0 - - org.jclouds - jclouds-vcloud-project - 1.0-SNAPSHOT - - org.jclouds - jclouds-hostingdotcom - jclouds hostingdotcom Components Core - jclouds core components to access hostingdotcom - - ${jclouds.hostingdotcom.user} - ${jclouds.hostingdotcom.password} - - - - scm:svn:http://jclouds.googlecode.com/svn/trunk/vcloud/hostingdotcom - scm:svn:https://jclouds.googlecode.com/svn/trunk/vcloud/hostingdotcom - http://jclouds.googlecode.com/svn/trunk/vcloud/hostingdotcom - - - - - ${project.groupId} - jclouds-vcloud - ${project.version} - - - ${project.groupId} - jclouds-vcloud - ${project.version} - test-jar - test - - - - diff --git a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudAsyncClient.java b/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudAsyncClient.java deleted file mode 100644 index f5f1d3ae0b..0000000000 --- a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudAsyncClient.java +++ /dev/null @@ -1,80 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom; - -import static org.jclouds.vcloud.VCloudMediaType.VAPP_XML; - -import java.net.URI; - -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - -import org.jclouds.predicates.validators.DnsNameValidator; -import org.jclouds.rest.annotations.EndpointParam; -import org.jclouds.rest.annotations.ExceptionParser; -import org.jclouds.rest.annotations.MapBinder; -import org.jclouds.rest.annotations.MapPayloadParam; -import org.jclouds.rest.annotations.ParamValidators; -import org.jclouds.rest.annotations.RequestFilters; -import org.jclouds.rest.annotations.XMLResponseParser; -import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; -import org.jclouds.vcloud.VCloudExpressAsyncClient; -import org.jclouds.vcloud.binders.BindInstantiateVAppTemplateParamsToXmlPayload; -import org.jclouds.vcloud.filters.SetVCloudTokenCookie; -import org.jclouds.vcloud.hostingdotcom.domain.HostingDotComVApp; -import org.jclouds.vcloud.hostingdotcom.xml.HostingDotComVAppHandler; -import org.jclouds.vcloud.options.InstantiateVAppTemplateOptions; - -import com.google.common.util.concurrent.ListenableFuture; - -/** - * Provides access to VCloud resources via their REST API. - *

- * - * @see - * @author Adrian Cole - */ -@RequestFilters(SetVCloudTokenCookie.class) -public interface HostingDotComVCloudAsyncClient extends VCloudExpressAsyncClient { - - @GET - @Consumes(VAPP_XML) - @XMLResponseParser(HostingDotComVAppHandler.class) - @ExceptionParser(ReturnNullOnNotFoundOr404.class) - @Override - ListenableFuture getVApp(@EndpointParam URI appId); - - @POST - @Path("/action/instantiateVAppTemplate") - @Produces("application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml") - @Consumes(VAPP_XML) - // required for hosting.com to operate - @XMLResponseParser(HostingDotComVAppHandler.class) - @MapBinder(BindInstantiateVAppTemplateParamsToXmlPayload.class) - @Override - ListenableFuture instantiateVAppTemplateInVDC(@EndpointParam URI vdc, - @MapPayloadParam("template") URI template, - @MapPayloadParam("name") @ParamValidators(DnsNameValidator.class) String appName, - InstantiateVAppTemplateOptions... options); - -} diff --git a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudClient.java b/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudClient.java deleted file mode 100644 index 91cab53760..0000000000 --- a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudClient.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom; - -import java.net.URI; -import java.util.concurrent.TimeUnit; - -import org.jclouds.concurrent.Timeout; -import org.jclouds.vcloud.VCloudExpressClient; -import org.jclouds.vcloud.hostingdotcom.domain.HostingDotComVApp; -import org.jclouds.vcloud.options.InstantiateVAppTemplateOptions; - -/** - * Provides access to VCloud resources via their REST API. - *

- * - * @see - * @author Adrian Cole - */ -@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS) -public interface HostingDotComVCloudClient extends VCloudExpressClient { - - @Override - @Timeout(duration = 600, timeUnit = TimeUnit.SECONDS) - HostingDotComVApp instantiateVAppTemplateInVDC(URI vDC, URI template, String appName, - InstantiateVAppTemplateOptions... options); - - @Override - @Timeout(duration = 180, timeUnit = TimeUnit.SECONDS) - HostingDotComVApp getVApp(URI vAppId); - -} diff --git a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudContextBuilder.java b/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudContextBuilder.java deleted file mode 100644 index 24300385eb..0000000000 --- a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudContextBuilder.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom; - -import java.util.List; -import java.util.Properties; - -import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; -import org.jclouds.logging.jdk.config.JDKLoggingModule; -import org.jclouds.vcloud.VCloudExpressContextBuilder; -import org.jclouds.vcloud.hostingdotcom.compute.config.HostingDotComVCloudComputeServiceContextModule; -import org.jclouds.vcloud.hostingdotcom.config.HostingDotComVCloudRestClientModule; - -import com.google.inject.Injector; -import com.google.inject.Module; - -/** - * Creates {@link HostingDotComVCloudComputeServiceContext} or {@link Injector} instances based on - * the most commonly requested arguments. - *

- * Note that Threadsafe objects will be bound as singletons to the Injector or Context provided. - *

- *

- * If no Modules are specified, the default {@link JDKLoggingModule logging} and - * {@link JavaUrlHttpCommandExecutorServiceModule http transports} will be installed. - * - * @author Adrian Cole - * @see HostingDotComVCloudComputeServiceContext - */ -public class HostingDotComVCloudContextBuilder extends VCloudExpressContextBuilder { - - public HostingDotComVCloudContextBuilder(Properties props) { - super(props); - } - - @Override - protected void addContextModule(List modules) { - modules.add(new HostingDotComVCloudComputeServiceContextModule()); - } - - @Override - protected void addClientModule(List modules) { - modules.add(new HostingDotComVCloudRestClientModule()); - } - -} diff --git a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudPropertiesBuilder.java b/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudPropertiesBuilder.java deleted file mode 100644 index 79ea4dec00..0000000000 --- a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudPropertiesBuilder.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom; - -import static org.jclouds.Constants.PROPERTY_ENDPOINT; -import static org.jclouds.vcloud.reference.VCloudConstants.PROPERTY_VCLOUD_TIMEOUT_TASK_COMPLETED; - -import java.util.Properties; - -import org.jclouds.vcloud.VCloudExpressPropertiesBuilder; - -/** - * Builds properties used in hosting.com VCloud Clients - * - * @author Adrian Cole - */ -public class HostingDotComVCloudPropertiesBuilder extends VCloudExpressPropertiesBuilder { - @Override - protected Properties defaultProperties() { - Properties properties = super.defaultProperties(); - properties.setProperty(PROPERTY_ENDPOINT, "https://vcloud.safesecureweb.com/api"); - properties.setProperty(PROPERTY_VCLOUD_TIMEOUT_TASK_COMPLETED, 45 * 60 * 1000l + ""); - return properties; - } - - public HostingDotComVCloudPropertiesBuilder(Properties properties) { - super(properties); - } - -} diff --git a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeClient.java b/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeClient.java deleted file mode 100644 index f07ea462af..0000000000 --- a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeClient.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom.compute; - -import java.net.URI; -import java.util.Map; - -import javax.inject.Inject; -import javax.inject.Singleton; - -import org.jclouds.compute.domain.NodeState; -import org.jclouds.vcloud.VCloudExpressClient; -import org.jclouds.vcloud.compute.internal.VCloudExpressComputeClientImpl; -import org.jclouds.vcloud.domain.VApp; -import org.jclouds.vcloud.domain.VAppStatus; -import org.jclouds.vcloud.domain.VAppTemplate; -import org.jclouds.vcloud.hostingdotcom.domain.HostingDotComVApp; - -import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableMap; - -/** - * @author Adrian Cole - */ -@Singleton -public class HostingDotComVCloudComputeClient extends VCloudExpressComputeClientImpl { - - @Inject - protected HostingDotComVCloudComputeClient(VCloudExpressClient client, Predicate successTester, - Map vAppStatusToNodeState) { - super(client, successTester, vAppStatusToNodeState); - } - - @Override - protected Map parseResponse(VAppTemplate template, VApp vAppResponse) { - HostingDotComVApp hVApp = HostingDotComVApp.class.cast(vAppResponse); - return ImmutableMap. of("id", vAppResponse.getId().toASCIIString(), "username", hVApp - .getUsername(), "password", hVApp.getPassword()); - } - -} \ No newline at end of file diff --git a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/compute/config/HostingDotComVCloudComputeServiceContextModule.java b/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/compute/config/HostingDotComVCloudComputeServiceContextModule.java deleted file mode 100755 index 68cab3a3da..0000000000 --- a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/compute/config/HostingDotComVCloudComputeServiceContextModule.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom.compute.config; - -import static org.jclouds.compute.domain.OsFamily.CENTOS; - -import org.jclouds.compute.domain.TemplateBuilder; -import org.jclouds.vcloud.compute.VCloudExpressComputeClient; -import org.jclouds.vcloud.compute.config.VCloudExpressComputeServiceContextModule; -import org.jclouds.vcloud.hostingdotcom.compute.HostingDotComVCloudComputeClient; - -import com.google.inject.Injector; - -/** - * Configures the {@link HostingDotComVCloudComputeServiceContext}; requires - * {@link HostingDotComVCloudComputeClient} bound. - * - * @author Adrian Cole - */ -public class HostingDotComVCloudComputeServiceContextModule extends VCloudExpressComputeServiceContextModule { - - @Override - protected void configure() { - super.configure(); - bind(VCloudExpressComputeClient.class).to(HostingDotComVCloudComputeClient.class); - } - - @Override - protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) { - return template.osFamily(CENTOS); - } - -} diff --git a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/config/HostingDotComVCloudRestClientModule.java b/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/config/HostingDotComVCloudRestClientModule.java deleted file mode 100644 index 6523ee1228..0000000000 --- a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/config/HostingDotComVCloudRestClientModule.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom.config; - -import java.net.URI; - -import javax.inject.Singleton; - -import org.jclouds.http.RequiresHttp; -import org.jclouds.rest.ConfiguresRestClient; -import org.jclouds.vcloud.CommonVCloudClient; -import org.jclouds.vcloud.VCloudExpressAsyncClient; -import org.jclouds.vcloud.VCloudExpressClient; -import org.jclouds.vcloud.config.BaseVCloudExpressRestClientModule; -import org.jclouds.vcloud.hostingdotcom.HostingDotComVCloudAsyncClient; -import org.jclouds.vcloud.hostingdotcom.HostingDotComVCloudClient; - -import com.google.inject.Provides; - -/** - * Configures the VCloud authentication service connection, including logging and http transport. - * - * @author Adrian Cole - */ -@RequiresHttp -@ConfiguresRestClient -public class HostingDotComVCloudRestClientModule extends - BaseVCloudExpressRestClientModule { - - public HostingDotComVCloudRestClientModule() { - super(HostingDotComVCloudClient.class, HostingDotComVCloudAsyncClient.class); - } - - @Provides - @Singleton - protected VCloudExpressAsyncClient provideVCloudAsyncClient(HostingDotComVCloudAsyncClient in) { - return in; - } - - @Provides - @Singleton - protected VCloudExpressClient provideVCloudClient(HostingDotComVCloudClient in) { - return in; - } - - @Override - protected URI provideDefaultNetwork(CommonVCloudClient client) { - return URI.create("https://vcloud.safesecureweb.com/network/1990"); - } - -} diff --git a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/domain/HostingDotComVApp.java b/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/domain/HostingDotComVApp.java deleted file mode 100644 index b3981a6784..0000000000 --- a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/domain/HostingDotComVApp.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom.domain; - -import org.jclouds.vcloud.domain.VApp; -import org.jclouds.vcloud.hostingdotcom.domain.internal.HostingDotComVAppImpl; - -import com.google.inject.ImplementedBy; - -/** - * @author Adrian Cole - */ -@ImplementedBy(HostingDotComVAppImpl.class) -public interface HostingDotComVApp extends VApp { - - String getUsername(); - - String getPassword(); -} \ No newline at end of file diff --git a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/domain/internal/HostingDotComVAppImpl.java b/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/domain/internal/HostingDotComVAppImpl.java deleted file mode 100644 index 6e362d0daa..0000000000 --- a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/domain/internal/HostingDotComVAppImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom.domain.internal; - -import java.net.URI; -import java.util.Set; - -import org.jclouds.vcloud.domain.NamedResource; -import org.jclouds.vcloud.domain.ResourceAllocation; -import org.jclouds.vcloud.domain.VAppStatus; -import org.jclouds.vcloud.domain.VirtualSystem; -import org.jclouds.vcloud.domain.internal.VAppImpl; -import org.jclouds.vcloud.hostingdotcom.domain.HostingDotComVApp; - -import com.google.common.collect.ListMultimap; - -/** - * Locations of resources in vCloud - * - * @author Adrian Cole - * - */ -public class HostingDotComVAppImpl extends VAppImpl implements HostingDotComVApp { - - private final String username; - private final String password;; - - /** The serialVersionUID */ - private static final long serialVersionUID = 8464716396538298809L; - - public HostingDotComVAppImpl(String name, URI location, VAppStatus status, Long size, NamedResource vDC, - ListMultimap networkToAddresses, Integer osType, String operatingSystemDescription, - VirtualSystem system, Set resourceAllocations, String username, String password) { - super(name, location, status, size, vDC, networkToAddresses, osType, operatingSystemDescription, system, - resourceAllocations); - this.username = username; - this.password = password; - - } - - public String getUsername() { - return username; - } - - public String getPassword() { - return password; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = super.hashCode(); - result = prime * result + ((password == null) ? 0 : password.hashCode()); - result = prime * result + ((username == null) ? 0 : username.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (!super.equals(obj)) - return false; - if (getClass() != obj.getClass()) - return false; - HostingDotComVAppImpl other = (HostingDotComVAppImpl) obj; - if (password == null) { - if (other.password != null) - return false; - } else if (!password.equals(other.password)) - return false; - if (username == null) { - if (other.username != null) - return false; - } else if (!username.equals(other.username)) - return false; - return true; - } -} \ No newline at end of file diff --git a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/xml/HostingDotComVAppHandler.java b/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/xml/HostingDotComVAppHandler.java deleted file mode 100644 index 6a3af72d82..0000000000 --- a/vcloud/hostingdotcom/src/main/java/org/jclouds/vcloud/hostingdotcom/xml/HostingDotComVAppHandler.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom.xml; - -import javax.inject.Inject; - -import org.jclouds.vcloud.hostingdotcom.domain.HostingDotComVApp; -import org.jclouds.vcloud.hostingdotcom.domain.internal.HostingDotComVAppImpl; -import org.jclouds.vcloud.xml.ResourceAllocationHandler; -import org.jclouds.vcloud.xml.VAppHandler; -import org.jclouds.vcloud.xml.VirtualSystemHandler; -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; - -/** - * @author Adrian Cole - */ -public class HostingDotComVAppHandler extends VAppHandler { - - private String username; - private String password; - - @Inject - public HostingDotComVAppHandler(VirtualSystemHandler systemHandler, ResourceAllocationHandler allocationHandler) { - super(systemHandler, allocationHandler); - } - - public HostingDotComVApp getResult() { - return new HostingDotComVAppImpl(name, location, status, size, vDC, networkToAddresses, osType, - operatingSystemDescription, system, allocations, username, password); - } - - @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { - super.startElement(uri, localName, qName, attributes); - if (attributes.getIndex("key") != -1) { - String key = attributes.getValue(attributes.getIndex("key")); - if ("username".equals(key)) { - username = attributes.getValue(attributes.getIndex("value")); - } else if ("password".equals(key)) { - password = attributes.getValue(attributes.getIndex("value")); - } - } - } - -} diff --git a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudClientLiveTest.java b/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudClientLiveTest.java deleted file mode 100644 index 063f4a1a45..0000000000 --- a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudClientLiveTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom; - -import static com.google.common.base.Preconditions.checkNotNull; - -import java.util.Properties; - -import org.jclouds.compute.ComputeServiceContextFactory; -import org.jclouds.logging.log4j.config.Log4JLoggingModule; -import org.jclouds.vcloud.VCloudExpressClientLiveTest; -import org.testng.annotations.BeforeGroups; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableSet; -import com.google.inject.Module; - -/** - * Tests behavior of {@code HostingDotComVCloudClient} - * - * @author Adrian Cole - */ -@Test(groups = "live", sequential = true, testName = "vcloud.HostingDotComVCloudClientLiveTest") -public class HostingDotComVCloudClientLiveTest extends VCloudExpressClientLiveTest { - - @BeforeGroups(groups = { "live" }) - @Override - public void setupClient() { - identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); - String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - - context = new ComputeServiceContextFactory().createContext("hostingdotcom", identity, credential, - ImmutableSet. of(new Log4JLoggingModule()), new Properties()).getProviderSpecificContext(); - connection = context.getApi(); - } - -} diff --git a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/ProvidersInPropertiesTest.java b/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/ProvidersInPropertiesTest.java deleted file mode 100644 index de9c578282..0000000000 --- a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/ProvidersInPropertiesTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom; - -import org.jclouds.compute.util.ComputeServiceUtils; -import org.jclouds.util.Utils; -import org.testng.annotations.Test; - -import com.google.common.collect.Iterables; - -/** - * - * @author Adrian Cole - * - */ -@Test(groups = "unit") -public class ProvidersInPropertiesTest { - - @Test - public void testSupportedProviders() { - Iterable providers = Utils.getSupportedProviders(); - assert Iterables.contains(providers, "hostingdotcom") : providers; - } - - @Test - public void testSupportedComputeServiceProviders() { - Iterable providers = ComputeServiceUtils.getSupportedProviders(); - assert Iterables.contains(providers, "hostingdotcom") : providers; - } - -} diff --git a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeClientLiveTest.java b/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeClientLiveTest.java deleted file mode 100644 index e52ed626ed..0000000000 --- a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeClientLiveTest.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom.compute; - -import static com.google.common.base.Preconditions.checkNotNull; - -import java.util.Properties; - -import org.jclouds.compute.domain.OsFamily; -import org.jclouds.logging.log4j.config.Log4JLoggingModule; -import org.jclouds.rest.RestContextFactory; -import org.jclouds.vcloud.compute.VCloudExpressComputeClientLiveTest; -import org.jclouds.vcloud.hostingdotcom.HostingDotComVCloudClient; -import org.testng.annotations.BeforeGroups; -import org.testng.annotations.Test; - -import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.Module; -import com.google.inject.TypeLiteral; - -/** - * Tests behavior of {@code HostingDotComVCloudComputeClient} - * - * @author Adrian Cole - */ -@Test(groups = "live", enabled = true, sequential = true, testName = "vcloud.HostingDotComVCloudComputeClientLiveTest") -public class HostingDotComVCloudComputeClientLiveTest extends VCloudExpressComputeClientLiveTest { - - @BeforeGroups(groups = { "live" }) - @Override - public void setupClient() { - String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); - String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - Injector injector = new RestContextFactory().createContextBuilder("hostingdotcom", identity, - credential, ImmutableSet. of(new Log4JLoggingModule()), new Properties()) - .buildInjector(); - - computeClient = injector.getInstance(HostingDotComVCloudComputeClient.class); - client = injector.getInstance(HostingDotComVCloudClient.class); - addressTester = injector.getInstance(Key.get(new TypeLiteral>() { - })); - expectationMap = ImmutableMap. builder().put(OsFamily.CENTOS, - new Expectation(4194304 / 2 * 10, "Red Hat Enterprise Linux 5 (64-bit)")).build(); - provider = "vcloudtest"; - templateName = "3"; - } - -} diff --git a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeServiceLiveTest.java b/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeServiceLiveTest.java deleted file mode 100644 index d459deeccf..0000000000 --- a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeServiceLiveTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom.compute; - -import static org.testng.Assert.assertEquals; - -import org.jclouds.compute.domain.OsFamily; -import org.jclouds.compute.domain.Template; -import org.jclouds.vcloud.compute.VCloudExpressComputeServiceLiveTest; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -/** - * - * - * @author Adrian Cole - */ -@Test(groups = "live", enabled = true, sequential = true, testName = "compute.HostingDotComVCloudComputeServiceLiveTest") -public class HostingDotComVCloudComputeServiceLiveTest extends VCloudExpressComputeServiceLiveTest { - @BeforeClass - @Override - public void setServiceDefaults() { - provider = "hostingdotcom"; - } - - @Test - public void testTemplateBuilder() { - Template defaultTemplate = client.templateBuilder().build(); - assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); - assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.CENTOS); - assertEquals(defaultTemplate.getLocation().getId(), "188849"); - assertEquals(defaultTemplate.getSize().getCores(), 1.0d); - } - -} \ No newline at end of file diff --git a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/xml/HostingDotComVAppHandlerTest.java b/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/xml/HostingDotComVAppHandlerTest.java deleted file mode 100644 index 5ab80b14ea..0000000000 --- a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/xml/HostingDotComVAppHandlerTest.java +++ /dev/null @@ -1,62 +0,0 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.hostingdotcom.xml; - -import static org.testng.Assert.assertEquals; - -import java.io.InputStream; -import java.net.URI; -import java.net.UnknownHostException; - -import org.jclouds.http.functions.BaseHandlerTest; -import org.jclouds.vcloud.domain.ResourceAllocation; -import org.jclouds.vcloud.domain.VAppStatus; -import org.jclouds.vcloud.domain.internal.NamedResourceImpl; -import org.jclouds.vcloud.hostingdotcom.domain.HostingDotComVApp; -import org.jclouds.vcloud.hostingdotcom.domain.internal.HostingDotComVAppImpl; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableListMultimap; -import com.google.common.collect.ImmutableSortedSet; - -/** - * Tests behavior of {@code HostingDotComVAppHandler} - * - * @author Adrian Cole - */ -@Test(groups = "unit", testName = "vcloud.HostingDotComVAppHandlerTest") -public class HostingDotComVAppHandlerTest extends BaseHandlerTest { - - public void testApplyInputStream() throws UnknownHostException { - InputStream is = getClass().getResourceAsStream("/hostingdotcom/instantiatevapp.xml"); - - HostingDotComVApp result = (HostingDotComVApp) factory.create( - injector.getInstance(HostingDotComVAppHandler.class)).parse(is); - - HostingDotComVApp expects = new HostingDotComVAppImpl("188849-33", URI - .create("https://vcloud.safesecureweb.com/api/v0.8/vapp/188849-33"), VAppStatus.RESOLVED, null, - new NamedResourceImpl(null, "application/vnd.vmware.vcloud.vdc+xml", URI - .create("https://vcloud.safesecureweb.com/api/v0.8/vdc/188849")), ImmutableListMultimap - . of(), null, null, null, ImmutableSortedSet. of(), "root", - "meatisyummy"); - - assertEquals(result, expects); - } -} diff --git a/vcloud/hostingdotcom/src/test/resources/hostingdotcom/instantiatevapp.xml b/vcloud/hostingdotcom/src/test/resources/hostingdotcom/instantiatevapp.xml deleted file mode 100644 index 32f73c3f40..0000000000 --- a/vcloud/hostingdotcom/src/test/resources/hostingdotcom/instantiatevapp.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - Product Section Details - - - - diff --git a/vcloud/hostingdotcom/src/test/resources/log4j.xml b/vcloud/hostingdotcom/src/test/resources/log4j.xml deleted file mode 100755 index 7343ec00e2..0000000000 --- a/vcloud/hostingdotcom/src/test/resources/log4j.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vcloud/pom.xml b/vcloud/pom.xml index e535b76cb7..04d09dff86 100644 --- a/vcloud/pom.xml +++ b/vcloud/pom.xml @@ -34,7 +34,6 @@ core terremark - hostingdotcom bluelock diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudExpressAsyncClientTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudExpressAsyncClientTest.java index c9975760f4..07d0d2ef4e 100644 --- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudExpressAsyncClientTest.java +++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudExpressAsyncClientTest.java @@ -681,11 +681,12 @@ public class TerremarkVCloudExpressAsyncClientTest extends RestClientTest of("vdc", new NamedResourceImpl("vdc", TerremarkVCloudExpressMediaType.VDC_XML, URI - .create("https://vcloud.safesecureweb.com/api/v0.8/vdc/1"))), null, - new NamedResourceImpl("tasksList", TerremarkVCloudExpressMediaType.TASKSLIST_XML, URI + .create("https://vcloud.safesecureweb.com/api/v0.8/vdc/1"))), ImmutableMap + . of(), new NamedResourceImpl("tasksList", + TerremarkVCloudExpressMediaType.TASKSLIST_XML, URI .create("https://vcloud.safesecureweb.com/api/v0.8/tasksList/1")), new NamedResourceImpl( - "keysList", TerremarkVCloudExpressMediaType.KEYSLIST_XML, URI - .create("https://vcloud.safesecureweb.com/api/v0.8/keysList/1")))); + "keysList", TerremarkVCloudExpressMediaType.KEYSLIST_XML, URI + .create("https://vcloud.safesecureweb.com/api/v0.8/keysList/1")))); } }