You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2013/09/30 18:15:22 UTC
[02/17] JCLOUDS-304. Remove broken terremark providers
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApiTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApiTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApiTest.java
deleted file mode 100644
index 88ca8e9..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApiTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-import java.net.URI;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.jclouds.trmk.ecloud.BaseTerremarkECloudApiTest;
-import org.jclouds.trmk.vcloud_0_8.xml.DataCentersHandler;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code DataCenterOperationsApi}
- *
- * @author Adrian Cole
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "DataCenterOperationsApiTest")
-public class DataCenterOperationsApiTest extends
- BaseTerremarkECloudApiTest<DataCenterOperationsApi> {
-
- public void testlistDataCenters() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(DataCenterOperationsApi.class, "listDataCenters", URI.class);
- GeneratedHttpRequest request = processor
- .createRequest(
- method, ImmutableList.<Object> of(
- URI.create("https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/org/1910324/dataCenters")));
-
- assertRequestLineEquals(request,
- "GET https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/org/1910324/dataCenters HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.ecloud.dataCentersList+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, DataCentersHandler.class);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testlistDataCentersInOrg() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(DataCenterOperationsApi.class, "listDataCentersInOrg", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/org/1")));
-
- assertRequestLineEquals(request, "GET https://vcloud.safesecureweb.com/api/v0.8/datacentersList/1 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.ecloud.dataCentersList+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, DataCentersHandler.class);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/TagOperationsApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/TagOperationsApiLiveTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/TagOperationsApiLiveTest.java
deleted file mode 100644
index bc7e194..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/TagOperationsApiLiveTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import org.jclouds.trmk.ecloud.BaseTerremarkECloudApiLiveTest;
-import org.jclouds.trmk.ecloud.domain.ECloudOrg;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-import org.testng.annotations.Test;
-
-/**
- * @author Adrian Cole
- */
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "TagOperationsApiLiveTest")
-public class TagOperationsApiLiveTest extends BaseTerremarkECloudApiLiveTest {
- @Test
- public void testListTagsInOrg() throws Exception {
- for (ReferenceType response : api().listOrgs().values()) {
- ECloudOrg org = api().getOrg(response.getHref());
- assertNotNull(response);
- assertNotNull(response.getName());
- assertNotNull(response.getHref());
- assertEquals(api().getTagOperationsApi().getTagNameToUsageCountInOrg(org.getHref()), api()
- .getTagOperationsApi().getTagNameToUsageCount(org.getTags().getHref()));
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/TagOperationsApiTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/TagOperationsApiTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/TagOperationsApiTest.java
deleted file mode 100644
index a58eb40..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/TagOperationsApiTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-import java.net.URI;
-
-import org.jclouds.Fallbacks.EmptyMapOnNotFoundOr404;
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.jclouds.trmk.ecloud.BaseTerremarkECloudApiTest;
-import org.jclouds.trmk.ecloud.xml.TagNameToUsageCountHandler;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code TagOperationsApi}
- *
- * @author Adrian Cole
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "TagOperationsApiTest")
-public class TagOperationsApiTest extends BaseTerremarkECloudApiTest<TagOperationsApi> {
-
- public void testgetTagNameToUsageCount() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TagOperationsApi.class, "getTagNameToUsageCount", URI.class);
- GeneratedHttpRequest request = processor
- .createRequest(
- method, ImmutableList.<Object> of(
- URI.create("https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/org/1910324/deviceTags")));
-
- assertRequestLineEquals(request,
- "GET https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/org/1910324/deviceTags HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.ecloud.tagsList+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, TagNameToUsageCountHandler.class);
- assertFallbackClassEquals(method, EmptyMapOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
- public void testgetTagNameToUsageCountInOrg() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TagOperationsApi.class, "getTagNameToUsageCountInOrg", URI.class);
- GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(
- URI.create("https://vcloud.safesecureweb.com/api/v0.8/org/1")));
-
- assertRequestLineEquals(request, "GET https://vcloud.safesecureweb.com/api/v0.8/deviceTags/1 HTTP/1.1");
- assertNonPayloadHeadersEqual(request, "Accept: application/vnd.tmrk.ecloud.tagsList+xml\n");
- assertPayloadEquals(request, null, null, false);
-
- assertResponseParserClassEquals(method, request, ParseSax.class);
- assertSaxResponseParserClassEquals(method, TagNameToUsageCountHandler.class);
- assertFallbackClassEquals(method, EmptyMapOnNotFoundOr404.class);
-
- checkFilters(request);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/xml/ECloudOrgHandlerTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/xml/ECloudOrgHandlerTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/xml/ECloudOrgHandlerTest.java
deleted file mode 100644
index fe345a8..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/xml/ECloudOrgHandlerTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.xml;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.URI;
-
-import org.jclouds.http.functions.BaseHandlerTest;
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.http.functions.config.SaxParserModule;
-import org.jclouds.trmk.ecloud.TerremarkECloudApiMetadata;
-import org.jclouds.trmk.ecloud.TerremarkECloudMediaType;
-import org.jclouds.trmk.ecloud.domain.ECloudOrg;
-import org.jclouds.trmk.vcloud_0_8.domain.internal.ReferenceTypeImpl;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.Guice;
-import com.google.inject.name.Names;
-
-/**
- * Tests behavior of {@code ECloudOrgHandler}
- *
- * @author Adrian Cole
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "ECloudOrgHandlerTest")
-public class ECloudOrgHandlerTest extends BaseHandlerTest {
- @Override
- @BeforeTest
- protected void setUpInjector() {
- injector = Guice.createInjector(new SaxParserModule() {
- @Override
- public void configure() {
- super.configure();
- Names.bindProperties(binder(),TerremarkECloudApiMetadata.defaultProperties());
- }
- });
- factory = injector.getInstance(ParseSax.Factory.class);
- assert factory != null;
- }
-
- public void testApplyInputStream() {
-
- InputStream is = getClass().getResourceAsStream("/org-ecloud.xml");
-
- ECloudOrg result = (ECloudOrg) factory.create(
- injector.getInstance(ECloudOrgHandler.class)).parse(is);
- assertEquals(result.getName(), "Cloud Conscious, LLC");
- assertEquals(result.getHref(),
- URI.create("https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/org/1910324"));
-
- assertEquals(result.getVDCs(), ImmutableMap.of(
- "Cloud Conscious LLC - MIA",
- new ReferenceTypeImpl("Cloud Conscious LLC - MIA", TerremarkECloudMediaType.VDC_XML, URI
- .create("https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/vdc/1155")),
- "Cloud Conscious LLC - AMA",
- new ReferenceTypeImpl("Cloud Conscious LLC - AMA", TerremarkECloudMediaType.VDC_XML, URI
- .create("https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/vdc/1169"))));
-
- assertEquals(result.getCatalogs(), ImmutableMap.of(
- "Cloud Conscious LLC - MIA Catalog",
- new ReferenceTypeImpl("Cloud Conscious LLC - MIA Catalog", TerremarkECloudMediaType.CATALOG_XML, URI
- .create("https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/vdc/1155/catalog")),
- "Cloud Conscious LLC - AMA Catalog",
- new ReferenceTypeImpl("Cloud Conscious LLC - AMA Catalog", TerremarkECloudMediaType.CATALOG_XML, URI
- .create("https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/vdc/1169/catalog"))));
-
- assertEquals(result.getTasksLists(), ImmutableMap.of(
- "Cloud Conscious LLC - MIA Tasks List",
- new ReferenceTypeImpl("Cloud Conscious LLC - MIA Tasks List", TerremarkECloudMediaType.TASKSLIST_XML, URI
- .create("https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/vdc/1155/tasksList")),
- "Cloud Conscious LLC - AMA Tasks List",
- new ReferenceTypeImpl("Cloud Conscious LLC - AMA Tasks List", TerremarkECloudMediaType.TASKSLIST_XML, URI
- .create("https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/vdc/1169/tasksList"))));
-
- assertEquals(
- result.getKeys(),
- new ReferenceTypeImpl(
- "Keys",
- "application/vnd.tmrk.ecloud.keysList+xml",
- URI.create("https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/org/1910324/keys")));
-
- assertEquals(
- result.getTags(),
- new ReferenceTypeImpl(
- "Device Tags",
- "application/vnd.tmrk.ecloud.tagsList+xml",
- URI.create("https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/org/1910324/deviceTags")));
-
- assertEquals(
- result.getVAppCatalog(),
- new ReferenceTypeImpl(
- "VApp Catalog",
- "application/vnd.tmrk.ecloud.VAppCatalogList+xml",
- URI.create("https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/org/1910324/vappCatalog")));
-
- assertEquals(
- result.getDataCenters(),
- new ReferenceTypeImpl(
- "DataCenters",
- "application/vnd.tmrk.ecloud.dataCentersList+xml",
- URI.create("https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/org/1910324/dataCenters")));
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandlerTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandlerTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandlerTest.java
deleted file mode 100644
index 9f6d0c2..0000000
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandlerTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.ecloud.xml;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.util.Map;
-
-import org.jclouds.http.functions.BaseHandlerTest;
-import org.jclouds.http.functions.ParseSax;
-import org.jclouds.http.functions.config.SaxParserModule;
-import org.jclouds.trmk.ecloud.TerremarkECloudApiMetadata;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.Guice;
-import com.google.inject.name.Names;
-
-/**
- * Tests behavior of {@code TagNameToUsageCountHandler}
- *
- * @author Adrian Cole
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "TagNameToUsageCountHandlerTest")
-public class TagNameToUsageCountHandlerTest extends BaseHandlerTest {
- @Override
- @BeforeTest
- protected void setUpInjector() {
- injector = Guice.createInjector(new SaxParserModule() {
- @Override
- public void configure() {
- super.configure();
- Names.bindProperties(binder(),TerremarkECloudApiMetadata.defaultProperties());
- }
- });
- factory = injector.getInstance(ParseSax.Factory.class);
- assert factory != null;
- }
-
- public void testApplyInputStream() {
-
- InputStream is = getClass().getResourceAsStream("/deviceTags.xml");
-
- Map<String, Integer> result = factory.create(injector.getInstance(TagNameToUsageCountHandler.class)).parse(is);
- assertEquals(result, ImmutableMap.<String, Integer> of("Tag1", 1, "Tag2", 5, "Tag3", 12));
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/resources/CreateInternetService-options-test.xml
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/resources/CreateInternetService-options-test.xml b/providers/trmk-ecloud/src/test/resources/CreateInternetService-options-test.xml
deleted file mode 100644
index fcf847e..0000000
--- a/providers/trmk-ecloud/src/test/resources/CreateInternetService-options-test.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<CreateInternetServiceRequest
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="urn:tmrk:eCloudExtensions-2.8">
- <Name>name</Name>
- <Protocol>TCP</Protocol>
- <Port>22</Port>
- <Enabled>false</Enabled>
-
- <Description>yahoo</Description>
-
- <Monitor><MonitorType>Disabled</MonitorType></Monitor>
-</CreateInternetServiceRequest>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/resources/catalog-ecloud.xml
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/resources/catalog-ecloud.xml b/providers/trmk-ecloud/src/test/resources/catalog-ecloud.xml
deleted file mode 100644
index d5d4a85..0000000
--- a/providers/trmk-ecloud/src/test/resources/catalog-ecloud.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<Catalog
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/vdc/691/catalog"
- type="application/vnd.vmware.vcloud.catalog+xml" name="Opscode, Inc. Catalog"
- xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <CatalogItems>
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/36-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="CentOS 5 (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/35-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="CentOS 5 (x86)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/346-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="CentOS 5.5 x32" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/347-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="CentOS 5.5 x64" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/233-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="Red Hat Enterprise Linux 5 (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/107-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="Red Hat Enterprise Linux 5 (x86)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/348-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="Red Hat Enterprise Linux 5.5 x32" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/349-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="Red Hat Enterprise Linux 5.5 x64" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/6-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="Sun Solaris 10 (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/103-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="Ubuntu 8.04 LTS (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/55-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="Ubuntu 8.04 LTS (x86)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/350-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="Ubuntu Server 10.04 x32" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/351-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="Ubuntu Server 10.04 x64" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/325-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows 2003 Std. R2 SQL 2005 Std. (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/335-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows 2003 Std. R2 SQL 2008 Std. (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/340-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows 2008 R2 Std wSQL 2008 R2 Std (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/341-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows 2008 R2 Std wSQL 2008 R2 Web (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/336-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows 2008 Std wSQL 2008 Std (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/327-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows 2008 Std wSQL 2008 Web (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/249-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows Server 2003 R2 Enterprise Edition (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/248-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows Server 2003 R2 Enterprise Edition (x86)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/281-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows Server 2003 R2 Standard Edition (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/280-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows Server 2003 R2 Standard Edition (x86)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/261-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows Server 2008 Enterprise Edition (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/307-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows Server 2008 Enterprise Edition (x86)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/256-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows Server 2008 R2 Enterprise Edition (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/322-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows Server 2008 R2 Standard Edition (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/270-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows Server 2008 R2 Web Edition (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/269-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows Server 2008 Standard Edition (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/267-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows Server 2008 Standard Edition (x86)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/277-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows Server 2008 Web Edition (x64)" />
- <CatalogItem
- href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/catalogItem/276-691"
- type="application/vnd.vmware.vcloud.catalogItem+xml" name="-Windows Server 2008 Web Edition (x86)" />
- </CatalogItems>
-</Catalog>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/resources/deviceTags.xml
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/resources/deviceTags.xml b/providers/trmk-ecloud/src/test/resources/deviceTags.xml
deleted file mode 100644
index 232a49f..0000000
--- a/providers/trmk-ecloud/src/test/resources/deviceTags.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Tags xmlns="urn:tmrk:eCloudExtensions-2.8" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
-
- <Tag>
-
- <Name>Tag1</Name>
-
- <UsageCount>1</UsageCount>
-
- </Tag>
-
- <Tag>
-
- <Name>Tag2</Name>
-
- <UsageCount>5</UsageCount>
-
- </Tag>
-
- <Tag>
-
- <Name>Tag3</Name>
-
- <UsageCount>12</UsageCount>
-
- </Tag>
-
-</Tags>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/resources/log4j.xml b/providers/trmk-ecloud/src/test/resources/log4j.xml
deleted file mode 100644
index 63810d3..0000000
--- a/providers/trmk-ecloud/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
- <!--
- For more configuration infromation and examples see the Apache
- Log4j website: http://logging.apache.org/log4j/
- -->
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
- debug="false">
-
- <!-- A time/date based rolling appender -->
- <appender name="WIREFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-wire.log" />
- <param name="Append" value="true" />
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
- <param name="Threshold" value="TRACE" />
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
- <!--
- The full pattern: Date MS Priority [Category]
- (Thread:NDC) Message\n <param name="ConversionPattern"
- value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds.log" />
- <param name="Append" value="true" />
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
- <param name="Threshold" value="TRACE" />
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
- <!--
- The full pattern: Date MS Priority [Category]
- (Thread:NDC) Message\n <param name="ConversionPattern"
- value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- A time/date based rolling appender -->
- <appender name="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-compute.log" />
- <param name="Append" value="true" />
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
- <param name="Threshold" value="TRACE" />
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
- <!--
- The full pattern: Date MS Priority [Category]
- (Thread:NDC) Message\n <param name="ConversionPattern"
- value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- A time/date based rolling appender -->
- <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-ssh.log" />
- <param name="Append" value="true" />
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
- <param name="Threshold" value="TRACE" />
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
- <!--
- The full pattern: Date MS Priority [Category]
- (Thread:NDC) Message\n <param name="ConversionPattern"
- value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="COMPUTEFILE" />
- </appender>
-
- <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="SSHFILE" />
- </appender>
-
- <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="FILE" />
- </appender>
-
- <appender name="ASYNCWIRE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="WIREFILE" />
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jclouds">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNC" />
- </category>
-
- <category name="jclouds.headers">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCWIRE" />
- </category>
-
- <category name="jclouds.ssh">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCSSH" />
- </category>
-
- <category name="jclouds.wire">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCWIRE" />
- </category>
-
- <category name="jclouds.compute">
- <priority value="TRACE" />
- <appender-ref ref="ASYNCCOMPUTE" />
- </category>
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <priority value="WARN" />
- </root>
-
-</log4j:configuration>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-ecloud/src/test/resources/org-ecloud.xml
----------------------------------------------------------------------
diff --git a/providers/trmk-ecloud/src/test/resources/org-ecloud.xml b/providers/trmk-ecloud/src/test/resources/org-ecloud.xml
deleted file mode 100644
index 74888a9..0000000
--- a/providers/trmk-ecloud/src/test/resources/org-ecloud.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Org href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/org/1910324" name="Cloud Conscious, LLC" xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <Link rel="down" href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/vdc/1155" type="application/vnd.vmware.vcloud.vdc+xml" name="Cloud Conscious LLC - MIA"/>
- <Link rel="down" href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/vdc/1169" type="application/vnd.vmware.vcloud.vdc+xml" name="Cloud Conscious LLC - AMA"/>
- <Link rel="down" href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/vdc/1169/catalog" type="application/vnd.vmware.vcloud.catalog+xml" name="Cloud Conscious LLC - AMA Catalog"/>
- <Link rel="down" href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/vdc/1155/catalog" type="application/vnd.vmware.vcloud.catalog+xml" name="Cloud Conscious LLC - MIA Catalog"/>
- <Link rel="down" href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/vdc/1169/tasksList" type="application/vnd.vmware.vcloud.tasksList+xml" name="Cloud Conscious LLC - AMA Tasks List"/>
- <Link rel="down" href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/vdc/1155/tasksList" type="application/vnd.vmware.vcloud.tasksList+xml" name="Cloud Conscious LLC - MIA Tasks List"/>
- <Link rel="down" href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/org/1910324/keys" type="application/vnd.tmrk.ecloud.keysList+xml" name="Keys"/>
- <Link rel="down" href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/org/1910324/deviceTags" type="application/vnd.tmrk.ecloud.tagsList+xml" name="Device Tags"/>
- <Link rel="down" href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/org/1910324/vappCatalog" type="application/vnd.tmrk.ecloud.VAppCatalogList+xml" name="VApp Catalog"/>
- <Link rel="down" href="https://services.enterprisecloud.terremark.com/api/v0.8b-ext2.8/extensions/org/1910324/dataCenters" type="application/vnd.tmrk.ecloud.dataCentersList+xml" name="DataCenters"/>
-</Org>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-vcloudexpress/README.txt
----------------------------------------------------------------------
diff --git a/providers/trmk-vcloudexpress/README.txt b/providers/trmk-vcloudexpress/README.txt
deleted file mode 100644
index 129723a..0000000
--- a/providers/trmk-vcloudexpress/README.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# The jclouds provider for Terremark's vCloud Express (http://vcloudexpress.terremark.com/) platform.
-#
-# Expects the jclouds vcloudexpress API to be present on your application's classpath.
-#
-# TODO: Implementation status.
-# TODO: Supported features.
-# See http://code.google.com/p/jclouds/wiki/QuickStartTerremark for example usage.
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-vcloudexpress/pom.xml
----------------------------------------------------------------------
diff --git a/providers/trmk-vcloudexpress/pom.xml b/providers/trmk-vcloudexpress/pom.xml
deleted file mode 100644
index 045bfc0..0000000
--- a/providers/trmk-vcloudexpress/pom.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- <relativePath>../../project/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.jclouds.provider</groupId>
- <artifactId>trmk-vcloudexpress</artifactId>
- <name>jclouds Terremark vCloud Express provider</name>
- <description>jclouds Terremark vCloud Express provider</description>
- <packaging>bundle</packaging>
-
- <properties>
- <test.trmk-vcloudexpress.endpoint>https://services.vcloudexpress.terremark.com/api</test.trmk-vcloudexpress.endpoint>
- <test.trmk-vcloudexpress.api-version>0.8a-ext1.6</test.trmk-vcloudexpress.api-version>
- <test.trmk-vcloudexpress.build-version />
- <test.trmk-vcloudexpress.identity>FIXME</test.trmk-vcloudexpress.identity>
- <test.trmk-vcloudexpress.credential>FIXME</test.trmk-vcloudexpress.credential>
- <test.trmk-vcloudexpress.template />
-
- <jclouds.osgi.export>org.jclouds.trmk.ecloud*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds.common</groupId>
- <artifactId>trmk-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.common</groupId>
- <artifactId>trmk-common</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <threadCount>1</threadCount>
- <systemPropertyVariables>
- <test.trmk-vcloudexpress.endpoint>${test.trmk-vcloudexpress.endpoint}</test.trmk-vcloudexpress.endpoint>
- <test.trmk-vcloudexpress.api-version>${test.trmk-vcloudexpress.api-version}</test.trmk-vcloudexpress.api-version>
- <test.trmk-vcloudexpress.build-version>${test.trmk-vcloudexpress.build-version}</test.trmk-vcloudexpress.build-version>
- <test.trmk-vcloudexpress.identity>${test.trmk-vcloudexpress.identity}</test.trmk-vcloudexpress.identity>
- <test.trmk-vcloudexpress.credential>${test.trmk-vcloudexpress.credential}</test.trmk-vcloudexpress.credential>
- <test.trmk-vcloudexpress.template>${test.trmk-vcloudexpress.template}</test.trmk-vcloudexpress.template>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApi.java
----------------------------------------------------------------------
diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApi.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApi.java
deleted file mode 100644
index 7759dcf..0000000
--- a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApi.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloudexpress;
-
-import static javax.ws.rs.core.MediaType.APPLICATION_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.INTERNETSERVICE_XML;
-import static org.jclouds.trmk.vcloudexpress.TerremarkVCloudExpressMediaType.KEYSLIST_XML;
-
-import java.net.URI;
-import java.util.Set;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Produces;
-
-import org.jclouds.Fallbacks;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.MapBinder;
-import org.jclouds.rest.annotations.PayloadParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.XMLResponseParser;
-import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudApi;
-import org.jclouds.trmk.vcloud_0_8.binders.BindCreateKeyToXmlPayload;
-import org.jclouds.trmk.vcloud_0_8.domain.InternetService;
-import org.jclouds.trmk.vcloud_0_8.domain.KeyPair;
-import org.jclouds.trmk.vcloud_0_8.domain.Protocol;
-import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie;
-import org.jclouds.trmk.vcloud_0_8.functions.OrgURIToKeysListEndpoint;
-import org.jclouds.trmk.vcloud_0_8.functions.VDCURIToInternetServicesEndpoint;
-import org.jclouds.trmk.vcloud_0_8.options.AddInternetServiceOptions;
-import org.jclouds.trmk.vcloud_0_8.xml.InternetServiceHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.KeyPairByNameHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.KeyPairHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.KeyPairsHandler;
-
-/**
- * Provides access to VCloud resources via their REST API.
- * <p/>
- *
- * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx"
- * />
- * @author Adrian Cole
- */
-@RequestFilters(SetVCloudTokenCookie.class)
-public interface TerremarkVCloudExpressApi extends TerremarkVCloudApi {
-
- @POST
- @Produces(INTERNETSERVICE_XML)
- @Consumes(INTERNETSERVICE_XML)
- @XMLResponseParser(InternetServiceHandler.class)
- @MapBinder(AddInternetServiceOptions.class)
- InternetService addInternetServiceToVDC(
- @EndpointParam(parser = VDCURIToInternetServicesEndpoint.class) URI vDCId,
- @PayloadParam("name") String serviceName, @PayloadParam("protocol") Protocol protocol,
- @PayloadParam("port") int port, AddInternetServiceOptions... options);
-
- @GET
- @XMLResponseParser(KeyPairByNameHandler.class)
- @Consumes(KEYSLIST_XML)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- KeyPair findKeyPairInOrg(
- @Nullable @EndpointParam(parser = OrgURIToKeysListEndpoint.class) URI org, String keyName);
-
- @GET
- @Consumes(KEYSLIST_XML)
- @XMLResponseParser(KeyPairsHandler.class)
- @Fallback(Fallbacks.EmptySetOnNotFoundOr404.class)
- Set<KeyPair> listKeyPairsInOrg(
- @Nullable @EndpointParam(parser = OrgURIToKeysListEndpoint.class) URI org);
-
- @GET
- @Consumes(KEYSLIST_XML)
- @XMLResponseParser(KeyPairsHandler.class)
- @Fallback(Fallbacks.EmptySetOnNotFoundOr404.class)
- Set<KeyPair> listKeyPairs(@EndpointParam URI keysList);
-
- @POST
- @Produces(KEYSLIST_XML)
- @Consumes(KEYSLIST_XML)
- @XMLResponseParser(KeyPairHandler.class)
- @MapBinder(BindCreateKeyToXmlPayload.class)
- KeyPair generateKeyPairInOrg(
- @EndpointParam(parser = OrgURIToKeysListEndpoint.class) URI org, @PayloadParam("name") String name,
- @PayloadParam("isDefault") boolean makeDefault);
-
- @GET
- @XMLResponseParser(KeyPairHandler.class)
- @Consumes(APPLICATION_XML)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- KeyPair getKeyPair(@EndpointParam URI keyId);
-
- @DELETE
- @Fallback(Fallbacks.VoidOnNotFoundOr404.class)
- void deleteKeyPair(@EndpointParam URI keyId);
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApiMetadata.java
----------------------------------------------------------------------
diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApiMetadata.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApiMetadata.java
deleted file mode 100644
index f5a2d5a..0000000
--- a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApiMetadata.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloudexpress;
-
-import static org.jclouds.trmk.vcloud_0_8.reference.TerremarkConstants.PROPERTY_TERREMARK_EXTENSION_NAME;
-import static org.jclouds.trmk.vcloud_0_8.reference.TerremarkConstants.PROPERTY_TERREMARK_EXTENSION_VERSION;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.apis.ApiMetadata;
-import org.jclouds.trmk.vcloud_0_8.internal.TerremarkVCloudApiMetadata;
-import org.jclouds.trmk.vcloudexpress.compute.TerremarkVCloudExpressComputeServiceContextModule;
-import org.jclouds.trmk.vcloudexpress.config.TerremarkVCloudExpressHttpApiModule;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-
-/**
- * Implementation of {@link ApiMetadata} for the Terremark vCloud Express API
- *
- * @author Adrian Cole
- */
-public class TerremarkVCloudExpressApiMetadata extends TerremarkVCloudApiMetadata {
-
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromApiMetadata(this);
- }
-
- public TerremarkVCloudExpressApiMetadata() {
- this(new Builder());
- }
-
- protected TerremarkVCloudExpressApiMetadata(Builder builder) {
- super(builder);
- }
-
- public static Properties defaultProperties() {
- Properties properties = TerremarkVCloudApiMetadata.defaultProperties();
- properties.setProperty(PROPERTY_TERREMARK_EXTENSION_NAME, "vCloudExpressExtensions");
- properties.setProperty(PROPERTY_TERREMARK_EXTENSION_VERSION, "1.6");
- return properties;
- }
-
- public static class Builder extends TerremarkVCloudApiMetadata.Builder<Builder> {
-
- @SuppressWarnings("deprecation")
- protected Builder() {
- id("trmk-vcloudexpress")
- .name("Terremark vCloud Express API")
- .identityName("Email")
- .credentialName("Password")
- .version("0.8a-ext1.6")
- .defaultEndpoint("https://services.vcloudexpress.terremark.com/api")
- .documentation(URI.create("https://community.vcloudexpress.terremark.com/en-us/product_docs/m/vcefiles/2342.aspx"))
- .defaultProperties(TerremarkVCloudExpressApiMetadata.defaultProperties())
- .defaultModules(ImmutableSet.<Class<? extends Module>>of(TerremarkVCloudExpressHttpApiModule.class, TerremarkVCloudExpressComputeServiceContextModule.class));
- }
-
- @Override
- public TerremarkVCloudExpressApiMetadata build() {
- return new TerremarkVCloudExpressApiMetadata(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressMediaType.java
----------------------------------------------------------------------
diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressMediaType.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressMediaType.java
deleted file mode 100644
index 9b88b37..0000000
--- a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressMediaType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloudexpress;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType;
-
-/**
- * Resource Types used in Terremark VCloud express
- *
- * @see MediaType
- */
-public interface TerremarkVCloudExpressMediaType extends TerremarkVCloudMediaType {
- /**
- * "application/vnd.tmrk.vcloudExpress.keysList+xml"
- */
- public static final String KEYSLIST_XML = "application/vnd.tmrk.vcloudExpress.keysList+xml";
-
- /**
- * "application/vnd.tmrk.vCloudExpress.keysList+xml"
- */
- public static final MediaType KEYSLIST_XML_TYPE = new MediaType("application",
- "vnd.tmrk.vcloudExpress.keysList+xml");
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderMetadata.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderMetadata.java
deleted file mode 100644
index 4962b4f..0000000
--- a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderMetadata.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloudexpress;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-
-/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Terremark's Enterprise Cloud.
- *
- * @author Adrian Cole
- */
-public class TerremarkVCloudExpressProviderMetadata extends BaseProviderMetadata {
-
- public static Builder builder() {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder() {
- return builder().fromProviderMetadata(this);
- }
-
- public TerremarkVCloudExpressProviderMetadata() {
- super(builder());
- }
-
- public TerremarkVCloudExpressProviderMetadata(Builder builder) {
- super(builder);
- }
-
- public static Properties defaultProperties() {
- Properties properties = new Properties();
- return properties;
- }
-
- public static class Builder extends BaseProviderMetadata.Builder {
-
- protected Builder(){
- id("trmk-vcloudexpress")
- .name("Terremark vCloud Express")
- .apiMetadata(new TerremarkVCloudExpressApiMetadata())
- .endpoint("https://services.vcloudexpress.terremark.com/api")
- .homepage(URI.create("https://vcloudexpress.terremark.com/"))
- .console(URI.create("https://my.vcloudexpress.terremark.com"))
- .iso3166Codes("US-FL")
- .defaultProperties(TerremarkVCloudExpressProviderMetadata.defaultProperties());
- }
-
- @Override
- public TerremarkVCloudExpressProviderMetadata build() {
- return new TerremarkVCloudExpressProviderMetadata(this);
- }
-
- @Override
- public Builder fromProviderMetadata(
- ProviderMetadata in) {
- super.fromProviderMetadata(in);
- return this;
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/compute/TerremarkVCloudExpressComputeServiceContextModule.java
----------------------------------------------------------------------
diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/compute/TerremarkVCloudExpressComputeServiceContextModule.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/compute/TerremarkVCloudExpressComputeServiceContextModule.java
deleted file mode 100644
index 3445b3d..0000000
--- a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/compute/TerremarkVCloudExpressComputeServiceContextModule.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloudexpress.compute;
-
-import org.jclouds.trmk.vcloud_0_8.compute.config.TerremarkVCloudComputeServiceContextModule;
-import org.jclouds.trmk.vcloud_0_8.suppliers.InternetServiceAndPublicIpAddressSupplier;
-import org.jclouds.trmk.vcloudexpress.suppliers.TerremarkVCloudExpressInternetServiceAndPublicIpAddressSupplier;
-
-/**
- * @author Adrian Cole
- */
-public class TerremarkVCloudExpressComputeServiceContextModule extends TerremarkVCloudComputeServiceContextModule {
-
- @Override
- protected void configure() {
- bind(InternetServiceAndPublicIpAddressSupplier.class).to(
- TerremarkVCloudExpressInternetServiceAndPublicIpAddressSupplier.class);
- super.configure();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/config/TerremarkVCloudExpressHttpApiModule.java
----------------------------------------------------------------------
diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/config/TerremarkVCloudExpressHttpApiModule.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/config/TerremarkVCloudExpressHttpApiModule.java
deleted file mode 100644
index b24b303..0000000
--- a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/config/TerremarkVCloudExpressHttpApiModule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloudexpress.config;
-
-import javax.inject.Singleton;
-
-import org.jclouds.rest.ConfiguresRestClient;
-import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudApi;
-import org.jclouds.trmk.vcloud_0_8.config.TerremarkVCloudHttpApiModule;
-import org.jclouds.trmk.vcloudexpress.TerremarkVCloudExpressApi;
-
-import com.google.inject.Provides;
-
-/**
- * Configures the VCloud authentication service connection, including logging
- * and http transport.
- *
- * @author Adrian Cole
- */
-@ConfiguresRestClient
-public class TerremarkVCloudExpressHttpApiModule extends
- TerremarkVCloudHttpApiModule<TerremarkVCloudExpressApi> {
-
- @Provides
- @Singleton
- protected TerremarkVCloudApi provideVCloudApi(TerremarkVCloudExpressApi in) {
- return in;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/suppliers/TerremarkVCloudExpressInternetServiceAndPublicIpAddressSupplier.java
----------------------------------------------------------------------
diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/suppliers/TerremarkVCloudExpressInternetServiceAndPublicIpAddressSupplier.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/suppliers/TerremarkVCloudExpressInternetServiceAndPublicIpAddressSupplier.java
deleted file mode 100644
index 5d95d14..0000000
--- a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/suppliers/TerremarkVCloudExpressInternetServiceAndPublicIpAddressSupplier.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloudexpress.suppliers;
-
-import static org.jclouds.trmk.vcloud_0_8.options.AddInternetServiceOptions.Builder.withDescription;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.logging.Logger;
-import org.jclouds.trmk.vcloud_0_8.domain.InternetService;
-import org.jclouds.trmk.vcloud_0_8.domain.Protocol;
-import org.jclouds.trmk.vcloud_0_8.domain.PublicIpAddress;
-import org.jclouds.trmk.vcloud_0_8.domain.VApp;
-import org.jclouds.trmk.vcloud_0_8.suppliers.InternetServiceAndPublicIpAddressSupplier;
-import org.jclouds.trmk.vcloudexpress.TerremarkVCloudExpressApi;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class TerremarkVCloudExpressInternetServiceAndPublicIpAddressSupplier implements
- InternetServiceAndPublicIpAddressSupplier {
-
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- public Logger logger = Logger.NULL;
- protected final TerremarkVCloudExpressApi client;
-
- @Inject
- public TerremarkVCloudExpressInternetServiceAndPublicIpAddressSupplier(TerremarkVCloudExpressApi client) {
- this.client = client;
- }
-
- @Override
- public Entry<InternetService, PublicIpAddress> getNewInternetServiceAndIp(VApp vApp, int port, Protocol protocol) {
- logger.debug(">> creating InternetService in vDC %s:%s:%d", vApp.getVDC().getHref(), protocol, port);
- InternetService is = client.addInternetServiceToVDC(
- vApp.getVDC().getHref(),
- vApp.getName() + "-" + port,
- protocol,
- port,
- withDescription(String.format("port %d access to serverId: %s name: %s", port, vApp.getName(),
- vApp.getName())));
- PublicIpAddress ip = is.getPublicIpAddress();
- Map<InternetService, PublicIpAddress> result = ImmutableMap.<InternetService, PublicIpAddress> of(is, ip);
- Entry<InternetService, PublicIpAddress> entry = Iterables.getOnlyElement(result.entrySet());
- return entry;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-vcloudexpress/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/trmk-vcloudexpress/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/trmk-vcloudexpress/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index d4c5daf..0000000
--- a/providers/trmk-vcloudexpress/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.trmk.vcloudexpress.TerremarkVCloudExpressProviderMetadata
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/InternetServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/InternetServiceLiveTest.java b/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/InternetServiceLiveTest.java
deleted file mode 100644
index 71169c5..0000000
--- a/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/InternetServiceLiveTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloudexpress;
-
-import java.net.URI;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
-
-import org.jclouds.compute.internal.BaseComputeServiceContextLiveTest;
-import org.jclouds.trmk.vcloud_0_8.domain.InternetService;
-import org.jclouds.trmk.vcloud_0_8.domain.Node;
-import org.jclouds.trmk.vcloud_0_8.domain.PublicIpAddress;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.Sets;
-
-/**
- * Tests behavior of {@code TerremarkVCloudApi}
- *
- * @author Adrian Cole
- */
-@Test(groups = "live", singleThreaded = true, testName = "InternetServiceLiveTest")
-public class InternetServiceLiveTest
- extends
- BaseComputeServiceContextLiveTest {
- public InternetServiceLiveTest() {
- provider = "trmk-vcloudexpress";
- }
-
- TerremarkVCloudExpressApi tmClient;
-
- private Set<InternetService> services = Sets.newLinkedHashSet();
-
- public static final String PREFIX = System.getProperty("user.name") + "-terremark";
-
- @Test
- public void testGetAllInternetServices() throws Exception {
- tmClient.getAllInternetServicesInVDC(tmClient.findVDCInOrgNamed(null, null).getHref());
- }
-
- private void delete(Set<InternetService> set) {
- Set<URI> publicIps = Sets.newHashSet();
- for (InternetService service : set) {
- for (Node node : tmClient.getNodes(service.getId())) {
- tmClient.deleteNode(node.getId());
- }
- tmClient.deleteInternetService(service.getId());
- publicIps.add(service.getPublicIpAddress().getId());
- }
- for (URI id : publicIps) {
- tmClient.deletePublicIp(id);
- }
- }
-
- @Test
- public void testGetAllPublicIps() throws Exception {
- for (PublicIpAddress ip : tmClient
- .getPublicIpsAssociatedWithVDC(tmClient.findVDCInOrgNamed(null, null).getHref())) {
- tmClient.getInternetServicesOnPublicIp(ip.getId());
- }
- }
-
- @AfterTest
- void cleanup() throws InterruptedException, ExecutionException, TimeoutException {
- delete(services);
- }
-
- @Override
- @BeforeClass(groups = { "integration", "live" })
- public void setupContext() {
- super.setupContext();
- tmClient = view.unwrapApi(TerremarkVCloudExpressApi.class);
-
- }
-
- void print(Set<InternetService> set) {
- for (InternetService service : set) {
- System.out.printf("%d (%s:%d%n)", service.getName(), service.getPublicIpAddress().getAddress(), service
- .getPort());
- for (Node node : tmClient.getNodes(service.getId())) {
- System.out.printf(" %d (%s:%d%n)", node.getName(), node.getIpAddress(), node.getPort());
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApiLiveTest.java b/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApiLiveTest.java
deleted file mode 100644
index 73cf69a..0000000
--- a/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApiLiveTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloudexpress;
-
-import java.util.Map.Entry;
-
-import org.jclouds.domain.LoginCredentials;
-import org.jclouds.ssh.SshClient;
-import org.jclouds.trmk.vcloud_0_8.TerremarkApiLiveTest;
-import org.jclouds.trmk.vcloud_0_8.domain.InternetService;
-import org.jclouds.trmk.vcloud_0_8.domain.Protocol;
-import org.jclouds.trmk.vcloud_0_8.domain.PublicIpAddress;
-import org.jclouds.trmk.vcloud_0_8.domain.VApp;
-import org.jclouds.trmk.vcloudexpress.suppliers.TerremarkVCloudExpressInternetServiceAndPublicIpAddressSupplier;
-import org.testng.annotations.Test;
-
-import com.google.common.net.HostAndPort;
-
-/**
- * Tests behavior of {@code TerremarkVCloudExpressApi}
- *
- * @author Adrian Cole
- */
-@Test(groups = "live", singleThreaded = true, testName = "TerremarkVCloudExpressApiLiveTest")
-public class TerremarkVCloudExpressApiLiveTest extends TerremarkApiLiveTest {
-
- @Override
- protected SshClient getConnectionFor(HostAndPort socket) {
- return sshFactory.create(socket, LoginCredentials.builder().user("vcloud").password("TmrkCl0ud1s#1!").privateKey(
- key.getPrivateKey()).authenticateSudo(true).build());
- }
-
- @Override
- protected Entry<InternetService, PublicIpAddress> getNewInternetServiceAndIpForSSH(VApp vApp) {
- return new TerremarkVCloudExpressInternetServiceAndPublicIpAddressSupplier(
- TerremarkVCloudExpressApi.class.cast(api)).getNewInternetServiceAndIp(vApp, 22, Protocol.TCP);
- }
-}