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 2014/10/05 19:28:11 UTC

[8/9] git commit: Remove cloudstack-ec2, which hasn't been published in over a year.

Remove cloudstack-ec2, which hasn't been published in over a year.


Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/ba934d26
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/ba934d26
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/ba934d26

Branch: refs/heads/master
Commit: ba934d267edba6f9c13b503e947fe524c7fca7cd
Parents: 065071c
Author: Adrian Cole <ad...@gmail.com>
Authored: Sun Oct 5 09:20:41 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Sun Oct 5 10:22:54 2014 -0700

----------------------------------------------------------------------
 cloudstack-ec2/pom.xml                          | 128 -------------------
 .../ec2/CloudStackEC2ApiMetadata.java           |  82 ------------
 .../config/CloudStackEC2RestClientModule.java   |  35 -----
 .../services/org.jclouds.apis.ApiMetadata       |   1 -
 .../ec2/CloudStackEC2ApiMetadataTest.java       |  28 ----
 .../features/CloudStackSubnetApiLiveTest.java   |  27 ----
 .../BaseCloudStackEC2RestClientExpectTest.java  |  48 -------
 .../CloudStackEC2AMIClientLiveTest.java         |  28 ----
 ...AvailabilityZoneAndRegionClientLiveTest.java |  28 ----
 ...StackEC2ElasticBlockStoreClientLiveTest.java |  28 ----
 ...dStackEC2ElasticIPAddressClientLiveTest.java |  28 ----
 .../CloudStackEC2InstanceClientLiveTest.java    |  28 ----
 .../CloudStackEC2KeyPairClientLiveTest.java     |  28 ----
 ...loudStackEC2SecurityGroupClientLiveTest.java |  28 ----
 14 files changed, 545 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba934d26/cloudstack-ec2/pom.xml
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/pom.xml b/cloudstack-ec2/pom.xml
deleted file mode 100644
index da1f785..0000000
--- a/cloudstack-ec2/pom.xml
+++ /dev/null
@@ -1,128 +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.labs</groupId>
-    <artifactId>jclouds-labs</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
-
-  <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.apache.jclouds.labs</groupId>
-  <artifactId>cloudstack-ec2</artifactId>
-  <name>jclouds CloudStack EC2 api</name>
-  <description>EC2 implementation based on CloudStack</description>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <test.cloudstack-ec2.endpoint>http://localhost:8090/bridge/rest/AmazonEC2</test.cloudstack-ec2.endpoint>
-    <test.cloudstack-ec2.api-version>2010-11-15</test.cloudstack-ec2.api-version>
-    <test.cloudstack-ec2.build-version />
-    <test.cloudstack-ec2.identity>FIXME_IDENTITY</test.cloudstack-ec2.identity>
-    <test.cloudstack-ec2.credential>FIXME_CREDENTIAL</test.cloudstack-ec2.credential>
-    <test.cloudstack-ec2.template>imageId=fixme-region/ami-fixme</test.cloudstack-ec2.template>
-    <test.cloudstack-ec2.ebs-template>imageId=fixme-region/ami-fixmeebs</test.cloudstack-ec2.ebs-template>
-    <jclouds.osgi.export>org.jclouds.cloudstack.ec2*;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>ec2</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jclouds.api</groupId>
-      <artifactId>ec2</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.cloudstack-ec2.endpoint>${test.cloudstack-ec2.endpoint}</test.cloudstack-ec2.endpoint>
-                    <test.cloudstack-ec2.api-version>${test.cloudstack-ec2.api-version}</test.cloudstack-ec2.api-version>
-                    <test.cloudstack-ec2.build-version>${test.cloudstack-ec2.build-version}</test.cloudstack-ec2.build-version>
-                    <test.cloudstack-ec2.identity>${test.cloudstack-ec2.identity}</test.cloudstack-ec2.identity>
-                    <test.cloudstack-ec2.credential>${test.cloudstack-ec2.credential}</test.cloudstack-ec2.credential>
-                    <test.cloudstack-ec2.template>${test.cloudstack-ec2.template}</test.cloudstack-ec2.template>
-                    <test.cloudstack-ec2.ebs-template>${test.cloudstack-ec2.ebs-template}</test.cloudstack-ec2.ebs-template>
-                  </systemPropertyVariables>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-</project>
-

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba934d26/cloudstack-ec2/src/main/java/org/jclouds/cloudstack/ec2/CloudStackEC2ApiMetadata.java
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/src/main/java/org/jclouds/cloudstack/ec2/CloudStackEC2ApiMetadata.java b/cloudstack-ec2/src/main/java/org/jclouds/cloudstack/ec2/CloudStackEC2ApiMetadata.java
deleted file mode 100644
index 6cb70a4..0000000
--- a/cloudstack-ec2/src/main/java/org/jclouds/cloudstack/ec2/CloudStackEC2ApiMetadata.java
+++ /dev/null
@@ -1,82 +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.cloudstack.ec2;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.apis.ApiMetadata;
-import org.jclouds.cloudstack.ec2.config.CloudStackEC2RestClientModule;
-import org.jclouds.ec2.EC2ApiMetadata;
-import org.jclouds.ec2.EC2AsyncClient;
-import org.jclouds.ec2.EC2Client;
-import org.jclouds.ec2.compute.config.EC2ComputeServiceContextModule;
-import org.jclouds.ec2.compute.config.EC2ResolveImagesModule;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-
-/**
- * Implementation of {@link ApiMetadata} for the CloudStack's EC2-clone API
- */
-public class CloudStackEC2ApiMetadata extends EC2ApiMetadata {
-
-   @Override
-   public Builder toBuilder() {
-      return new Builder().fromApiMetadata(this);
-   }
-
-   public CloudStackEC2ApiMetadata() {
-      this(new Builder());
-   }
-
-   protected CloudStackEC2ApiMetadata(Builder builder) {
-      super(builder);
-   }
-   
-   public static Properties defaultProperties() {
-      Properties properties = EC2ApiMetadata.defaultProperties();
-      return properties;
-   }
-
-   public static class Builder extends EC2ApiMetadata.Builder<Builder> {
-      protected Builder(){
-         super(EC2Client.class, EC2AsyncClient.class);
-         id("cloudstack-ec2")
-         .name("CloudBridge (EC2 clone) API")
-         .version("2010-11-15")
-         .defaultEndpoint("http://localhost:8090/bridge/rest/AmazonEC2")
-         .documentation(URI.create("http://docs.cloudstack.org/CloudBridge_Documentation"))
-         .defaultProperties(CloudStackEC2ApiMetadata.defaultProperties())
-         .context(CONTEXT_TOKEN)
-         .defaultModules(ImmutableSet.<Class<? extends Module>>builder()
-                                     .add(CloudStackEC2RestClientModule.class)
-                                     .add(EC2ResolveImagesModule.class)
-                                     .add(EC2ComputeServiceContextModule.class).build());
-      }
-      
-      @Override
-      public CloudStackEC2ApiMetadata build() {
-         return new CloudStackEC2ApiMetadata(this);
-      }
-
-      @Override
-      protected Builder self() {
-         return this;
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba934d26/cloudstack-ec2/src/main/java/org/jclouds/cloudstack/ec2/config/CloudStackEC2RestClientModule.java
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/src/main/java/org/jclouds/cloudstack/ec2/config/CloudStackEC2RestClientModule.java b/cloudstack-ec2/src/main/java/org/jclouds/cloudstack/ec2/config/CloudStackEC2RestClientModule.java
deleted file mode 100644
index d6991fe..0000000
--- a/cloudstack-ec2/src/main/java/org/jclouds/cloudstack/ec2/config/CloudStackEC2RestClientModule.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.cloudstack.ec2.config;
-
-import org.jclouds.ec2.EC2AsyncClient;
-import org.jclouds.ec2.EC2Client;
-import org.jclouds.ec2.config.EC2RestClientModule;
-import org.jclouds.rest.ConfiguresRestClient;
-
-@ConfiguresRestClient
-public class CloudStackEC2RestClientModule extends EC2RestClientModule<EC2Client, EC2AsyncClient> {
-
-   @Override
-   protected void configure() {
-      super.configure();
-      // override parsers, etc. here
-      // ex.
-      // bind(DescribeImagesResponseHandler.class).to(CloudStackDescribeImagesResponseHandler.class);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba934d26/cloudstack-ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/cloudstack-ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index f68f5cc..0000000
--- a/cloudstack-ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.cloudstack.ec2.CloudStackEC2ApiMetadata

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba934d26/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/CloudStackEC2ApiMetadataTest.java
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/CloudStackEC2ApiMetadataTest.java b/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/CloudStackEC2ApiMetadataTest.java
deleted file mode 100644
index 63eda3e..0000000
--- a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/CloudStackEC2ApiMetadataTest.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.cloudstack.ec2;
-
-import org.jclouds.compute.internal.BaseComputeServiceApiMetadataTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "CloudStackEC2ApiMetadataTest")
-public class CloudStackEC2ApiMetadataTest extends BaseComputeServiceApiMetadataTest {
-
-   public CloudStackEC2ApiMetadataTest() {
-      super(new CloudStackEC2ApiMetadata());
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba934d26/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/features/CloudStackSubnetApiLiveTest.java
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/features/CloudStackSubnetApiLiveTest.java b/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/features/CloudStackSubnetApiLiveTest.java
deleted file mode 100644
index a9dc203..0000000
--- a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/features/CloudStackSubnetApiLiveTest.java
+++ /dev/null
@@ -1,27 +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.cloudstack.ec2.features;
-
-import org.jclouds.ec2.features.SubnetApiLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", testName = "CloudStackSubnetApiLiveTest")
-public class CloudStackSubnetApiLiveTest extends SubnetApiLiveTest {
-   public CloudStackSubnetApiLiveTest() {
-      provider = "cloudstack-ec2";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba934d26/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/internal/BaseCloudStackEC2RestClientExpectTest.java
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/internal/BaseCloudStackEC2RestClientExpectTest.java b/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/internal/BaseCloudStackEC2RestClientExpectTest.java
deleted file mode 100644
index 4f7a160..0000000
--- a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/internal/BaseCloudStackEC2RestClientExpectTest.java
+++ /dev/null
@@ -1,48 +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.cloudstack.ec2.internal;
-
-import org.jclouds.cloudstack.ec2.config.CloudStackEC2RestClientModule;
-import org.jclouds.date.DateService;
-import org.jclouds.ec2.EC2Client;
-import org.jclouds.rest.ConfiguresRestClient;
-import org.jclouds.rest.internal.BaseRestClientExpectTest;
-
-import com.google.inject.Module;
-import com.google.inject.Provides;
-
-public abstract class BaseCloudStackEC2RestClientExpectTest extends BaseRestClientExpectTest<EC2Client> {
-   protected static final String CONSTANT_DATE = "2012-04-16T15:54:08.897Z";
-
-   public BaseCloudStackEC2RestClientExpectTest() {
-      provider = "cloudstack-ec2";
-   }
-
-   @ConfiguresRestClient
-   private static final class TestCloudStackEC2RestClientModule extends CloudStackEC2RestClientModule {
-      @Override
-      @Provides
-      protected String provideTimeStamp(DateService dateService) {
-         return CONSTANT_DATE;
-      }
-   }
-
-   @Override
-   protected Module createModule() {
-      return new TestCloudStackEC2RestClientModule();
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba934d26/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2AMIClientLiveTest.java
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2AMIClientLiveTest.java b/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2AMIClientLiveTest.java
deleted file mode 100644
index e19c295..0000000
--- a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2AMIClientLiveTest.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.cloudstack.ec2.services;
-
-import org.jclouds.ec2.services.AMIClientLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "CloudStackEC2AMIClientLiveTest")
-public class CloudStackEC2AMIClientLiveTest extends AMIClientLiveTest {
-   public CloudStackEC2AMIClientLiveTest() {
-      provider = "cloudstack-ec2";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba934d26/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2AvailabilityZoneAndRegionClientLiveTest.java
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2AvailabilityZoneAndRegionClientLiveTest.java b/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2AvailabilityZoneAndRegionClientLiveTest.java
deleted file mode 100644
index 64f0775..0000000
--- a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2AvailabilityZoneAndRegionClientLiveTest.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.cloudstack.ec2.services;
-
-import org.jclouds.ec2.services.AvailabilityZoneAndRegionClientLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "CloudStackEC2AvailabilityZoneAndRegionClientLiveTest")
-public class CloudStackEC2AvailabilityZoneAndRegionClientLiveTest extends AvailabilityZoneAndRegionClientLiveTest {
-   public CloudStackEC2AvailabilityZoneAndRegionClientLiveTest() {
-      provider = "cloudstack-ec2";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba934d26/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2ElasticBlockStoreClientLiveTest.java
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2ElasticBlockStoreClientLiveTest.java b/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2ElasticBlockStoreClientLiveTest.java
deleted file mode 100644
index 309467c..0000000
--- a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2ElasticBlockStoreClientLiveTest.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.cloudstack.ec2.services;
-
-import org.jclouds.ec2.services.ElasticBlockStoreClientLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "CloudStackEC2ElasticBlockStoreClientLiveTest")
-public class CloudStackEC2ElasticBlockStoreClientLiveTest extends ElasticBlockStoreClientLiveTest {
-   public CloudStackEC2ElasticBlockStoreClientLiveTest() {
-      provider = "cloudstack-ec2";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba934d26/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2ElasticIPAddressClientLiveTest.java
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2ElasticIPAddressClientLiveTest.java b/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2ElasticIPAddressClientLiveTest.java
deleted file mode 100644
index 03283a1..0000000
--- a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2ElasticIPAddressClientLiveTest.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.cloudstack.ec2.services;
-
-import org.jclouds.ec2.services.ElasticIPAddressClientLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "CloudStackEC2ElasticIPAddressClientLiveTest")
-public class CloudStackEC2ElasticIPAddressClientLiveTest extends ElasticIPAddressClientLiveTest {
-   public CloudStackEC2ElasticIPAddressClientLiveTest() {
-      provider = "cloudstack-ec2";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba934d26/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2InstanceClientLiveTest.java
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2InstanceClientLiveTest.java b/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2InstanceClientLiveTest.java
deleted file mode 100644
index 93c9545..0000000
--- a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2InstanceClientLiveTest.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.cloudstack.ec2.services;
-
-import org.jclouds.ec2.services.InstanceClientLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "CloudStackInstanceClientLiveTest")
-public class CloudStackEC2InstanceClientLiveTest extends InstanceClientLiveTest {
-   public CloudStackEC2InstanceClientLiveTest() {
-      provider = "cloudstack-ec2";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba934d26/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2KeyPairClientLiveTest.java
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2KeyPairClientLiveTest.java b/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2KeyPairClientLiveTest.java
deleted file mode 100644
index 4155436..0000000
--- a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2KeyPairClientLiveTest.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.cloudstack.ec2.services;
-
-import org.jclouds.ec2.services.KeyPairClientLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "CloudStackEC2KeyPairClientLiveTest")
-public class CloudStackEC2KeyPairClientLiveTest extends KeyPairClientLiveTest {
-   public CloudStackEC2KeyPairClientLiveTest() {
-      provider = "cloudstack-ec2";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ba934d26/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2SecurityGroupClientLiveTest.java
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2SecurityGroupClientLiveTest.java b/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2SecurityGroupClientLiveTest.java
deleted file mode 100644
index 746e610..0000000
--- a/cloudstack-ec2/src/test/java/org/jclouds/cloudstack/ec2/services/CloudStackEC2SecurityGroupClientLiveTest.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.cloudstack.ec2.services;
-
-import org.jclouds.ec2.services.SecurityGroupClientLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true, testName = "CloudStackEC2SecurityGroupClientLiveTest")
-public class CloudStackEC2SecurityGroupClientLiveTest extends SecurityGroupClientLiveTest {
-   public CloudStackEC2SecurityGroupClientLiveTest() {
-      provider = "cloudstack-ec2";
-   }
-
-}