You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2015/06/26 09:55:41 UTC

[2/3] jclouds git commit: Remove old cloudfiles providers

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/CloudFilesClientLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/CloudFilesClientLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/CloudFilesClientLiveTest.java
deleted file mode 100644
index 3ccdb44..0000000
--- a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/CloudFilesClientLiveTest.java
+++ /dev/null
@@ -1,169 +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.cloudfiles;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.net.URI;
-import java.util.Set;
-
-import org.jclouds.cloudfiles.domain.ContainerCDNMetadata;
-import org.jclouds.cloudfiles.options.ListCdnContainerOptions;
-import org.jclouds.openstack.swift.CommonSwiftClientLiveTest;
-import org.jclouds.openstack.swift.domain.ContainerMetadata;
-import org.jclouds.openstack.swift.domain.SwiftObject;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-
-/**
- * Tests behavior of {@code JaxrsAnnotationProcessor}
- */
-@Test(groups = "live")
-public class CloudFilesClientLiveTest extends CommonSwiftClientLiveTest<CloudFilesClient> {
-
-   public CloudFilesClientLiveTest() {
-      provider = "cloudfiles";
-   }
-   
-   @Override
-   public CloudFilesClient getApi() {
-      return view.unwrapApi(CloudFilesClient.class);
-   }
-   
-   @Override
-   protected void testGetObjectContentType(SwiftObject getBlob) {
-      //lovely new bug.. should be text/plain
-      assertEquals(getBlob.getInfo().getContentType(), "application/x-www-form-urlencoded");
-   }
-
-   @Test
-   public void testCDNOperations() throws Exception {
-      final long minimumTTL = 60 * 60; // The minimum TTL is 1 hour
-
-      // Create two new containers for testing
-      final String containerNameWithCDN = getContainerName();
-      final String containerNameWithoutCDN = getContainerName();
-      try {
-         try {
-            getApi().disableCDN(containerNameWithCDN);
-            getApi().disableCDN(containerNameWithoutCDN);
-         } catch (Exception e) {
-
-         }
-         ContainerCDNMetadata cdnMetadata = null;
-
-         // Enable CDN with PUT for one container
-         final URI cdnUri = getApi().enableCDN(containerNameWithCDN);
-         assertNotNull(cdnUri);
-
-         // Confirm CDN is enabled via HEAD request and has default TTL
-         cdnMetadata = getApi().getCDNMetadata(containerNameWithCDN);
-
-         assertTrue(cdnMetadata.isCDNEnabled());
-         assertEquals(cdnMetadata.getCDNUri(), cdnUri);
-         
-         // Test static website metadata
-         getApi().setCDNStaticWebsiteIndex(containerNameWithCDN, "index.html");
-         getApi().setCDNStaticWebsiteError(containerNameWithCDN, "error.html");
-         
-         ContainerMetadata containerMetadata = getApi().getContainerMetadata(containerNameWithCDN);
-         
-         assertEquals(containerMetadata.getMetadata().get("web-index"), "index.html");
-         assertEquals(containerMetadata.getMetadata().get("web-error"), "error.html");
-         
-         cdnMetadata = getApi().getCDNMetadata(containerNameWithoutCDN);
-         assert cdnMetadata == null || !cdnMetadata.isCDNEnabled() : containerNameWithoutCDN
-                  + " should not have metadata";
-
-         assert getApi().getCDNMetadata("DoesNotExist") == null;
-         
-         // List CDN metadata for containers, and ensure all CDN info is
-         // available for enabled
-         // container
-         Set<ContainerCDNMetadata> cdnMetadataList = getApi().listCDNContainers();
-         assertTrue(cdnMetadataList.size() >= 1);
-
-         cdnMetadata = getApi().getCDNMetadata(containerNameWithCDN);
-         final boolean cdnEnabled = cdnMetadata.isCDNEnabled();
-         final boolean logRetention = cdnMetadata.isLogRetention();
-         final long initialTTL = cdnMetadata.getTTL();
-         final URI cdnSslUri = cdnMetadata.getCDNSslUri();
-         final URI cdnStreamingUri = cdnMetadata.getCDNStreamingUri();
-         final URI cdnIosUri = cdnMetadata.getCDNIosUri();
-         assertTrue(cdnMetadataList.contains(new ContainerCDNMetadata(
-            containerNameWithCDN, cdnEnabled, logRetention, initialTTL, cdnUri, cdnSslUri, cdnStreamingUri, cdnIosUri)));
-
-         // Test listing with options
-         cdnMetadataList = getApi().listCDNContainers(ListCdnContainerOptions.Builder.enabledOnly());
-         assertTrue(Iterables.all(cdnMetadataList, new Predicate<ContainerCDNMetadata>() {
-            public boolean apply(ContainerCDNMetadata cdnMetadata) {
-               return cdnMetadata.isCDNEnabled();
-            }
-         }));
-
-         cdnMetadataList = getApi().listCDNContainers(
-                  ListCdnContainerOptions.Builder.afterMarker(
-                           containerNameWithCDN.substring(0, containerNameWithCDN.length() - 1)).maxResults(1));
-         assertEquals(cdnMetadataList.size(), 1);
-
-         // Enable CDN with PUT for the same container, this time with a custom TTL and Log Retention
-         long ttl = 4000;
-         getApi().enableCDN(containerNameWithCDN, ttl, true);
-
-         cdnMetadata = getApi().getCDNMetadata(containerNameWithCDN);
-
-         assertTrue(cdnMetadata.isCDNEnabled());
-
-         assertEquals(cdnMetadata.getTTL(), ttl);
-
-         // Check POST by updating TTL settings
-         ttl = minimumTTL;
-         getApi().updateCDN(containerNameWithCDN, minimumTTL, false);
-
-         cdnMetadata = getApi().getCDNMetadata(containerNameWithCDN);
-         assertTrue(cdnMetadata.isCDNEnabled());
-
-         assertEquals(cdnMetadata.getTTL(), minimumTTL);
-
-         // Confirm that minimum allowed value for TTL is 3600, lower values are
-         // ignored.
-         getApi().updateCDN(containerNameWithCDN, 3599L, false);
-         cdnMetadata = getApi().getCDNMetadata(containerNameWithCDN);
-         assertEquals(cdnMetadata.getTTL(), 3599L);
-         
-         // Test purging an object from a CDN container
-         SwiftObject swiftObject = newSwiftObject("hello", "hello.txt");
-         getApi().putObject(containerNameWithCDN, swiftObject);
-         
-         assertTrue(getApi().purgeCDNObject(containerNameWithCDN, swiftObject.getInfo().getName()));
-
-         // Disable CDN with POST
-         assertTrue(getApi().disableCDN(containerNameWithCDN));
-
-         cdnMetadata = getApi().getCDNMetadata(containerNameWithCDN);
-         assertEquals(cdnMetadata.isCDNEnabled(), false);
-      } finally {
-         recycleContainer(containerNameWithCDN);
-         recycleContainer(containerNameWithoutCDN);
-      }
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/binders/BindIterableToHeadersWithPurgeCDNObjectEmailTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/binders/BindIterableToHeadersWithPurgeCDNObjectEmailTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/binders/BindIterableToHeadersWithPurgeCDNObjectEmailTest.java
deleted file mode 100644
index 074b588..0000000
--- a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/binders/BindIterableToHeadersWithPurgeCDNObjectEmailTest.java
+++ /dev/null
@@ -1,72 +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.cloudfiles.binders;
-
-import static org.testng.Assert.assertEquals;
-
-import java.util.List;
-
-import org.jclouds.cloudfiles.reference.CloudFilesHeaders;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.openstack.swift.CommonSwiftClientTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code BindIterableToHeadersWithPurgeCDNObjectEmail}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire
-@Test(groups = "unit", testName = "BindIterableToHeadersWithPurgeCDNObjectEmailTest")
-public class BindIterableToHeadersWithPurgeCDNObjectEmailTest extends CommonSwiftClientTest {
-
-   @Test
-   public void testEmailBind() {
-      List<String> emails = ImmutableList.of("foo@bar.com", "bar@foo.com");
-
-      HttpRequest request = HttpRequest.builder().method("DELETE").endpoint("http://localhost").build();
-      BindIterableToHeadersWithPurgeCDNObjectEmail binder = 
-         injector.getInstance(BindIterableToHeadersWithPurgeCDNObjectEmail.class);
-      
-      HttpRequest actualRequest = binder.bindToRequest(request, emails);
-      HttpRequest expectedRequest = HttpRequest.builder()
-         .method("DELETE")
-         .endpoint("http://localhost")
-         .addHeader(CloudFilesHeaders.CDN_CONTAINER_PURGE_OBJECT_EMAIL, "foo@bar.com, bar@foo.com")
-         .build(); 
-
-      assertEquals(actualRequest, expectedRequest);
-   }
-
-   @Test(expectedExceptions = NullPointerException.class)
-   public void testNullListIsBad() {
-      HttpRequest request = HttpRequest.builder().method("DELETE").endpoint("http://localhost").build();
-      BindIterableToHeadersWithPurgeCDNObjectEmail binder = 
-         injector.getInstance(BindIterableToHeadersWithPurgeCDNObjectEmail.class);
-      
-      binder.bindToRequest(request, null);
-   }
-
-   @Test(expectedExceptions = NullPointerException.class)
-   public void testNullRequestIsBad() {
-      List<String> emails = ImmutableList.of("foo@bar.com", "bar@foo.com");
-      BindIterableToHeadersWithPurgeCDNObjectEmail binder = 
-         injector.getInstance(BindIterableToHeadersWithPurgeCDNObjectEmail.class);
-      
-      binder.bindToRequest(null, emails);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobSignerExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobSignerExpectTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobSignerExpectTest.java
deleted file mode 100644
index dc5151d..0000000
--- a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobSignerExpectTest.java
+++ /dev/null
@@ -1,149 +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.cloudfiles.blobstore;
-
-import static org.jclouds.openstack.swift.reference.SwiftHeaders.ACCOUNT_TEMPORARY_URL_KEY;
-
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.apis.ApiMetadata;
-import org.jclouds.blobstore.internal.BaseBlobSignerExpectTest;
-import org.jclouds.cloudfiles.CloudFilesApiMetadata;
-import org.jclouds.cloudfiles.CloudFilesApiMetadata.CloudFilesTemporaryUrlExtensionModule;
-import org.jclouds.cloudfiles.blobstore.config.CloudFilesBlobStoreContextModule;
-import org.jclouds.cloudfiles.config.CloudFilesHttpApiModule;
-import org.jclouds.cloudfiles.config.CloudFilesHttpApiModule.StorageAndCDNManagementEndpointModule;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.net.HttpHeaders;
-import com.google.inject.Module;
-
-/**
- * Tests behavior of {@code SwiftBlobSigner}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "CloudFilesBlobSignerExpectTest")
-public class CloudFilesBlobSignerExpectTest extends BaseBlobSignerExpectTest {
-
-   public CloudFilesBlobSignerExpectTest() {
-      identity = "user@jclouds.org";
-      credential = "Password1234";
-   }
-
-   @Override
-   protected HttpRequest getBlob() {
-      return HttpRequest.builder().method("GET")
-            .endpoint("https://storage101.lon3.clouddrive.com/v1/MossoCloudFS_83a9d536-2e25-4166-bd3b-a503a934f953/container/name")
-            .addHeader("X-Auth-Token", authToken).build();
-   }
-
-   @Override
-   protected HttpRequest getBlobWithTime() {
-      return HttpRequest.builder().method("GET")
-            .endpoint("https://storage101.lon3.clouddrive.com/v1/MossoCloudFS_83a9d536-2e25-4166-bd3b-a503a934f953/container/name?temp_url_sig=9d62a4a15076699b3f7c60c2d021609990f24115&temp_url_expires=123456792").build();
-   }
-
-   @Override
-   protected HttpRequest getBlobWithOptions() {
-      return HttpRequest.builder().method("GET")
-            .endpoint("https://storage101.lon3.clouddrive.com/v1/MossoCloudFS_83a9d536-2e25-4166-bd3b-a503a934f953/container/name")
-            .addHeader("X-Auth-Token", authToken)
-            .addHeader("Range", "bytes=0-1").build();
-   }
-
-   @Override
-   protected HttpRequest putBlob() {
-      return HttpRequest.builder().method("PUT")
-            .endpoint("https://storage101.lon3.clouddrive.com/v1/MossoCloudFS_83a9d536-2e25-4166-bd3b-a503a934f953/container/name")
-            .addHeader("ETag", "00000000000000000000000000000000")
-            .addHeader("Expect", "100-continue")
-            .addHeader("X-Auth-Token", authToken)
-            .addHeader("X-Delete-At", "1")
-            .build();
-   }
-
-   @Override
-   protected HttpRequest putBlobWithTime() {
-      return HttpRequest.builder().method("PUT")
-            .addHeader("Expect", "100-continue")
-            .endpoint("https://storage101.lon3.clouddrive.com/v1/MossoCloudFS_83a9d536-2e25-4166-bd3b-a503a934f953/container/name?temp_url_sig=f83fa711f353f6f0bab3a66c56e35a972b9b3922&temp_url_expires=123456792").build();
-   }
-
-   @Override
-   protected HttpRequest removeBlob() {
-      return HttpRequest.builder().method("DELETE")
-            .endpoint("https://storage101.lon3.clouddrive.com/v1/MossoCloudFS_83a9d536-2e25-4166-bd3b-a503a934f953/container/name")
-            .addHeader("X-Auth-Token", authToken).build();
-   }
-
-   protected String authToken = "118fb907-0786-4799-88f0-9a5b7963d1ab";
-
-   @Override
-   protected Map<HttpRequest, HttpResponse> init() {
-
-      HttpRequest authRequest = HttpRequest.builder().method("POST")
-            .endpoint("https://auth.api.rackspacecloud.com/v1.1/auth")
-            .addHeader(HttpHeaders.ACCEPT, "application/json")
-            .payload(
-                  payloadFromStringWithContentType(
-                        "{\"credentials\":{\"username\":\"user@jclouds.org\",\"key\":\"Password1234\"}}",
-                        "application/json")).build();
-
-      HttpResponse authResponse = HttpResponse.builder().statusCode(200).message("HTTP/1.1 200")
-            .payload(payloadFromResourceWithContentType("/auth1_1.json", "application/json")).build();
-
-      HttpRequest temporaryKeyRequest = HttpRequest.builder().method("HEAD")
-            .endpoint("https://storage101.lon3.clouddrive.com/v1/MossoCloudFS_83a9d536-2e25-4166-bd3b-a503a934f953/")
-            .addHeader("Accept", MediaType.WILDCARD)
-            .addHeader("X-Auth-Token", authToken).build();
-
-      HttpResponse temporaryKeyResponse = HttpResponse.builder().statusCode(200)
-            .addHeader(ACCOUNT_TEMPORARY_URL_KEY, "TEMPORARY_KEY").build();
-
-      return ImmutableMap.<HttpRequest, HttpResponse> builder()
-            .put(authRequest, authResponse)
-            .put(temporaryKeyRequest, temporaryKeyResponse).build();
-   }
-
-   public static class StaticTimeAndTemporaryUrlKeyModule extends CloudFilesTemporaryUrlExtensionModule {
-
-      @Override
-      protected Long unixEpochTimestampProvider() {
-         return 123456789L;
-      }
-   }
-
-   @Override
-   protected ApiMetadata createApiMetadata() {
-      return new CloudFilesApiMetadata()
-            .toBuilder()
-            .defaultEndpoint("https://auth.api.rackspacecloud.com")
-            .defaultModules(
-                  ImmutableSet.<Class<? extends Module>> builder()
-                      .add(StorageAndCDNManagementEndpointModule.class)
-                      .add(CloudFilesHttpApiModule.class)
-                      .add(CloudFilesBlobStoreContextModule.class)
-                      .add(StaticTimeAndTemporaryUrlKeyModule.class).build()).build();
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobIntegrationLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobIntegrationLiveTest.java
deleted file mode 100644
index dee4cdf..0000000
--- a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobIntegrationLiveTest.java
+++ /dev/null
@@ -1,60 +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.cloudfiles.blobstore.integration;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.jclouds.blobstore.BlobStore;
-import org.jclouds.blobstore.domain.Blob;
-import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobIntegrationLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", singleThreaded = true)
-public class CloudFilesBlobIntegrationLiveTest extends SwiftBlobIntegrationLiveTest {
-   public CloudFilesBlobIntegrationLiveTest() {
-      provider = "cloudfiles";
-   }
-
-   @Override
-   protected void checkContentDisposition(Blob blob, String contentDisposition) {
-      assert blob.getPayload().getContentMetadata().getContentDisposition().startsWith(contentDisposition) : blob
-               .getPayload().getContentMetadata().getContentDisposition();
-      assert blob.getMetadata().getContentMetadata().getContentDisposition().startsWith(contentDisposition) : blob
-               .getMetadata().getContentMetadata().getContentDisposition();
-   }
-
-   @Test(groups = { "integration", "live" })
-   public void testChunksAreDeletedWhenMultipartBlobIsDeleted() throws IOException, InterruptedException {
-      String containerName = getContainerName();
-      try {
-         BlobStore blobStore = view.getBlobStore();
-
-         long countBefore = blobStore.countBlobs(containerName);
-         String blobName = "deleteme.txt";
-         addMultipartBlobToContainer(containerName, blobName);
-
-         blobStore.removeBlob(containerName, blobName);
-         long countAfter = blobStore.countBlobs(containerName);
-
-         assertEquals(countAfter, countBefore);
-      } finally {
-          returnContainer(containerName);
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobLiveTest.java
deleted file mode 100644
index ac45278..0000000
--- a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobLiveTest.java
+++ /dev/null
@@ -1,49 +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.cloudfiles.blobstore.integration;
-
-import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobLiveTest;
-import org.jclouds.openstack.swift.extensions.TemporaryUrlKeyApi;
-import org.testng.annotations.Test;
-
-import java.util.UUID;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-@Test(groups = {"live"})
-public class CloudFilesBlobLiveTest extends SwiftBlobLiveTest {
-
-   public CloudFilesBlobLiveTest() {
-      provider = "cloudfiles";
-   }
-
-   public void testGetAndSetTemporaryUrlKey() {
-      TemporaryUrlKeyApi client = view.utils().injector().getInstance(TemporaryUrlKeyApi.class);
-
-      String currentSecretKey = client.getTemporaryUrlKey();
-      assertNotNull(currentSecretKey);
-      try {
-         String testKey = UUID.randomUUID().toString();
-         client.setTemporaryUrlKey(testKey);
-         assertEquals(client.getTemporaryUrlKey(), testKey);
-
-      } finally {
-         client.setTemporaryUrlKey(currentSecretKey);
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobSignerLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobSignerLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobSignerLiveTest.java
deleted file mode 100644
index 3a06ea0..0000000
--- a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobSignerLiveTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudfiles.blobstore.integration;
-
-import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobSignerLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = {"live"})
-public class CloudFilesBlobSignerLiveTest extends SwiftBlobSignerLiveTest {
-   public CloudFilesBlobSignerLiveTest() {
-      provider = "cloudfiles";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerIntegrationLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerIntegrationLiveTest.java
deleted file mode 100644
index 1ddecd9..0000000
--- a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerIntegrationLiveTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudfiles.blobstore.integration;
-
-import org.jclouds.openstack.swift.blobstore.integration.SwiftContainerIntegrationLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live")
-public class CloudFilesContainerIntegrationLiveTest extends SwiftContainerIntegrationLiveTest {
-   public CloudFilesContainerIntegrationLiveTest() {
-      provider = "cloudfiles";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java
deleted file mode 100644
index ce0bdf0..0000000
--- a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudfiles.blobstore.integration;
-
-import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = { "live" })
-public class CloudFilesContainerLiveTest extends BaseContainerLiveTest {
-   public CloudFilesContainerLiveTest() {
-      provider = "cloudfiles";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesServiceIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesServiceIntegrationLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesServiceIntegrationLiveTest.java
deleted file mode 100644
index d117f5d..0000000
--- a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesServiceIntegrationLiveTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudfiles.blobstore.integration;
-
-import org.jclouds.openstack.swift.blobstore.integration.SwiftServiceIntegrationLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live")
-public class CloudFilesServiceIntegrationLiveTest extends SwiftServiceIntegrationLiveTest {
-   public CloudFilesServiceIntegrationLiveTest() {
-      provider = "cloudfiles";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/config/CloudFilesRestClientModuleTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/config/CloudFilesRestClientModuleTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/config/CloudFilesRestClientModuleTest.java
deleted file mode 100644
index a0066c8..0000000
--- a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/config/CloudFilesRestClientModuleTest.java
+++ /dev/null
@@ -1,46 +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.cloudfiles.config;
-
-import static org.testng.Assert.assertEquals;
-
-import java.util.Map;
-
-import org.testng.annotations.Test;
-
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableMap;
-
-public class CloudFilesRestClientModuleTest {
-
-   @Test
-   public void testWithKey() {
-      assertEquals(
-            CloudFilesHttpApiModule.<String, String> valueForKey(Suppliers
-                        .<Map<String, Supplier<String>>>ofInstance(ImmutableMap.of("foo", Suppliers.ofInstance("bar"))),
-                  Suppliers.ofInstance("foo")).get(), "bar");
-   }
-
-   @Test
-   public void testWithKeyUnmatchedIsNull() {
-      assertEquals(
-            CloudFilesHttpApiModule.<String, String> valueForKey(Suppliers
-                        .<Map<String, Supplier<String>>>ofInstance(ImmutableMap.of("boo", Suppliers.ofInstance("bar"))),
-                  Suppliers.ofInstance("foo")).get(), null);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java
deleted file mode 100644
index dfd35d5..0000000
--- a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java
+++ /dev/null
@@ -1,83 +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.cloudfiles.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.net.URI;
-import java.util.Set;
-import java.util.SortedSet;
-
-import org.jclouds.cloudfiles.domain.ContainerCDNMetadata;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseJson;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSortedSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.TypeLiteral;
-
-/**
- * Tests behavior of {@code ParseContainerCDNMetadataListFromJsonResponse}
- */
-@Test(groups = "unit")
-public class ParseContainerCDNMetadataListFromJsonResponseTest {
-   Injector i = Guice.createInjector(new GsonModule());
-
-   @Test
-   public void testApplyInputStream() {
-
-      InputStream is = getClass().getResourceAsStream("/test_list_cdn.json");
-      Set<ContainerCDNMetadata> expects = ImmutableSortedSet.of(
-         new ContainerCDNMetadata(
-            "adriancole-blobstore.testCDNOperationsContainerWithCDN", 
-            false, 
-            false,
-            3600, 
-            URI.create("http://c0354712.cdn.cloudfiles.rackspacecloud.com"), 
-            URI.create("https://c0354712.cdn.ssl.cloudfiles.rackspacecloud.com"),
-            URI.create("http://c0354712.cdn.stream.cloudfiles.rackspacecloud.com"),
-            URI.create("http://c0354712.cdn.iosr.cloudfiles.rackspacecloud.com")),
-         new ContainerCDNMetadata(
-            "adriancole-blobstore5", 
-            true, 
-            false,
-            28800, 
-            URI.create("http://c0404671.cdn.cloudfiles.rackspacecloud.com"),
-            URI.create("https://c0404671.cdn.ssl.cloudfiles.rackspacecloud.com"),
-            URI.create("http://c0404671.cdn.stream.cloudfiles.rackspacecloud.com"),
-            URI.create("http://c0404671.cdn.iosr.cloudfiles.rackspacecloud.com")),
-         new ContainerCDNMetadata(
-            "adriancole-cfcdnint.testCDNOperationsContainerWithCDN", 
-            false, 
-            false,
-            3600, 
-            URI.create("http://c0320431.cdn.cloudfiles.rackspacecloud.com"),
-            URI.create("https://c0320431.cdn.ssl.cloudfiles.rackspacecloud.com"),
-            URI.create("http://c0320431.cdn.stream.cloudfiles.rackspacecloud.com"),
-            URI.create("http://c0320431.cdn.iosr.cloudfiles.rackspacecloud.com")));
-      
-      ParseJson<SortedSet<ContainerCDNMetadata>> parser = i.getInstance(Key
-               .get(new TypeLiteral<ParseJson<SortedSet<ContainerCDNMetadata>>>() {
-               }));
-      assertEquals(parser.apply(HttpResponse.builder().statusCode(200).message("ok").payload(is).build()), expects);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/internal/BaseCloudFilesRestClientExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/internal/BaseCloudFilesRestClientExpectTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/internal/BaseCloudFilesRestClientExpectTest.java
deleted file mode 100644
index 3cf679a..0000000
--- a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/internal/BaseCloudFilesRestClientExpectTest.java
+++ /dev/null
@@ -1,47 +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.cloudfiles.internal;
-
-import java.util.Properties;
-
-import org.jclouds.apis.ApiMetadata;
-import org.jclouds.cloudfiles.CloudFilesApiMetadata;
-import org.jclouds.cloudfiles.CloudFilesClient;
-import org.jclouds.openstack.keystone.v1_1.internal.BaseKeystoneRestClientExpectTest;
-
-/**
- * Base class for writing CloudFiles Rest Client Expect tests
- */
-public class BaseCloudFilesRestClientExpectTest extends BaseKeystoneRestClientExpectTest<CloudFilesClient> {
-
-   public BaseCloudFilesRestClientExpectTest() {
-      provider = "cloudfiles";
-   }
-
-   @Override
-   protected Properties setupProperties() {
-      Properties overrides = new Properties();
-      overrides.setProperty(provider + ".endpoint", endpoint);
-      return overrides;
-   }
-
-   @Override
-   protected ApiMetadata createApiMetadata() {
-      return new CloudFilesApiMetadata();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/apis/cloudfiles/src/test/resources/test_list_cdn.json
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/test/resources/test_list_cdn.json b/apis/cloudfiles/src/test/resources/test_list_cdn.json
deleted file mode 100644
index 7e06979..0000000
--- a/apis/cloudfiles/src/test/resources/test_list_cdn.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-    {
-        "name":"adriancole-blobstore.testCDNOperationsContainerWithCDN",
-        "cdn_enabled":"false",
-        "log_retention":"false",
-        "ttl":3600,
-        "cdn_uri":"http://c0354712.cdn.cloudfiles.rackspacecloud.com",
-        "cdn_ssl_uri":"https://c0354712.cdn.ssl.cloudfiles.rackspacecloud.com",
-        "cdn_streaming_uri":"http://c0354712.cdn.stream.cloudfiles.rackspacecloud.com",
-        "cdn_ios_uri":"http://c0354712.cdn.iosr.cloudfiles.rackspacecloud.com"
-    },
-    {
-        "name":"adriancole-blobstore5",
-        "cdn_enabled":"true",
-        "log_retention":"false",
-        "ttl":28800,
-        "cdn_uri":"http://c0404671.cdn.cloudfiles.rackspacecloud.com",
-        "cdn_ssl_uri":"https://c0404671.cdn.ssl.cloudfiles.rackspacecloud.com",
-        "cdn_streaming_uri":"http://c0404671.cdn.stream.cloudfiles.rackspacecloud.com",
-        "cdn_ios_uri":"http://c0404671.cdn.iosr.cloudfiles.rackspacecloud.com"
-    },
-    {
-        "name":"adriancole-cfcdnint.testCDNOperationsContainerWithCDN",
-        "cdn_enabled":"false",
-        "log_retention":"false",
-        "ttl":3600,
-        "cdn_uri":"http://c0320431.cdn.cloudfiles.rackspacecloud.com",
-        "cdn_ssl_uri":"https://c0320431.cdn.ssl.cloudfiles.rackspacecloud.com",
-        "cdn_streaming_uri":"http://c0320431.cdn.stream.cloudfiles.rackspacecloud.com",
-        "cdn_ios_uri":"http://c0320431.cdn.iosr.cloudfiles.rackspacecloud.com"
-    }
-]

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/apis/pom.xml
----------------------------------------------------------------------
diff --git a/apis/pom.xml b/apis/pom.xml
index ca8d7c8..d7528b0 100644
--- a/apis/pom.xml
+++ b/apis/pom.xml
@@ -46,7 +46,6 @@
     <module>openstack-nova-ec2</module>
     <module>openstack-swift</module>
     <module>openstack-trove</module>
-    <module>cloudfiles</module>
     <module>rackspace-cloudidentity</module>
     <module>rackspace-cloudloadbalancers</module>
     <module>rackspace-clouddns</module>

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-uk/README.txt
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-uk/README.txt b/providers/cloudfiles-uk/README.txt
deleted file mode 100644
index 63f85c6..0000000
--- a/providers/cloudfiles-uk/README.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# The jclouds provider for Rackspace's UK Cloud Files (http://www.rackspacecloud.com/cloud_hosting_products/files/).
-#
-# Expects the jclouds cloudfiles API to be present on your application's classpath.
-#
-# TODO: Implementation status.
-# TODO: Supported features.
-# TODO: Usage example.

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-uk/pom.xml
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-uk/pom.xml b/providers/cloudfiles-uk/pom.xml
deleted file mode 100644
index f8999f4..0000000
--- a/providers/cloudfiles-uk/pom.xml
+++ /dev/null
@@ -1,136 +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>cloudfiles-uk</artifactId>
-  <name>jclouds CloudFiles UK provider</name>
-  <description>CloudFiles implementation targeted to Rackspace UK</description>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <test.blobstore.container-count>15</test.blobstore.container-count>
-    <test.cloudfiles-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudfiles-uk.endpoint>
-    <test.cloudfiles-uk.api-version>1.0</test.cloudfiles-uk.api-version>
-    <test.cloudfiles-uk.build-version />
-    <test.cloudfiles-uk.identity>${test.rackspace-uk.identity}</test.cloudfiles-uk.identity>
-    <test.cloudfiles-uk.credential>${test.rackspace-uk.credential}</test.cloudfiles-uk.credential>
-
-    <jclouds.osgi.export>org.jclouds.rackspace.cloudfiles*;version="${project.version}"</jclouds.osgi.export>
-    <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.jclouds.api</groupId>
-      <artifactId>cloudfiles</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jclouds.api</groupId>
-      <artifactId>swift</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jclouds.api</groupId>
-      <artifactId>cloudfiles</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-blobstore</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>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.auto.service</groupId>
-      <artifactId>auto-service</artifactId>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-
-  <profiles>
-    <profile>
-      <id>live</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>integration</id>
-                <phase>integration-test</phase>
-                <goals>
-                  <goal>test</goal>
-                </goals>
-                <configuration>
-                  <threadCount>1</threadCount>
-                  <systemPropertyVariables>
-                    <test.blobstore.container-count>${test.blobstore.container-count}</test.blobstore.container-count>
-                    <test.cloudfiles-uk.endpoint>${test.cloudfiles-uk.endpoint}</test.cloudfiles-uk.endpoint>
-                    <test.cloudfiles-uk.api-version>${test.cloudfiles-uk.api-version}</test.cloudfiles-uk.api-version>
-                    <test.cloudfiles-uk.build-version>${test.cloudfiles-uk.build-version}</test.cloudfiles-uk.build-version>
-                    <test.cloudfiles-uk.identity>${test.cloudfiles-uk.identity}</test.cloudfiles-uk.identity>
-                    <test.cloudfiles-uk.credential>${test.cloudfiles-uk.credential}</test.cloudfiles-uk.credential>
-                    <jclouds.blobstore.httpstream.url>${jclouds.blobstore.httpstream.url}</jclouds.blobstore.httpstream.url>
-                    <jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5>
-                  </systemPropertyVariables>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-</project>
-

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java b/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java
deleted file mode 100644
index 4ceb23c..0000000
--- a/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java
+++ /dev/null
@@ -1,83 +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.rackspace.cloudfiles;
-
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.cloudfiles.CloudFilesApiMetadata;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-
-import com.google.auto.service.AutoService;
-
-/**
- * Implementation of {@link ProviderMetadata} for Rackspace Cloud Files UK.
- */
-@AutoService(ProviderMetadata.class)
-public class CloudFilesUKProviderMetadata extends BaseProviderMetadata {
-   
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   @Override
-   public Builder toBuilder() {
-      return builder().fromProviderMetadata(this);
-   }
-   
-   public CloudFilesUKProviderMetadata() {
-      super(builder());
-   }
-
-   public CloudFilesUKProviderMetadata(Builder builder) {
-      super(builder);
-   }
-
-   public static Properties defaultProperties() {
-      Properties properties = new Properties();
-      properties.setProperty(PROPERTY_REGIONS, "UK");
-      return properties;
-   }
-   public static class Builder extends BaseProviderMetadata.Builder {
-
-      protected Builder() {
-         id("cloudfiles-uk")
-         .name("Rackspace Cloud Files UK")
-         .apiMetadata(new CloudFilesApiMetadata())
-         .endpoint("https://lon.auth.api.rackspacecloud.com")
-         .homepage(URI.create("http://www.rackspace.co.uk/cloud-hosting/cloud-products/cloud-files"))
-         .console(URI.create("https://lon.manage.rackspacecloud.com"))
-         .linkedServices("cloudfiles-uk", "cloudservers-uk", "cloudloadbalancers-uk")
-         .iso3166Codes("GB-SLG");
-      }
-
-      @Override
-      public CloudFilesUKProviderMetadata build() {
-         return new CloudFilesUKProviderMetadata(this);
-      }
-      
-      @Override
-      public Builder fromProviderMetadata(
-            ProviderMetadata in) {
-         super.fromProviderMetadata(in);
-         return this;
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKClientLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKClientLiveTest.java b/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKClientLiveTest.java
deleted file mode 100644
index 57bb3c1..0000000
--- a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKClientLiveTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.rackspace.cloudfiles;
-
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudfiles.CloudFilesClient;
-import org.jclouds.cloudfiles.CloudFilesClientLiveTest;
-import org.jclouds.openstack.swift.domain.SwiftObject;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code CloudFilesClient}
- */
-@Test(groups = "live", singleThreaded = true, testName = "CloudFilesUKClientLiveTest")
-public class CloudFilesUKClientLiveTest extends CloudFilesClientLiveTest {
-   public CloudFilesUKClientLiveTest() {
-      provider = "cloudfiles-uk";
-   }
-   
-   // NOTE cloudfilesuk doesn't have cdn
-
-   @Override
-   public CloudFilesClient getApi() {
-      return view.unwrapApi(CloudFilesClient.class);
-   }
-   
-   @Override
-   protected void testGetObjectContentType(SwiftObject getBlob) {
-      //lovely new bug.. should be text/plain
-      assertEquals(getBlob.getInfo().getContentType(), "application/x-www-form-urlencoded");
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderTest.java b/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderTest.java
deleted file mode 100644
index 19fb856..0000000
--- a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderTest.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.rackspace.cloudfiles;
-
-import org.jclouds.cloudfiles.CloudFilesApiMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadataTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "CloudFilesUKProviderTest")
-public class CloudFilesUKProviderTest extends BaseProviderMetadataTest {
-
-   public CloudFilesUKProviderTest() {
-      super(new CloudFilesUKProviderMetadata(), new CloudFilesApiMetadata());
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobIntegrationLiveTest.java b/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobIntegrationLiveTest.java
deleted file mode 100644
index 8257ba5..0000000
--- a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobIntegrationLiveTest.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.rackspace.cloudfiles.blobstore.integration;
-
-import org.jclouds.cloudfiles.blobstore.integration.CloudFilesBlobIntegrationLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups =  "live", testName = "CloudFilesUKBlobIntegrationLiveTest")
-public class CloudFilesUKBlobIntegrationLiveTest extends CloudFilesBlobIntegrationLiveTest {
-   public CloudFilesUKBlobIntegrationLiveTest() {
-      provider = "cloudfiles-uk";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobLiveTest.java b/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobLiveTest.java
deleted file mode 100644
index 7f87d5d..0000000
--- a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobLiveTest.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.rackspace.cloudfiles.blobstore.integration;
-
-import org.jclouds.cloudfiles.blobstore.integration.CloudFilesBlobLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups =  "live", testName = "CloudFilesUKBlobLiveTest")
-public class CloudFilesUKBlobLiveTest extends CloudFilesBlobLiveTest {
-   public CloudFilesUKBlobLiveTest() {
-      provider = "cloudfiles-uk";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobSignerLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobSignerLiveTest.java b/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobSignerLiveTest.java
deleted file mode 100644
index 682d119..0000000
--- a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKBlobSignerLiveTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.rackspace.cloudfiles.blobstore.integration;
-
-import org.jclouds.cloudfiles.blobstore.integration.CloudFilesBlobSignerLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups =  "live", testName = "CloudFilesUKBlobSignerLiveTest")
-public class CloudFilesUKBlobSignerLiveTest extends CloudFilesBlobSignerLiveTest {
-   public CloudFilesUKBlobSignerLiveTest() {
-      provider = "cloudfiles-uk";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKContainerIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKContainerIntegrationLiveTest.java b/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKContainerIntegrationLiveTest.java
deleted file mode 100644
index d76150a..0000000
--- a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKContainerIntegrationLiveTest.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.rackspace.cloudfiles.blobstore.integration;
-
-import org.jclouds.cloudfiles.blobstore.integration.CloudFilesContainerIntegrationLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups =  "live", testName = "CloudFilesUKContainerIntegrationLiveTest")
-public class CloudFilesUKContainerIntegrationLiveTest extends CloudFilesContainerIntegrationLiveTest {
-   public CloudFilesUKContainerIntegrationLiveTest() {
-      provider = "cloudfiles-uk";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKContainerLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKContainerLiveTest.java b/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKContainerLiveTest.java
deleted file mode 100644
index 908d363..0000000
--- a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKContainerLiveTest.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.rackspace.cloudfiles.blobstore.integration;
-
-import org.jclouds.cloudfiles.blobstore.integration.CloudFilesContainerLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups =  "live", testName = "CloudFilesUKContainerLiveTest")
-public class CloudFilesUKContainerLiveTest extends CloudFilesContainerLiveTest {
-   public CloudFilesUKContainerLiveTest() {
-      provider = "cloudfiles-uk";
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKServiceIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKServiceIntegrationLiveTest.java b/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKServiceIntegrationLiveTest.java
deleted file mode 100644
index ff3ba9d..0000000
--- a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUKServiceIntegrationLiveTest.java
+++ /dev/null
@@ -1,36 +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.rackspace.cloudfiles.blobstore.integration;
-
-import java.util.Set;
-
-import org.jclouds.cloudfiles.blobstore.integration.CloudFilesServiceIntegrationLiveTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups =  "live", testName = "CloudFilesUKServiceIntegrationLiveTest")
-public class CloudFilesUKServiceIntegrationLiveTest extends CloudFilesServiceIntegrationLiveTest {
-   public CloudFilesUKServiceIntegrationLiveTest() {
-      provider = "cloudfiles-uk";
-   }
-
-   @Override
-   protected Set<String> getIso3166Codes() {
-      return ImmutableSet.<String> of("GB-SLG");
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-us/README.txt
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-us/README.txt b/providers/cloudfiles-us/README.txt
deleted file mode 100644
index 18c5214..0000000
--- a/providers/cloudfiles-us/README.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# The jclouds provider for Rackspace's US Cloud Files (http://www.rackspacecloud.com/cloud_hosting_products/files/).
-#
-# Expects the jclouds cloudfiles API to be present on your application's classpath.
-#
-# TODO: Implementation status.
-# TODO: Supported features.
-# TODO: Usage example.

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-us/pom.xml b/providers/cloudfiles-us/pom.xml
deleted file mode 100644
index 41341ef..0000000
--- a/providers/cloudfiles-us/pom.xml
+++ /dev/null
@@ -1,138 +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>cloudfiles-us</artifactId>
-  <name>jclouds CloudFiles US provider</name>
-  <description>CloudFiles implementation targeted to Rackspace US</description>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <test.initializer>org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUSTestInitializer</test.initializer>
-    <test.blobstore.container-count>15</test.blobstore.container-count>
-    <test.cloudfiles-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudfiles-us.endpoint>
-    <test.cloudfiles-us.api-version>1.0</test.cloudfiles-us.api-version>
-    <test.cloudfiles-us.build-version />
-    <test.cloudfiles-us.identity>${test.rackspace-us.identity}</test.cloudfiles-us.identity>
-    <test.cloudfiles-us.credential>${test.rackspace-us.credential}</test.cloudfiles-us.credential>
-
-    <jclouds.osgi.export>org.jclouds.rackspace.cloudfiles*;version="${project.version}"</jclouds.osgi.export>
-    <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.jclouds.api</groupId>
-      <artifactId>cloudfiles</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jclouds.api</groupId>
-      <artifactId>swift</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jclouds.api</groupId>
-      <artifactId>cloudfiles</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-blobstore</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>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.auto.service</groupId>
-      <artifactId>auto-service</artifactId>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-
-  <profiles>
-    <profile>
-      <id>live</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>integration</id>
-                <phase>integration-test</phase>
-                <goals>
-                  <goal>test</goal>
-                </goals>
-                <configuration>
-                  <threadCount>1</threadCount>
-                  <systemPropertyVariables>
-                    <test.blobstore.container-count>${test.blobstore.container-count}</test.blobstore.container-count>
-                    <test.cloudfiles-us.endpoint>${test.cloudfiles-us.endpoint}</test.cloudfiles-us.endpoint>
-                    <test.cloudfiles-us.api-version>${test.cloudfiles-us.api-version}</test.cloudfiles-us.api-version>
-                    <test.cloudfiles-us.build-version>${test.cloudfiles-us.build-version}</test.cloudfiles-us.build-version>
-                    <test.cloudfiles-us.identity>${test.cloudfiles-us.identity}</test.cloudfiles-us.identity>
-                    <test.cloudfiles-us.credential>${test.cloudfiles-us.credential}</test.cloudfiles-us.credential>
-                    <test.initializer>${test.initializer}</test.initializer>
-                    <jclouds.blobstore.httpstream.url>${jclouds.blobstore.httpstream.url}</jclouds.blobstore.httpstream.url>
-                    <jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5>
-                  </systemPropertyVariables>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-</project>
-

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java b/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java
deleted file mode 100644
index a8df816..0000000
--- a/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java
+++ /dev/null
@@ -1,84 +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.rackspace.cloudfiles;
-
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.cloudfiles.CloudFilesApiMetadata;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-
-import com.google.auto.service.AutoService;
-
-/**
- * Implementation of {@link ProviderMetadata} for Rackspace Cloud Files US.
- */
-@AutoService(ProviderMetadata.class)
-public class CloudFilesUSProviderMetadata extends BaseProviderMetadata {
-
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   @Override
-   public Builder toBuilder() {
-      return builder().fromProviderMetadata(this);
-   }
-   
-   public CloudFilesUSProviderMetadata() {
-      super(builder());
-   }
-
-   public CloudFilesUSProviderMetadata(Builder builder) {
-      super(builder);
-   }
-
-   public static Properties defaultProperties() {
-      Properties properties = new Properties();
-      properties.setProperty(PROPERTY_REGIONS, "US");
-      return properties;
-   }
-   
-   public static class Builder extends BaseProviderMetadata.Builder {
-
-      protected Builder() {
-         id("cloudfiles-us")
-         .name("Rackspace Cloud Files US")
-         .apiMetadata(new CloudFilesApiMetadata())
-         .endpoint("https://auth.api.rackspacecloud.com")
-         .homepage(URI.create("http://www.rackspace.com/cloud/cloud_hosting_products/files"))
-         .console(URI.create("https://manage.rackspacecloud.com"))
-         .linkedServices("cloudfiles-us", "cloudservers-us", "cloudloadbalancers-us")
-         .iso3166Codes("US-IL", "US-TX", "AU-NSW");
-      }
-
-      @Override
-      public CloudFilesUSProviderMetadata build() {
-         return new CloudFilesUSProviderMetadata(this);
-      }
-      
-      @Override
-      public Builder fromProviderMetadata(
-            ProviderMetadata in) {
-         super.fromProviderMetadata(in);
-         return this;
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSClientLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSClientLiveTest.java b/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSClientLiveTest.java
deleted file mode 100644
index 7b56739..0000000
--- a/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSClientLiveTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.rackspace.cloudfiles;
-
-import org.jclouds.cloudfiles.CloudFilesClientLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code CloudFilesClient}
- */
-@Test(groups = "live", sequential = true, testName = "CloudFilesUSClientLiveTest")
-public class CloudFilesUSClientLiveTest extends CloudFilesClientLiveTest {
-   public CloudFilesUSClientLiveTest() {
-      provider = "cloudfiles-us";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderTest.java b/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderTest.java
deleted file mode 100644
index c43ea28..0000000
--- a/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderTest.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.rackspace.cloudfiles;
-
-import org.jclouds.cloudfiles.CloudFilesApiMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadataTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "CloudFilesUSProviderTest")
-public class CloudFilesUSProviderTest extends BaseProviderMetadataTest {
-
-   public CloudFilesUSProviderTest() {
-      super(new CloudFilesUSProviderMetadata(), new CloudFilesApiMetadata());
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSBlobIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSBlobIntegrationLiveTest.java b/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSBlobIntegrationLiveTest.java
deleted file mode 100644
index 271f143..0000000
--- a/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSBlobIntegrationLiveTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.rackspace.cloudfiles.blobstore.integration;
-
-import org.jclouds.cloudfiles.blobstore.integration.CloudFilesBlobIntegrationLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups =  "live", testName = "CloudFilesUSBlobIntegrationLiveTest", singleThreaded = true)
-public class CloudFilesUSBlobIntegrationLiveTest extends CloudFilesBlobIntegrationLiveTest {
-   public CloudFilesUSBlobIntegrationLiveTest() {
-      provider = "cloudfiles-us";
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/87b88530/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSBlobLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSBlobLiveTest.java b/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSBlobLiveTest.java
deleted file mode 100644
index 0c98d1e..0000000
--- a/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSBlobLiveTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.rackspace.cloudfiles.blobstore.integration;
-
-import org.jclouds.cloudfiles.blobstore.integration.CloudFilesBlobLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups =  "live", testName = "CloudFilesUSBlobLiveTest")
-public class CloudFilesUSBlobLiveTest extends CloudFilesBlobLiveTest {
-   public CloudFilesUSBlobLiveTest() {
-      provider = "cloudfiles-us";
-   }
-}