JCLOUDS-743 - Remove greenhousedata-element-vcloud provider
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/cc35ae55 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/cc35ae55 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/cc35ae55 Branch: refs/heads/use-agentproxy-008 Commit: cc35ae557c529c9312614aee6c356fb18903a8a5 Parents: 8639f5c Author: Adrian Cole <[email protected]> Authored: Sat Oct 4 09:12:12 2014 -0700 Committer: Jeremy Daggett <[email protected]> Committed: Sat Oct 4 16:43:27 2014 -0700 ---------------------------------------------------------------------- allcompute/pom.xml | 5 - providers/greenhousedata-element-vcloud/pom.xml | 125 --------------- ...nHouseDataElementVCloudProviderMetadata.java | 90 ----------- ...lementVCloudComputeServiceContextModule.java | 35 ----- .../org.jclouds.providers.ProviderMetadata | 1 - ...GreenHouseDataElementVCloudProviderTest.java | 29 ---- ...DataElementVCloudComputeServiceLiveTest.java | 28 ---- ...ataElementVCloudTemplateBuilderLiveTest.java | 71 --------- ...ouseDataElementVCloudCatalogApiLiveTest.java | 28 ---- ...ouseDataElementVCloudNetworkApiLiveTest.java | 28 ---- ...eenHouseDataElementVCloudOrgApiLiveTest.java | 28 ---- ...enHouseDataElementVCloudTaskApiLiveTest.java | 28 ---- ...enHouseDataElementVCloudVAppApiLiveTest.java | 28 ---- ...ataElementVCloudVAppTemplateApiLiveTest.java | 28 ---- ...eenHouseDataElementVCloudVDCApiLiveTest.java | 28 ---- ...reenHouseDataElementVCloudVmApiLiveTest.java | 29 ---- .../src/test/resources/log4j.xml | 157 ------------------- providers/pom.xml | 1 - 18 files changed, 767 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/allcompute/pom.xml ---------------------------------------------------------------------- diff --git a/allcompute/pom.xml b/allcompute/pom.xml index 4b61b0a..b911cff 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -30,11 +30,6 @@ <dependencies> <dependency> <groupId>org.apache.jclouds.provider</groupId> - <artifactId>greenhousedata-element-vcloud</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds.provider</groupId> <artifactId>aws-ec2</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/pom.xml ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/pom.xml b/providers/greenhousedata-element-vcloud/pom.xml deleted file mode 100644 index 5b5e1c7..0000000 --- a/providers/greenhousedata-element-vcloud/pom.xml +++ /dev/null @@ -1,125 +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>2.0.0-SNAPSHOT</version> - <relativePath>../../project/pom.xml</relativePath> - </parent> - <groupId>org.apache.jclouds.provider</groupId> - <artifactId>greenhousedata-element-vcloud</artifactId> - <name>jclouds Green House Data Element vCloud provider</name> - <description>vCloud implementation targeted to Green House Data Element</description> - <packaging>bundle</packaging> - - <properties> - <test.greenhousedata-element-vcloud.endpoint>https://mycloud.greenhousedata.com/api</test.greenhousedata-element-vcloud.endpoint> - <test.greenhousedata-element-vcloud.api-version>1.0</test.greenhousedata-element-vcloud.api-version> - <test.greenhousedata-element-vcloud.build-version>1.5.0.464915</test.greenhousedata-element-vcloud.build-version> - <test.greenhousedata-element-vcloud.identity>FIXME_IDENTITY</test.greenhousedata-element-vcloud.identity> - <test.greenhousedata-element-vcloud.credential>FIXME_CREDENTIAL</test.greenhousedata-element-vcloud.credential> - <test.greenhousedata-element-vcloud.template /> - <jclouds.osgi.export>org.jclouds.greenhousedata.element.vcloud*;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.api</groupId> - <artifactId>vcloud</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>vcloud</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> - <systemPropertyVariables> - <test.greenhousedata-element-vcloud.endpoint>${test.greenhousedata-element-vcloud.endpoint}</test.greenhousedata-element-vcloud.endpoint> - <test.greenhousedata-element-vcloud.api-version>${test.greenhousedata-element-vcloud.api-version}</test.greenhousedata-element-vcloud.api-version> - <test.greenhousedata-element-vcloud.build-version>${test.greenhousedata-element-vcloud.build-version}</test.greenhousedata-element-vcloud.build-version> - <test.greenhousedata-element-vcloud.identity>${test.greenhousedata-element-vcloud.identity}</test.greenhousedata-element-vcloud.identity> - <test.greenhousedata-element-vcloud.credential>${test.greenhousedata-element-vcloud.credential}</test.greenhousedata-element-vcloud.credential> - <test.greenhousedata-element-vcloud.template>${test.greenhousedata-element-vcloud.template}</test.greenhousedata-element-vcloud.template> - </systemPropertyVariables> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> - http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderMetadata.java b/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderMetadata.java deleted file mode 100644 index 1aa5288..0000000 --- a/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderMetadata.java +++ /dev/null @@ -1,90 +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.greenhousedata.element.vcloud; - -import static org.jclouds.vcloud.reference.VCloudConstants.PROPERTY_VCLOUD_DEFAULT_NETWORK; - -import java.net.URI; -import java.util.Properties; - -import org.jclouds.greenhousedata.element.vcloud.config.GreenHouseDataElementVCloudComputeServiceContextModule; -import org.jclouds.providers.ProviderMetadata; -import org.jclouds.providers.internal.BaseProviderMetadata; -import org.jclouds.vcloud.VCloudApiMetadata; -import org.jclouds.vcloud.config.VCloudHttpApiModule; - -import com.google.common.collect.ImmutableSet; -import com.google.inject.Module; - -/** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Green House Data Element vCloud - */ -public class GreenHouseDataElementVCloudProviderMetadata extends BaseProviderMetadata { - - public static Builder builder() { - return new Builder(); - } - - @Override - public Builder toBuilder() { - return builder().fromProviderMetadata(this); - } - - public GreenHouseDataElementVCloudProviderMetadata() { - super(builder()); - } - - public GreenHouseDataElementVCloudProviderMetadata(Builder builder) { - super(builder); - } - - public static Properties defaultProperties() { - Properties properties = new Properties(); - properties.setProperty(PROPERTY_VCLOUD_DEFAULT_NETWORK, "orgNet-.*-External"); - return properties; - } - - public static class Builder extends BaseProviderMetadata.Builder { - - protected Builder() { - id("greenhousedata-element-vcloud") - .name("Green House Data Element vCloud") - .apiMetadata( - new VCloudApiMetadata().toBuilder() - .buildVersion("1.5.0.464915") - .defaultModules(ImmutableSet.<Class<? extends Module>>of(VCloudHttpApiModule.class, GreenHouseDataElementVCloudComputeServiceContextModule.class)) - .build()) - .homepage(URI.create("http://www.greenhousedata.com/element-cloud-hosting/vcloud-services/";)) - .console(URI.create("https://mycloud.greenhousedata.com/cloud/org/YOUR_ORG_HERE";)) - .iso3166Codes("US-WY") - .endpoint("https://mycloud.greenhousedata.com/api";) - .defaultProperties(GreenHouseDataElementVCloudProviderMetadata.defaultProperties()); - } - - @Override - public GreenHouseDataElementVCloudProviderMetadata build() { - return new GreenHouseDataElementVCloudProviderMetadata(this); - } - - @Override - public Builder fromProviderMetadata( - ProviderMetadata in) { - super.fromProviderMetadata(in); - return this; - } - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/config/GreenHouseDataElementVCloudComputeServiceContextModule.java ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/config/GreenHouseDataElementVCloudComputeServiceContextModule.java b/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/config/GreenHouseDataElementVCloudComputeServiceContextModule.java deleted file mode 100644 index 425b1ee..0000000 --- a/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/config/GreenHouseDataElementVCloudComputeServiceContextModule.java +++ /dev/null @@ -1,35 +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.greenhousedata.element.vcloud.config; - -import org.jclouds.compute.options.TemplateOptions; -import org.jclouds.vcloud.compute.config.VCloudComputeServiceContextModule; -import org.jclouds.vcloud.compute.options.VCloudTemplateOptions; -import org.jclouds.vcloud.domain.network.IpAddressAllocationMode; - -import com.google.inject.Injector; - -/** - * per docs, we are to use pool mode. - */ -public class GreenHouseDataElementVCloudComputeServiceContextModule extends VCloudComputeServiceContextModule { - - @Override - protected TemplateOptions provideTemplateOptions(Injector injector, TemplateOptions options) { - return options.as(VCloudTemplateOptions.class).ipAddressAllocationMode(IpAddressAllocationMode.POOL); - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/greenhousedata-element-vcloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 84a4ce2..0000000 --- a/providers/greenhousedata-element-vcloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.greenhousedata.element.vcloud.GreenHouseDataElementVCloudProviderMetadata http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderTest.java ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderTest.java b/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderTest.java deleted file mode 100644 index e01eb83..0000000 --- a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderTest.java +++ /dev/null @@ -1,29 +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.greenhousedata.element.vcloud; - -import org.jclouds.providers.internal.BaseProviderMetadataTest; -import org.jclouds.vcloud.VCloudApiMetadata; -import org.testng.annotations.Test; - -@Test(groups = "unit", testName = "GreenHouseDataElementVCloudProviderTest") -public class GreenHouseDataElementVCloudProviderTest extends BaseProviderMetadataTest { - - public GreenHouseDataElementVCloudProviderTest() { - super(new GreenHouseDataElementVCloudProviderMetadata(), new VCloudApiMetadata()); - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/compute/GreenHouseDataElementVCloudComputeServiceLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/compute/GreenHouseDataElementVCloudComputeServiceLiveTest.java b/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/compute/GreenHouseDataElementVCloudComputeServiceLiveTest.java deleted file mode 100644 index fa2850f..0000000 --- a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/compute/GreenHouseDataElementVCloudComputeServiceLiveTest.java +++ /dev/null @@ -1,28 +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.greenhousedata.element.vcloud.compute; - -import org.jclouds.vcloud.compute.VCloudComputeServiceLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "GreenHouseDataElementVCloudComputeServiceLiveTest") -public class GreenHouseDataElementVCloudComputeServiceLiveTest extends VCloudComputeServiceLiveTest { - public GreenHouseDataElementVCloudComputeServiceLiveTest() { - provider = "greenhousedata-element-vcloud"; - } - -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/compute/GreenHouseDataElementVCloudTemplateBuilderLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/compute/GreenHouseDataElementVCloudTemplateBuilderLiveTest.java b/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/compute/GreenHouseDataElementVCloudTemplateBuilderLiveTest.java deleted file mode 100644 index 31f586e..0000000 --- a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/compute/GreenHouseDataElementVCloudTemplateBuilderLiveTest.java +++ /dev/null @@ -1,71 +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.greenhousedata.element.vcloud.compute; - -import static org.jclouds.compute.util.ComputeServiceUtils.getCores; -import static org.testng.Assert.assertEquals; - -import java.io.IOException; -import java.util.Set; - -import org.jclouds.compute.domain.OsFamily; -import org.jclouds.compute.domain.OsFamilyVersion64Bit; -import org.jclouds.compute.domain.Template; -import org.jclouds.compute.internal.BaseTemplateBuilderLiveTest; -import org.testng.annotations.Test; - -import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableSet; - -@Test(groups = "live", testName = "GreenHouseDataElementVCloudTemplateBuilderLiveTest") -public class GreenHouseDataElementVCloudTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest { - - public GreenHouseDataElementVCloudTemplateBuilderLiveTest() { - provider = "greenhousedata-element-vcloud"; - } - - @Override - protected Predicate<OsFamilyVersion64Bit> defineUnsupportedOperatingSystems() { - return new Predicate<OsFamilyVersion64Bit>() { - - @Override - public boolean apply(OsFamilyVersion64Bit input) { - switch (input.family) { - case UBUNTU: - return !input.version.equals("") || !input.is64Bit; - default: - return true; - } - } - - }; - } - - @Override - public void testDefaultTemplateBuilder() throws IOException { - Template defaultTemplate = view.getComputeService().templateBuilder().build(); - assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), ""); - assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); - assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); - assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); - } - - @Override - protected Set<String> getIso3166Codes() { - return ImmutableSet.<String> of("US-WY"); - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudCatalogApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudCatalogApiLiveTest.java b/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudCatalogApiLiveTest.java deleted file mode 100644 index ba18cee..0000000 --- a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudCatalogApiLiveTest.java +++ /dev/null @@ -1,28 +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.greenhousedata.element.vcloud.features; - -import org.jclouds.vcloud.features.CatalogApiLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "GreenHouseDataElementVCloudCatalogApiLiveTest") -public class GreenHouseDataElementVCloudCatalogApiLiveTest extends CatalogApiLiveTest { - - public GreenHouseDataElementVCloudCatalogApiLiveTest() { - provider = "greenhousedata-element-vcloud"; - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudNetworkApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudNetworkApiLiveTest.java b/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudNetworkApiLiveTest.java deleted file mode 100644 index 8053294..0000000 --- a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudNetworkApiLiveTest.java +++ /dev/null @@ -1,28 +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.greenhousedata.element.vcloud.features; - -import org.jclouds.vcloud.features.NetworkApiLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "GreenHouseDataElementVCloudNetworkApiLiveTest") -public class GreenHouseDataElementVCloudNetworkApiLiveTest extends NetworkApiLiveTest { - - public GreenHouseDataElementVCloudNetworkApiLiveTest() { - provider = "greenhousedata-element-vcloud"; - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudOrgApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudOrgApiLiveTest.java b/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudOrgApiLiveTest.java deleted file mode 100644 index eea7a5e..0000000 --- a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudOrgApiLiveTest.java +++ /dev/null @@ -1,28 +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.greenhousedata.element.vcloud.features; - -import org.jclouds.vcloud.features.OrgApiLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "GreenHouseDataElementVCloudOrgApiLiveTest") -public class GreenHouseDataElementVCloudOrgApiLiveTest extends OrgApiLiveTest { - - public GreenHouseDataElementVCloudOrgApiLiveTest() { - provider = "greenhousedata-element-vcloud"; - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudTaskApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudTaskApiLiveTest.java b/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudTaskApiLiveTest.java deleted file mode 100644 index 9b21369..0000000 --- a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudTaskApiLiveTest.java +++ /dev/null @@ -1,28 +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.greenhousedata.element.vcloud.features; - -import org.jclouds.vcloud.features.TaskApiLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "GreenHouseDataElementVCloudTaskApiLiveTest") -public class GreenHouseDataElementVCloudTaskApiLiveTest extends TaskApiLiveTest { - - public GreenHouseDataElementVCloudTaskApiLiveTest() { - provider = "greenhousedata-element-vcloud"; - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVAppApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVAppApiLiveTest.java b/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVAppApiLiveTest.java deleted file mode 100644 index 7272047..0000000 --- a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVAppApiLiveTest.java +++ /dev/null @@ -1,28 +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.greenhousedata.element.vcloud.features; - -import org.jclouds.vcloud.features.VAppApiLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "GreenHouseDataElementVCloudVAppApiLiveTest") -public class GreenHouseDataElementVCloudVAppApiLiveTest extends VAppApiLiveTest { - - public GreenHouseDataElementVCloudVAppApiLiveTest() { - provider = "greenhousedata-element-vcloud"; - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVAppTemplateApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVAppTemplateApiLiveTest.java b/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVAppTemplateApiLiveTest.java deleted file mode 100644 index ee49804..0000000 --- a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVAppTemplateApiLiveTest.java +++ /dev/null @@ -1,28 +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.greenhousedata.element.vcloud.features; - -import org.jclouds.vcloud.features.VAppTemplateApiLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "GreenHouseDataElementVCloudVAppTemplateApiLiveTest") -public class GreenHouseDataElementVCloudVAppTemplateApiLiveTest extends VAppTemplateApiLiveTest { - - public GreenHouseDataElementVCloudVAppTemplateApiLiveTest() { - provider = "greenhousedata-element-vcloud"; - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVDCApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVDCApiLiveTest.java b/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVDCApiLiveTest.java deleted file mode 100644 index d0f569a..0000000 --- a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVDCApiLiveTest.java +++ /dev/null @@ -1,28 +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.greenhousedata.element.vcloud.features; - -import org.jclouds.vcloud.features.VDCApiLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "GreenHouseDataElementVCloudVDCApiLiveTest") -public class GreenHouseDataElementVCloudVDCApiLiveTest extends VDCApiLiveTest { - - public GreenHouseDataElementVCloudVDCApiLiveTest() { - provider = "greenhousedata-element-vcloud"; - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVmApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVmApiLiveTest.java b/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVmApiLiveTest.java deleted file mode 100644 index 76cb2b5..0000000 --- a/providers/greenhousedata-element-vcloud/src/test/java/org/jclouds/greenhousedata/element/vcloud/features/GreenHouseDataElementVCloudVmApiLiveTest.java +++ /dev/null @@ -1,29 +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.greenhousedata.element.vcloud.features; - -import org.jclouds.vcloud.features.VmApiLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "GreenHouseDataElementVCloudVmApiLiveTest") -public class GreenHouseDataElementVCloudVmApiLiveTest extends VmApiLiveTest { - - public GreenHouseDataElementVCloudVmApiLiveTest() { - provider = "greenhousedata-element-vcloud"; - } - -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc35ae55/providers/greenhousedata-element-vcloud/src/test/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/providers/greenhousedata-element-vcloud/src/test/resources/log4j.xml b/providers/greenhousedata-element-vcloud/src/test/resources/log4j.xml deleted file mode 100644 index daefa0e..0000000 --- a/providers/greenhousedata-element-vcloud/src/test/resources/log4j.xml +++ /dev/null @@ -1,157 +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> - - <!-- set to trace to get more info when parser fail --> - <category name="org.jclouds.http.functions.ParseSax"> - <priority value="TRACE" /> - <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/jclouds/blob/cc35ae55/providers/pom.xml ---------------------------------------------------------------------- diff --git a/providers/pom.xml b/providers/pom.xml index 6cccf18..08160de 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -49,7 +49,6 @@ <module>openhosting-east1</module> <module>serverlove-z1-man</module> <module>skalicloud-sdg-my</module> - <module>greenhousedata-element-vcloud</module> <module>go2cloud-jhb1</module> <module>softlayer</module> <module>hpcloud-compute</module>
