You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by jd...@apache.org on 2014/10/05 01:44:27 UTC

[1/2] git commit: JCLOUDS-743 - Remove greenhousedata-element-vcloud provider

Repository: jclouds
Updated Branches:
  refs/heads/master 8639f5cf9 -> 8c520d39a


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/master
Commit: cc35ae557c529c9312614aee6c356fb18903a8a5
Parents: 8639f5c
Author: Adrian Cole <ad...@gmail.com>
Authored: Sat Oct 4 09:12:12 2014 -0700
Committer: Jeremy Daggett <jd...@apache.org>
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>


[2/2] git commit: JCLOUDS-743 - Remove bluelock-vcloud-zone01 provider

Posted by jd...@apache.org.
JCLOUDS-743 - Remove bluelock-vcloud-zone01 provider


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

Branch: refs/heads/master
Commit: 8c520d39a4a21eb35bee21ee84316d3207be7e67
Parents: cc35ae5
Author: Adrian Cole <ac...@twitter.com>
Authored: Fri Oct 3 21:55:03 2014 -0700
Committer: Jeremy Daggett <jd...@apache.org>
Committed: Sat Oct 4 16:44:03 2014 -0700

----------------------------------------------------------------------
 allcompute/pom.xml                              |   5 -
 providers/bluelock-vcloud-zone01/pom.xml        | 126 ---------
 .../BluelockVCloudZone01ProviderMetadata.java   |  81 ------
 .../org.jclouds.providers.ProviderMetadata      |   1 -
 .../BluelockVCloudZone01ProviderTest.java       |  29 --
 ...elockVCloudZone01ComputeServiceLiveTest.java |  28 --
 ...lockVCloudZone01TemplateBuilderLiveTest.java |  75 ------
 .../BluelockVCloudZone01CatalogApiLiveTest.java |  28 --
 .../BluelockVCloudZone01NetworkApiLiveTest.java |  28 --
 .../BluelockVCloudZone01OrgApiLiveTest.java     |  28 --
 .../BluelockVCloudZone01TaskApiLiveTest.java    |  28 --
 .../BluelockVCloudZone01VAppApiLiveTest.java    |  28 --
 ...lockVCloudZone01VAppTemplateApiLiveTest.java |  28 --
 .../BluelockVCloudZone01VDCApiLiveTest.java     |  28 --
 .../BluelockVCloudZone01VmApiLiveTest.java      |  28 --
 .../src/test/resources/bluelock/vdc.xml         | 265 -------------------
 .../src/test/resources/log4j.xml                | 151 -----------
 providers/pom.xml                               |   1 -
 18 files changed, 986 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/allcompute/pom.xml
----------------------------------------------------------------------
diff --git a/allcompute/pom.xml b/allcompute/pom.xml
index b911cff..095ac3a 100644
--- a/allcompute/pom.xml
+++ b/allcompute/pom.xml
@@ -75,11 +75,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.jclouds.provider</groupId>
-      <artifactId>bluelock-vcloud-zone01</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jclouds.provider</groupId>
       <artifactId>gogrid</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/pom.xml
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/pom.xml b/providers/bluelock-vcloud-zone01/pom.xml
deleted file mode 100644
index 5a7f783..0000000
--- a/providers/bluelock-vcloud-zone01/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>2.0.0-SNAPSHOT</version>
-    <relativePath>../../project/pom.xml</relativePath>
-  </parent>
-  <groupId>org.apache.jclouds.provider</groupId>
-  <artifactId>bluelock-vcloud-zone01</artifactId>
-  <name>jclouds Bluelock vCloud Zone01 provider</name>
-  <description>vCloud implementation targeted to Bluelock vCloud Zone01</description>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <test.bluelock-vcloud-zone01.endpoint>https://zone01.bluelock.com/api</test.bluelock-vcloud-zone01.endpoint>
-    <test.bluelock-vcloud-zone01.api-version>1.0</test.bluelock-vcloud-zone01.api-version>
-    <test.bluelock-vcloud-zone01.build-version>1.5.0.464915</test.bluelock-vcloud-zone01.build-version>
-    <test.bluelock-vcloud-zone01.identity>FIXME_IDENTITY</test.bluelock-vcloud-zone01.identity>
-    <test.bluelock-vcloud-zone01.credential>FIXME_CREDENTIAL</test.bluelock-vcloud-zone01.credential>
-    <test.bluelock-vcloud-zone01.template />
-    <jclouds.osgi.export>org.jclouds.bluelock.vcloud.zone01*;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.bluelock-vcloud-zone01.endpoint>${test.bluelock-vcloud-zone01.endpoint}</test.bluelock-vcloud-zone01.endpoint>
-                    <test.bluelock-vcloud-zone01.api-version>${test.bluelock-vcloud-zone01.api-version}</test.bluelock-vcloud-zone01.api-version>
-                    <test.bluelock-vcloud-zone01.build-version>${test.bluelock-vcloud-zone01.build-version}</test.bluelock-vcloud-zone01.build-version>
-                    <test.bluelock-vcloud-zone01.identity>${test.bluelock-vcloud-zone01.identity}</test.bluelock-vcloud-zone01.identity>
-                    <test.bluelock-vcloud-zone01.credential>${test.bluelock-vcloud-zone01.credential}</test.bluelock-vcloud-zone01.credential>
-                    <test.bluelock-vcloud-zone01.template>${test.bluelock-vcloud-zone01.template}</test.bluelock-vcloud-zone01.template>
-                  </systemPropertyVariables>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-
-</project>
-

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderMetadata.java b/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderMetadata.java
deleted file mode 100644
index 94c179c..0000000
--- a/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderMetadata.java
+++ /dev/null
@@ -1,81 +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.bluelock.vcloud.zone01;
-
-import static org.jclouds.vcloud.reference.VCloudConstants.PROPERTY_VCLOUD_DEFAULT_NETWORK;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-import org.jclouds.vcloud.VCloudApiMetadata;
-
-/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Bluelock vCloud Zone 1.
- */
-public class BluelockVCloudZone01ProviderMetadata extends BaseProviderMetadata {
-
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   @Override
-   public Builder toBuilder() {
-      return builder().fromProviderMetadata(this);
-   }
-   
-   public BluelockVCloudZone01ProviderMetadata() {
-      super(builder());
-   }
-
-   public BluelockVCloudZone01ProviderMetadata(Builder builder) {
-      super(builder);
-   }
-
-   public static Properties defaultProperties() {
-      Properties properties = new Properties();
-      properties.setProperty(PROPERTY_VCLOUD_DEFAULT_NETWORK, "internet01-.*");
-      return properties;
-   }
-   
-   public static class Builder extends BaseProviderMetadata.Builder {
-
-      protected Builder() {
-         id("bluelock-vcloud-zone01")
-         .name("Bluelock vCloud Zone 1")
-               .apiMetadata(
-                     new VCloudApiMetadata().toBuilder().buildVersion("1.5.0.464915").build())
-         .homepage(URI.create("http://www.bluelock.com/bluelock-cloud-hosting"))
-         .console(URI.create("https://zone01.bluelock.com/cloud/org/YOUR_ORG_HERE"))
-         .iso3166Codes("US-IN")
-         .endpoint("https://zone01.bluelock.com/api")
-         .defaultProperties(BluelockVCloudZone01ProviderMetadata.defaultProperties());
-      }
-
-      @Override
-      public BluelockVCloudZone01ProviderMetadata build() {
-         return new BluelockVCloudZone01ProviderMetadata(this);
-      }
-      
-      @Override
-      public Builder fromProviderMetadata(ProviderMetadata in) {
-         super.fromProviderMetadata(in);
-         return this;
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/bluelock-vcloud-zone01/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 6f51746..0000000
--- a/providers/bluelock-vcloud-zone01/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.bluelock.vcloud.zone01.BluelockVCloudZone01ProviderMetadata

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderTest.java
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderTest.java b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderTest.java
deleted file mode 100644
index d5db810..0000000
--- a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderTest.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.bluelock.vcloud.zone01;
-
-import org.jclouds.providers.internal.BaseProviderMetadataTest;
-import org.jclouds.vcloud.VCloudApiMetadata;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "BluelockVCloudZone01ProviderTest")
-public class BluelockVCloudZone01ProviderTest extends BaseProviderMetadataTest {
-
-   public BluelockVCloudZone01ProviderTest() {
-      super(new BluelockVCloudZone01ProviderMetadata(), new VCloudApiMetadata());
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/compute/BluelockVCloudZone01ComputeServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/compute/BluelockVCloudZone01ComputeServiceLiveTest.java b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/compute/BluelockVCloudZone01ComputeServiceLiveTest.java
deleted file mode 100644
index 6c5ac15..0000000
--- a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/compute/BluelockVCloudZone01ComputeServiceLiveTest.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.bluelock.vcloud.zone01.compute;
-
-import org.jclouds.vcloud.compute.VCloudComputeServiceLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudZone01ComputeServiceLiveTest")
-public class BluelockVCloudZone01ComputeServiceLiveTest extends VCloudComputeServiceLiveTest {
-   public BluelockVCloudZone01ComputeServiceLiveTest() {
-      provider = "bluelock-vcloud-zone01";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/compute/BluelockVCloudZone01TemplateBuilderLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/compute/BluelockVCloudZone01TemplateBuilderLiveTest.java b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/compute/BluelockVCloudZone01TemplateBuilderLiveTest.java
deleted file mode 100644
index 4a2f35d..0000000
--- a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/compute/BluelockVCloudZone01TemplateBuilderLiveTest.java
+++ /dev/null
@@ -1,75 +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.bluelock.vcloud.zone01.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 = "BluelockVCloudZone01TemplateBuilderLiveTest")
-public class BluelockVCloudZone01TemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
-
-   public BluelockVCloudZone01TemplateBuilderLiveTest() {
-      provider = "bluelock-vcloud-zone01";
-   }
-
-   @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;
-            case RHEL:
-               return !input.version.equals("");
-            case WINDOWS:
-               return !input.version.equals("");
-            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-IN");
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01CatalogApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01CatalogApiLiveTest.java b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01CatalogApiLiveTest.java
deleted file mode 100644
index 7888f87..0000000
--- a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01CatalogApiLiveTest.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.bluelock.vcloud.zone01.features;
-
-import org.jclouds.vcloud.features.CatalogApiLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudZone01CatalogApiLiveTest")
-public class BluelockVCloudZone01CatalogApiLiveTest extends CatalogApiLiveTest {
-
-   public BluelockVCloudZone01CatalogApiLiveTest() {
-      provider = "bluelock-vcloud-zone01";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01NetworkApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01NetworkApiLiveTest.java b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01NetworkApiLiveTest.java
deleted file mode 100644
index 2dc82ab..0000000
--- a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01NetworkApiLiveTest.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.bluelock.vcloud.zone01.features;
-
-import org.jclouds.vcloud.features.NetworkApiLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudZone01NetworkApiLiveTest")
-public class BluelockVCloudZone01NetworkApiLiveTest extends NetworkApiLiveTest {
-
-   public BluelockVCloudZone01NetworkApiLiveTest() {
-      provider = "bluelock-vcloud-zone01";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01OrgApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01OrgApiLiveTest.java b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01OrgApiLiveTest.java
deleted file mode 100644
index eb710a5..0000000
--- a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01OrgApiLiveTest.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.bluelock.vcloud.zone01.features;
-
-import org.jclouds.vcloud.features.OrgApiLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudZone01OrgApiLiveTest")
-public class BluelockVCloudZone01OrgApiLiveTest extends OrgApiLiveTest {
-
-   public BluelockVCloudZone01OrgApiLiveTest() {
-      provider = "bluelock-vcloud-zone01";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01TaskApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01TaskApiLiveTest.java b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01TaskApiLiveTest.java
deleted file mode 100644
index be809fd..0000000
--- a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01TaskApiLiveTest.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.bluelock.vcloud.zone01.features;
-
-import org.jclouds.vcloud.features.TaskApiLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudZone01TaskApiLiveTest")
-public class BluelockVCloudZone01TaskApiLiveTest extends TaskApiLiveTest {
-
-   public BluelockVCloudZone01TaskApiLiveTest() {
-      provider = "bluelock-vcloud-zone01";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VAppApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VAppApiLiveTest.java b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VAppApiLiveTest.java
deleted file mode 100644
index 6fe7b86..0000000
--- a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VAppApiLiveTest.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.bluelock.vcloud.zone01.features;
-
-import org.jclouds.vcloud.features.VAppApiLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudZone01VAppApiLiveTest")
-public class BluelockVCloudZone01VAppApiLiveTest extends VAppApiLiveTest {
-
-   public BluelockVCloudZone01VAppApiLiveTest() {
-      provider = "bluelock-vcloud-zone01";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VAppTemplateApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VAppTemplateApiLiveTest.java b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VAppTemplateApiLiveTest.java
deleted file mode 100644
index 150c02d..0000000
--- a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VAppTemplateApiLiveTest.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.bluelock.vcloud.zone01.features;
-
-import org.jclouds.vcloud.features.VAppTemplateApiLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudZone01VAppTemplateApiLiveTest")
-public class BluelockVCloudZone01VAppTemplateApiLiveTest extends VAppTemplateApiLiveTest {
-
-   public BluelockVCloudZone01VAppTemplateApiLiveTest() {
-      provider = "bluelock-vcloud-zone01";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VDCApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VDCApiLiveTest.java b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VDCApiLiveTest.java
deleted file mode 100644
index 757f007..0000000
--- a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VDCApiLiveTest.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.bluelock.vcloud.zone01.features;
-
-import org.jclouds.vcloud.features.VDCApiLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudZone01VDCApiLiveTest")
-public class BluelockVCloudZone01VDCApiLiveTest extends VDCApiLiveTest {
-
-   public BluelockVCloudZone01VDCApiLiveTest() {
-      provider = "bluelock-vcloud-zone01";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VmApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VmApiLiveTest.java b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VmApiLiveTest.java
deleted file mode 100644
index 432f10e..0000000
--- a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VmApiLiveTest.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.bluelock.vcloud.zone01.features;
-
-import org.jclouds.vcloud.features.VmApiLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudZone01VmApiLiveTest")
-public class BluelockVCloudZone01VmApiLiveTest extends VmApiLiveTest {
-
-   public BluelockVCloudZone01VmApiLiveTest() {
-      provider = "bluelock-vcloud-zone01";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/test/resources/bluelock/vdc.xml
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/test/resources/bluelock/vdc.xml b/providers/bluelock-vcloud-zone01/src/test/resources/bluelock/vdc.xml
deleted file mode 100644
index 0eb6c68..0000000
--- a/providers/bluelock-vcloud-zone01/src/test/resources/bluelock/vdc.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Vdc href="https://express3.bluelock.com/api/v0.8/vdc/133" name="jclouds"
-      xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 https://express3.bluelock.com/api/v0.8/schemas/vcloud/vdc.xsd"
-      xmlns="http://www.vmware.com/vcloud/v0.8"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <Link rel="add" href="https://express3.bluelock.com/api/v0.8/vdc/133/vApps"
-      type="application/vnd.vmware.vcloud.vApp+xml" />
-   <Link rel="add" href="https://express3.bluelock.com/api/v0.8/vdc/133/vAppTemplates"
-      type="application/vnd.vmware.vcloud.vAppTemplate+xml" />
-   <Link rel="add" href="https://express3.bluelock.com/api/v0.8/vdc/133/media"
-      type="application/vnd.vmware.vcloud.media+xml" />
-   <Description>people in paradise</Description>
-      <ResourceEntities>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/447"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 4CPUx8GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/448"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 8CPUx16GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/449"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 8CPUx1GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/347"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 4CPUx1GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/345"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 2CPUx8GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/346"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 4CPUx16GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/387"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 1CPUx8GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/388"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 2CPUx16GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/334"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 1CPUx16GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/335"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 1CPUx1GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/336"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 1CPUx2GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/337"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 1CPUx4GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/338"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 1CPUx512MBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/339"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 1CPUx8GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/341"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 2CPUx1GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/342"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 2CPUx2GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/450"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 8CPUx2GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/451"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 8CPUx4GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/452"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 8CPUx512MBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/453"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 8CPUx8GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/348"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 4CPUx2GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/349"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 4CPUx4GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/350"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 4CPUx512MBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/351"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 4CPUx8GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/352"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 8CPUx16GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/353"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 8CPUx1GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/354"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 8CPUx2GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/355"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 8CPUx4GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/356"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 8CPUx512MBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/344"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 2CPUx512MBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/358"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 1CPUx16GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/359"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 1CPUx1GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/360"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 1CPUx2GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/361"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 1CPUx4GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/362"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 1CPUx512MBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/363"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 1CPUx8GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/364"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 2CPUx16GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/365"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 2CPUx1GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/366"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 2CPUx2GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/367"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 2CPUx4GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/368"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 2CPUx512MBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/369"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 2CPUx8GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/370"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 4CPUx16GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/371"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 4CPUx1GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/372"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 4CPUx2GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/373"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 4CPUx4GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/375"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 4CPUx8GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/376"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 8CPUx16GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/377"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 8CPUx1GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/378"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 8CPUx2GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/379"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 8CPUx4GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/380"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 8CPUx512MBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/381"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 8CPUx8GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/382"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 1CPUx16GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/383"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 1CPUx1GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/384"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 1CPUx2GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/385"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 1CPUx4GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/386"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 1CPUx512MBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/389"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 2CPUx1GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/390"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 2CPUx2GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/392"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 2CPUx512MBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/393"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 2CPUx8GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/394"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 4CPUx16GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/395"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 4CPUx1GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/396"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 4CPUx2GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/397"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 4CPUx4GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/398"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 4CPUx512MBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/399"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 4CPUx8GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/400"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 8CPUx16GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/401"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 8CPUx1GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/402"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 8CPUx2GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/403"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 8CPUx4GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/404"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 8CPUx512MBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/405"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 8CPUx8GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/406"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 1CPUx16GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/407"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 1CPUx1GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/409"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 1CPUx4GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/410"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 1CPUx512MBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/411"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 1CPUx8GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/412"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 2CPUx16GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/413"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 2CPUx1GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/414"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 2CPUx2GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/415"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 2CPUx4GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/416"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 2CPUx512MBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/343"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 2CPUx4GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/417"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 2CPUx8GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/418"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 4CPUx16GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/419"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 4CPUx1GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/420"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 4CPUx2GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/421"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 4CPUx4GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/422"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 4CPUx512MBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/423"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 4CPUx8GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/424"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 8CPUx16GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/426"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 8CPUx2GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/427"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 8CPUx4GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/428"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 8CPUx512MBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/429"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 8CPUx8GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/430"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 1CPUx16GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/431"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 1CPUx1GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/442"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 4CPUx16GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/435"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 1CPUx8GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/436"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 2CPUx16GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/437"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 2CPUx1GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/438"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 2CPUx2GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/439"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 2CPUx4GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/440"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 2CPUx512MBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/441"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 2CPUx8GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/432"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 1CPUx2GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/433"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 1CPUx4GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/434"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 1CPUx512MBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/340"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 2CPUx16GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/425"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 8CPUx1GBx30GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/443"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 4CPUx1GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/444"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 4CPUx2GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/445"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 4CPUx4GBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/446"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008+SQLExpress 4CPUx512MBx40GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/357"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS5x64 8CPUx8GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/374"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="RedHat5x64 4CPUx512MBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/391"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Ubuntu904Serverx64 2CPUx4GBx20GB"/>
-         <ResourceEntity href="https://express3.bluelock.com/api/v0.8/vAppTemplate/408"
-            type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows2008stdx64 1CPUx2GBx30GB"/>
-      </ResourceEntities>
-      <AvailableNetworks>
-         <Network href="https://express3.bluelock.com/api/v0.8/network/1"
-            type="application/vnd.vmware.vcloud.network+xml" name="Pod03_Private"/>
-         <Network href="https://express3.bluelock.com/api/v0.8/network/4"
-            type="application/vnd.vmware.vcloud.network+xml" name="Internal Outbound Only"/>
-         <Network href="https://express3.bluelock.com/api/v0.8/network/2"
-            type="application/vnd.vmware.vcloud.network+xml" name="Pod03_Public"/>
-         <Network href="https://express3.bluelock.com/api/v0.8/network/3"
-            type="application/vnd.vmware.vcloud.network+xml" name="Internal In and Out"/>
-      </AvailableNetworks>
-</Vdc>

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c520d39/providers/bluelock-vcloud-zone01/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/providers/bluelock-vcloud-zone01/src/test/resources/log4j.xml b/providers/bluelock-vcloud-zone01/src/test/resources/log4j.xml
deleted file mode 100644
index 63810d3..0000000
--- a/providers/bluelock-vcloud-zone01/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/jclouds/blob/8c520d39/providers/pom.xml
----------------------------------------------------------------------
diff --git a/providers/pom.xml b/providers/pom.xml
index 08160de..d1ef987 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -36,7 +36,6 @@
     <module>aws-ec2</module>
     <module>aws-sqs</module>
     <module>aws-cloudwatch</module>
-    <module>bluelock-vcloud-zone01</module>
     <module>elastichosts-lon-p</module>
     <module>elastichosts-sat-p</module>
     <module>elastichosts-lon-b</module>