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/04/08 01:45:46 UTC
[3/3] jclouds-labs-openstack git commit: Remove promoted cloudfiles
api and providers
Remove promoted cloudfiles api and providers
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/e7d93f40
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/e7d93f40
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/e7d93f40
Branch: refs/heads/master
Commit: e7d93f40689dc6b138e4d064254acf75fcb51e04
Parents: 70fd93b
Author: Zack Shoylev <za...@rackspace.com>
Authored: Tue Apr 7 17:13:58 2015 -0500
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Tue Apr 7 18:41:39 2015 -0500
----------------------------------------------------------------------
README.md | 3 -
pom.xml | 5 +-
rackspace-cloudfiles-uk/README.md | 21 -
rackspace-cloudfiles-uk/pom.xml | 176 -------
.../uk/CloudFilesUKProviderMetadata.java | 123 -----
.../cloudfiles/uk/CloudFilesUKProviderTest.java | 28 -
.../CloudFilesUKBlobIntegrationLiveTest.java | 27 -
.../integration/CloudFilesUKBlobLiveTest.java | 27 -
.../CloudFilesUKBlobSignerLiveTest.java | 27 -
...loudFilesUKContainerIntegrationLiveTest.java | 27 -
.../CloudFilesUKContainerLiveTest.java | 27 -
.../CloudFilesUKServiceIntegrationLiveTest.java | 36 --
.../src/test/resources/logback.xml | 71 ---
rackspace-cloudfiles-us/README.md | 22 -
rackspace-cloudfiles-us/pom.xml | 176 -------
.../us/CloudFilesUSProviderMetadata.java | 145 -----
.../cloudfiles/us/CloudFilesUSProviderTest.java | 28 -
.../CloudFilesUSBlobIntegrationLiveTest.java | 27 -
.../integration/CloudFilesUSBlobLiveTest.java | 27 -
.../CloudFilesUSBlobSignerLiveTest.java | 27 -
...loudFilesUSContainerIntegrationLiveTest.java | 27 -
.../CloudFilesUSContainerLiveTest.java | 27 -
.../CloudFilesUSServiceIntegrationLiveTest.java | 36 --
.../src/test/resources/logback.xml | 71 ---
rackspace-cloudfiles/README.md | 22 -
rackspace-cloudfiles/pom.xml | 176 -------
.../rackspace/cloudfiles/v1/CloudFilesApi.java | 51 --
.../cloudfiles/v1/CloudFilesApiMetadata.java | 104 ----
.../BindCDNPurgeEmailAddressesToHeaders.java | 53 --
.../v1/config/CloudFilesHttpApiModule.java | 50 --
.../cloudfiles/v1/domain/CDNContainer.java | 262 ----------
.../cloudfiles/v1/features/CDNApi.java | 204 --------
.../functions/ParseCDNContainerFromHeaders.java | 81 ---
.../ParseCDNContainerURIFromHeaders.java | 41 --
.../v1/functions/RegionToCDNEndpoint.java | 73 ---
.../v1/handlers/CloudFilesErrorHandler.java | 91 ----
.../v1/options/ListCDNContainerOptions.java | 86 ---
.../v1/options/UpdateCDNContainerOptions.java | 177 -------
.../v1/reference/CloudFilesConstants.java | 31 --
.../v1/reference/CloudFilesHeaders.java | 44 --
.../cloudfiles/v1/CloudFilesApiLiveTest.java | 27 -
.../v1/CloudFilesApiMetadataTest.java | 34 --
...CDNPurgeEmailAddressesToHeadersMockTest.java | 74 ---
...lesRegionScopedBlobStoreContextLiveTest.java | 42 --
.../CloudFilesBlobIntegrationLiveTest.java | 39 --
.../integration/CloudFilesBlobLiveTest.java | 39 --
.../CloudFilesBlobSignerLiveTest.java | 39 --
.../CloudFilesContainerIntegrationLiveTest.java | 39 --
.../CloudFilesContainerLiveTest.java | 56 --
.../CloudFilesServiceIntegrationLiveTest.java | 39 --
.../features/CloudFilesAccountApiLiveTest.java | 44 --
.../v1/features/CloudFilesBulkApiLiveTest.java | 31 --
.../v1/features/CloudFilesCDNApiLiveTest.java | 190 -------
.../v1/features/CloudFilesCDNApiMockTest.java | 523 -------------------
.../CloudFilesContainerApiLiveTest.java | 31 --
.../features/CloudFilesObjectApiLiveTest.java | 31 --
.../v1/internal/BaseCloudFilesApiLiveTest.java | 31 --
.../options/UpdateCDNContainerOptionsTest.java | 109 ----
.../src/test/resources/cdn_container_list.json | 42 --
.../test/resources/cdn_container_list_at.json | 22 -
.../src/test/resources/logback.xml | 71 ---
61 files changed, 1 insertion(+), 4309 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 2913b79..8a84c21 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,7 @@ Although this is a "labs" repository, some of the providers and APIs here are pr
| openstack-marconi | API | No |
| openstack-neutron | API | Yes |
| rackspace-autoscale | API | No |
-| rackspace-cloudfiles | API | No |
| rackspace-autoscale-us | Provider | No |
-| rackspace-cloudfiles-uk | Provider | Beta |
-| rackspace-cloudfiles-us | Provider | Beta |
| rackspace-cloudqueues-us | Provider | No |
APIs new to jclouds are marked as Beta. That means we need people to use it and give us feedback. Based on that feedback, minor changes to the interfaces may happen. It is recommended you adopt this code sooner than later.
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 49fb55d..70c8f7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,10 +65,7 @@
<module>rackspace-cloudqueues-us</module>
<module>rackspace-cloudqueues-uk</module>
<module>rackspace-cloudbigdata</module>
- <module>rackspace-cloudbigdata-us</module>
- <module>rackspace-cloudfiles</module>
- <module>rackspace-cloudfiles-uk</module>
- <module>rackspace-cloudfiles-us</module>
+ <module>rackspace-cloudbigdata-us</module>
<module>rackspace-cloudnetworks-uk</module>
<module>rackspace-cloudnetworks-us</module>
<module>rackspace-cdn-uk</module>
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-uk/README.md
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-uk/README.md b/rackspace-cloudfiles-uk/README.md
deleted file mode 100644
index 71d04bb..0000000
--- a/rackspace-cloudfiles-uk/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Rackspace Cloud Files UK
-========================
-
-The new Rackspace Cloud Files UK multi-region based provider.
-
-This new "rackspace-cloudfiles-uk" provider supercedes the jclouds "cloudfiles-uk" provider, which will eventually be deprecated.
-
-With this multi-region support, a BlobStore can be isolated to a specific region:
-
- RegionScopedBlobStoreContext ctx =
- contextBuilder.buildView(RegionScopedBlobStoreContext.class);
-
- Set<String> regionIds = ctx.configuredRegions();
-
- // isolated to the only UK region
- BlobStore dfwBlobStore = ctx.blobStoreInRegion("LON");
-
-Production ready?
-Beta
-
-This API is new to jclouds and hence is in Beta. That means we need people to use it and give us feedback. Based on that feedback, minor changes to the interfaces may happen. This code will replace org.jclouds.openstack.swift.SwiftClient in jclouds 2.0 and it is recommended you adopt it sooner than later.
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-uk/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-uk/pom.xml b/rackspace-cloudfiles-uk/pom.xml
deleted file mode 100644
index abcbb84..0000000
--- a/rackspace-cloudfiles-uk/pom.xml
+++ /dev/null
@@ -1,176 +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 />
- </parent>
-
- <!-- TODO: when out of labs, switch to org.jclouds.provider -->
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>rackspace-cloudfiles-uk</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <name>jclouds Rackspace Cloud Files UK provider</name>
- <description>OpenStack Object Storage implementation targeted to Rackspace Cloud Files UK</description>
- <packaging>bundle</packaging>
-
- <properties>
- <!-- identity endpoint -->
- <test.rackspace-cloudfiles-uk.endpoint>https://lon.identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudfiles-uk.endpoint>
- <test.rackspace-cloudfiles-uk.api-version>1</test.rackspace-cloudfiles-uk.api-version>
- <test.rackspace-cloudfiles-uk.build-version />
- <test.rackspace-cloudfiles-uk.identity>${test.rackspace-uk.identity}</test.rackspace-cloudfiles-uk.identity>
- <test.rackspace-cloudfiles-uk.credential>${test.rackspace-uk.credential}</test.rackspace-cloudfiles-uk.credential>
- <jclouds.osgi.export>org.jclouds.rackspace.cloudfiles.uk*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
- </properties>
-
- <repositories>
- <repository>
- <id>apache-snapshots</id>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-swift</artifactId>
- <version>${project.parent.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-swift</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>rackspace-cloudfiles</artifactId>
- <version>${project.parent.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>rackspace-cloudfiles</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-keystone</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-keystone</artifactId>
- <version>${project.parent.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-blobstore</artifactId>
- <version>${project.parent.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${project.parent.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-slf4j</artifactId>
- <version>${project.parent.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>rackspace-cloudidentity</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.auto.service</groupId>
- <artifactId>auto-service</artifactId>
- <scope>provided</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>
- <jclouds.blobstore.httpstream.url>${jclouds.blobstore.httpstream.url}</jclouds.blobstore.httpstream.url>
- <jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5>
- <test.rackspace-cloudfiles-uk.endpoint>${test.rackspace-cloudfiles-uk.endpoint}</test.rackspace-cloudfiles-uk.endpoint>
- <test.rackspace-cloudfiles-uk.api-version>${test.rackspace-cloudfiles-uk.api-version}</test.rackspace-cloudfiles-uk.api-version>
- <test.rackspace-cloudfiles-uk.build-version>${test.rackspace-cloudfiles-uk.build-version}</test.rackspace-cloudfiles-uk.build-version>
- <test.rackspace-cloudfiles-uk.identity>${test.rackspace-cloudfiles-uk.identity}</test.rackspace-cloudfiles-uk.identity>
- <test.rackspace-cloudfiles-uk.credential>${test.rackspace-cloudfiles-uk.credential}</test.rackspace-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-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/uk/CloudFilesUKProviderMetadata.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/uk/CloudFilesUKProviderMetadata.java b/rackspace-cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/uk/CloudFilesUKProviderMetadata.java
deleted file mode 100644
index bf4eefa..0000000
--- a/rackspace-cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/uk/CloudFilesUKProviderMetadata.java
+++ /dev/null
@@ -1,123 +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.uk;
-
-import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES;
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION;
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
-import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
-import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
-import static org.jclouds.reflect.Reflection2.typeToken;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
-import org.jclouds.openstack.swift.v1.blobstore.RegionScopedBlobStoreContext;
-import org.jclouds.openstack.swift.v1.blobstore.config.SignUsingTemporaryUrls;
-import org.jclouds.openstack.swift.v1.blobstore.config.SwiftBlobStoreContextModule;
-import org.jclouds.openstack.swift.v1.config.SwiftTypeAdapters;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApiMetadata;
-import org.jclouds.rackspace.cloudfiles.v1.config.CloudFilesHttpApiModule;
-import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
-import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
-import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
-
-import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-
-@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() {
- this(new Builder());
- }
-
- protected CloudFilesUKProviderMetadata(Builder builder) {
- super(builder);
- }
-
- public static Properties defaultProperties() {
- Properties properties = new Properties();
- properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
- properties.setProperty(SERVICE_TYPE, ServiceType.OBJECT_STORE);
-
- properties.setProperty(PROPERTY_REGIONS, "LON");
- properties.setProperty(PROPERTY_REGION + ".LON." + ISO3166_CODES, "GB-SLG");
-
- return properties;
- }
-
- public static class Builder extends BaseProviderMetadata.Builder {
-
- protected Builder() {
- id("rackspace-cloudfiles-uk")
- .name("Rackspace Cloud Files UK")
- .apiMetadata(new CloudFilesApiMetadata().toBuilder()
- .identityName("${userName}")
- .credentialName("${apiKey}")
- .defaultEndpoint("https://lon.identity.api.rackspacecloud.com/v2.0/")
- .documentation(URI.create("http://docs.rackspace.com/files/api/v1/cf-devguide/content/index.html"))
- .endpointName("Rackspace Cloud Identity service URL ending in /v2.0/")
- .version("1.0")
- .view(typeToken(RegionScopedBlobStoreContext.class))
- .defaultModules(ImmutableSet.<Class<? extends Module>>builder()
- .add(CloudIdentityAuthenticationApiModule.class)
- .add(CloudIdentityAuthenticationModule.class)
- .add(RegionModule.class)
- .add(SwiftTypeAdapters.class)
- .add(CloudFilesHttpApiModule.class)
- .add(SwiftBlobStoreContextModule.class)
- .add(SignUsingTemporaryUrls.class)
- .build())
- .build())
- .homepage(URI.create("http://www.rackspace.co.uk/cloud/files/"))
- .console(URI.create("https://mycloud.rackspace.co.uk"))
- .linkedServices("rackspace-autoscale-uk", "rackspace-cloudblockstorage-uk",
- "rackspace-clouddatabases-uk", "rackspace-clouddns-uk",
- "rackspace-cloudidentity", "rackspace-cloudloadbalancers-uk",
- "rackspace-cloudqueues-uk")
- .iso3166Codes("GB-SLG")
- .defaultProperties(CloudFilesUKProviderMetadata.defaultProperties());
-
- }
-
- @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-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/CloudFilesUKProviderTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/CloudFilesUKProviderTest.java b/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/CloudFilesUKProviderTest.java
deleted file mode 100644
index 3e37705..0000000
--- a/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/CloudFilesUKProviderTest.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.uk;
-
-import org.jclouds.providers.internal.BaseProviderMetadataTest;
-import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApiMetadata;
-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-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKBlobIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKBlobIntegrationLiveTest.java b/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKBlobIntegrationLiveTest.java
deleted file mode 100644
index 3486d5c..0000000
--- a/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKBlobIntegrationLiveTest.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.uk.blobstore.integration;
-
-import org.jclouds.rackspace.cloudfiles.v1.blobstore.integration.CloudFilesBlobIntegrationLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", testName = "CloudFilesUKBlobIntegrationLiveTest")
-public class CloudFilesUKBlobIntegrationLiveTest extends CloudFilesBlobIntegrationLiveTest {
- public CloudFilesUKBlobIntegrationLiveTest() {
- provider = "rackspace-cloudfiles-uk";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKBlobLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKBlobLiveTest.java b/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKBlobLiveTest.java
deleted file mode 100644
index de90308..0000000
--- a/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKBlobLiveTest.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.uk.blobstore.integration;
-
-import org.jclouds.rackspace.cloudfiles.v1.blobstore.integration.CloudFilesBlobLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", testName = "CloudFilesUKBlobLiveTest")
-public class CloudFilesUKBlobLiveTest extends CloudFilesBlobLiveTest {
- public CloudFilesUKBlobLiveTest() {
- provider = "rackspace-cloudfiles-uk";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKBlobSignerLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKBlobSignerLiveTest.java b/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKBlobSignerLiveTest.java
deleted file mode 100644
index a9acd72..0000000
--- a/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/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.uk.blobstore.integration;
-
-import org.jclouds.rackspace.cloudfiles.v1.blobstore.integration.CloudFilesBlobSignerLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", testName = "CloudFilesUKBlobSignerLiveTest")
-public class CloudFilesUKBlobSignerLiveTest extends CloudFilesBlobSignerLiveTest {
- public CloudFilesUKBlobSignerLiveTest() {
- provider = "rackspace-cloudfiles-uk";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKContainerIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKContainerIntegrationLiveTest.java b/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKContainerIntegrationLiveTest.java
deleted file mode 100644
index 9dcf7cc..0000000
--- a/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKContainerIntegrationLiveTest.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.uk.blobstore.integration;
-
-import org.jclouds.rackspace.cloudfiles.v1.blobstore.integration.CloudFilesContainerIntegrationLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", testName = "CloudFilesUKContainerIntegrationLiveTest")
-public class CloudFilesUKContainerIntegrationLiveTest extends CloudFilesContainerIntegrationLiveTest {
- public CloudFilesUKContainerIntegrationLiveTest() {
- provider = "rackspace-cloudfiles-uk";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKContainerLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKContainerLiveTest.java b/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKContainerLiveTest.java
deleted file mode 100644
index 902e4f4..0000000
--- a/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKContainerLiveTest.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.uk.blobstore.integration;
-
-import org.jclouds.rackspace.cloudfiles.v1.blobstore.integration.CloudFilesContainerLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", testName = "CloudFilesUKContainerLiveTest")
-public class CloudFilesUKContainerLiveTest extends CloudFilesContainerLiveTest {
- public CloudFilesUKContainerLiveTest() {
- provider = "rackspace-cloudfiles-uk";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKServiceIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKServiceIntegrationLiveTest.java b/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/blobstore/integration/CloudFilesUKServiceIntegrationLiveTest.java
deleted file mode 100644
index 5115341..0000000
--- a/rackspace-cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/uk/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.uk.blobstore.integration;
-
-import java.util.Set;
-
-import org.jclouds.rackspace.cloudfiles.v1.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 = "rackspace-cloudfiles-uk";
- }
-
- @Override
- protected Set<String> getIso3166Codes() {
- return ImmutableSet.<String> of("GB-SLG");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-uk/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-uk/src/test/resources/logback.xml b/rackspace-cloudfiles-uk/src/test/resources/logback.xml
deleted file mode 100644
index ce891f1..0000000
--- a/rackspace-cloudfiles-uk/src/test/resources/logback.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.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.
-
--->
-<configuration scan="false">
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-wire.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-blobstore.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <root>
- <level value="warn" />
- </root>
-
- <logger name="org.jclouds">
- <level value="DEBUG" />
- <appender-ref ref="FILE" />
- </logger>
-
-<!--
- <logger name="jclouds.wire">
- <level value="DEBUG" />
- <appender-ref ref="WIREFILE" />
- </logger>
--->
-
- <logger name="jclouds.headers">
- <level value="DEBUG" />
- <appender-ref ref="WIREFILE" />
- </logger>
-
- <logger name="jclouds.blobstore">
- <level value="DEBUG" />
- <appender-ref ref="BLOBSTOREFILE" />
- </logger>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-us/README.md
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-us/README.md b/rackspace-cloudfiles-us/README.md
deleted file mode 100644
index 9bd50c2..0000000
--- a/rackspace-cloudfiles-us/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Rackspace Cloud Files US
-========================
-
-The new Rackspace Cloud Files US multi-region based provider.
-
-This new "rackspace-cloudfiles-us" provider supercedes the jclouds "cloudfiles-us" provider, which will eventually be deprecated.
-
-With this multi-region support, each BlobStore can be isolated to a specific region:
-
- RegionScopedBlobStoreContext ctx =
- contextBuilder.buildView(RegionScopedBlobStoreContext.class);
-
- Set<String> regionIds = ctx.configuredRegions();
-
- // isolated to a specific region
- BlobStore dfwBlobStore = ctx.blobStoreInRegion("DFW");
- BlobStore iadBlobStore = ctx.blobStoreInRegion("IAD");
-
-Production ready?
-Beta
-
-This API is new to jclouds and hence is in Beta. That means we need people to use it and give us feedback. Based on that feedback, minor changes to the interfaces may happen. This code will replace org.jclouds.openstack.swift.SwiftClient in jclouds 2.0 and it is recommended you adopt it sooner than later.
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-us/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-us/pom.xml b/rackspace-cloudfiles-us/pom.xml
deleted file mode 100644
index e0a150e..0000000
--- a/rackspace-cloudfiles-us/pom.xml
+++ /dev/null
@@ -1,176 +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 />
- </parent>
-
- <!-- TODO: when out of labs, switch to org.jclouds.provider -->
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>rackspace-cloudfiles-us</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <name>jclouds Rackspace Cloud Files US provider</name>
- <description>OpenStack Object Storage implementation targeted to Rackspace Cloud Files US</description>
- <packaging>bundle</packaging>
-
- <properties>
- <!-- identity endpoint -->
- <test.rackspace-cloudfiles-us.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudfiles-us.endpoint>
- <test.rackspace-cloudfiles-us.api-version>1</test.rackspace-cloudfiles-us.api-version>
- <test.rackspace-cloudfiles-us.build-version />
- <test.rackspace-cloudfiles-us.identity>${test.rackspace-us.identity}</test.rackspace-cloudfiles-us.identity>
- <test.rackspace-cloudfiles-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudfiles-us.credential>
- <jclouds.osgi.export>org.jclouds.rackspace.cloudfiles.us*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
- </properties>
-
- <repositories>
- <repository>
- <id>apache-snapshots</id>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-swift</artifactId>
- <version>${project.parent.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-swift</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>rackspace-cloudfiles</artifactId>
- <version>${project.parent.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>rackspace-cloudfiles</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-keystone</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-keystone</artifactId>
- <version>${project.parent.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-blobstore</artifactId>
- <version>${project.parent.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${project.parent.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-slf4j</artifactId>
- <version>${project.parent.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>rackspace-cloudidentity</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.auto.service</groupId>
- <artifactId>auto-service</artifactId>
- <scope>provided</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>
- <jclouds.blobstore.httpstream.url>${jclouds.blobstore.httpstream.url}</jclouds.blobstore.httpstream.url>
- <jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5>
- <test.rackspace-cloudfiles-us.endpoint>${test.rackspace-cloudfiles-us.endpoint}</test.rackspace-cloudfiles-us.endpoint>
- <test.rackspace-cloudfiles-us.api-version>${test.rackspace-cloudfiles-us.api-version}</test.rackspace-cloudfiles-us.api-version>
- <test.rackspace-cloudfiles-us.build-version>${test.rackspace-cloudfiles-us.build-version}</test.rackspace-cloudfiles-us.build-version>
- <test.rackspace-cloudfiles-us.identity>${test.rackspace-cloudfiles-us.identity}</test.rackspace-cloudfiles-us.identity>
- <test.rackspace-cloudfiles-us.credential>${test.rackspace-cloudfiles-us.credential}</test.rackspace-cloudfiles-us.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-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/us/CloudFilesUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/us/CloudFilesUSProviderMetadata.java b/rackspace-cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/us/CloudFilesUSProviderMetadata.java
deleted file mode 100644
index cea0ebd..0000000
--- a/rackspace-cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/us/CloudFilesUSProviderMetadata.java
+++ /dev/null
@@ -1,145 +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.us;
-
-import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES;
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION;
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
-import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
-import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
-import static org.jclouds.reflect.Reflection2.typeToken;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
-import org.jclouds.openstack.swift.v1.blobstore.RegionScopedBlobStoreContext;
-import org.jclouds.openstack.swift.v1.blobstore.config.SignUsingTemporaryUrls;
-import org.jclouds.openstack.swift.v1.blobstore.config.SwiftBlobStoreContextModule;
-import org.jclouds.openstack.swift.v1.config.SwiftTypeAdapters;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApiMetadata;
-import org.jclouds.rackspace.cloudfiles.v1.config.CloudFilesHttpApiModule;
-import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
-import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
-import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
-
-import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-
-/**
- * Implementation of {@link ProviderMetadata} for Rackspace Cloud Files US regions.
- */
-@AutoService(ProviderMetadata.class)
-public class CloudFilesUSProviderMetadata extends BaseProviderMetadata {
-
- /**
- * @return The Builder object.
- */
- public static Builder builder() {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder() {
- return builder().fromProviderMetadata(this);
- }
-
- /**
- * Provider constructor.
- */
- public CloudFilesUSProviderMetadata() {
- this(new Builder());
- }
-
- /**
- * @param builder the Builder for the provider.
- */
- protected CloudFilesUSProviderMetadata(Builder builder) {
- super(builder);
- }
-
- /**
- * @return a {@link Properties} object containing the default provider properties.
- */
- public static Properties defaultProperties() {
- Properties properties = new Properties();
- properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
- properties.setProperty(SERVICE_TYPE, ServiceType.OBJECT_STORE);
-
- properties.setProperty(PROPERTY_REGIONS, "ORD,DFW,IAD,SYD,HKG");
- properties.setProperty(PROPERTY_REGION + ".ORD." + ISO3166_CODES, "US-IL");
- properties.setProperty(PROPERTY_REGION + ".DFW." + ISO3166_CODES, "US-TX");
- properties.setProperty(PROPERTY_REGION + ".IAD." + ISO3166_CODES, "US-VA");
- properties.setProperty(PROPERTY_REGION + ".SYD." + ISO3166_CODES, "AU-NSW");
- properties.setProperty(PROPERTY_REGION + ".HKG." + ISO3166_CODES, "HK");
-
- return properties;
- }
-
- /**
- * Builder pattern class.
- */
- public static class Builder extends BaseProviderMetadata.Builder {
-
- protected Builder() {
- id("rackspace-cloudfiles-us")
- .name("Rackspace Cloud Files US")
- .apiMetadata(new CloudFilesApiMetadata().toBuilder()
- .identityName("${userName}")
- .credentialName("${apiKey}")
- .defaultEndpoint("https://identity.api.rackspacecloud.com/v2.0/")
- .documentation(URI.create("http://docs.rackspace.com/files/api/v1/cf-devguide/content/index.html"))
- .endpointName("Rackspace Cloud Identity service URL ending in /v2.0/")
- .version("1.0")
- .view(typeToken(RegionScopedBlobStoreContext.class))
- .defaultModules(ImmutableSet.<Class<? extends Module>>builder()
- .add(CloudIdentityAuthenticationApiModule.class)
- .add(CloudIdentityAuthenticationModule.class)
- .add(RegionModule.class)
- .add(SwiftTypeAdapters.class)
- .add(CloudFilesHttpApiModule.class)
- .add(SwiftBlobStoreContextModule.class)
- .add(SignUsingTemporaryUrls.class)
- .build())
- .build())
- .homepage(URI.create("http://www.rackspace.com/cloud/files"))
- .console(URI.create("https://mycloud.rackspace.com"))
- .linkedServices("rackspace-autoscale-us", "rackspace-cloudblockstorage-us",
- "rackspace-clouddatabases-us", "rackspace-clouddns-us",
- "rackspace-cloudidentity", "rackspace-cloudloadbalancers-us",
- "rackspace-cloudqueues-us")
- .iso3166Codes("US-IL", "US-TX", "US-VA", "AU-NSW", "HK")
- .defaultProperties(CloudFilesUSProviderMetadata.defaultProperties());
-
- }
-
- @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-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/CloudFilesUSProviderTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/CloudFilesUSProviderTest.java b/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/CloudFilesUSProviderTest.java
deleted file mode 100644
index 3a717e7..0000000
--- a/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/CloudFilesUSProviderTest.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.us;
-
-import org.jclouds.providers.internal.BaseProviderMetadataTest;
-import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApiMetadata;
-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-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSBlobIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSBlobIntegrationLiveTest.java b/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSBlobIntegrationLiveTest.java
deleted file mode 100644
index b684e89..0000000
--- a/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/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.us.blobstore.integration;
-
-import org.jclouds.rackspace.cloudfiles.v1.blobstore.integration.CloudFilesBlobIntegrationLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", testName = "CloudFilesUSBlobIntegrationLiveTest")
-public class CloudFilesUSBlobIntegrationLiveTest extends CloudFilesBlobIntegrationLiveTest {
- public CloudFilesUSBlobIntegrationLiveTest() {
- provider = "rackspace-cloudfiles-us";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSBlobLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSBlobLiveTest.java b/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSBlobLiveTest.java
deleted file mode 100644
index 8eb5385..0000000
--- a/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/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.us.blobstore.integration;
-
-import org.jclouds.rackspace.cloudfiles.v1.blobstore.integration.CloudFilesBlobLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", testName = "CloudFilesUSBlobLiveTest")
-public class CloudFilesUSBlobLiveTest extends CloudFilesBlobLiveTest {
- public CloudFilesUSBlobLiveTest() {
- provider = "rackspace-cloudfiles-us";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSBlobSignerLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSBlobSignerLiveTest.java b/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSBlobSignerLiveTest.java
deleted file mode 100644
index 5255de2..0000000
--- a/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSBlobSignerLiveTest.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.us.blobstore.integration;
-
-import org.jclouds.rackspace.cloudfiles.v1.blobstore.integration.CloudFilesBlobSignerLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", testName = "CloudFilesUSBlobSignerLiveTest")
-public class CloudFilesUSBlobSignerLiveTest extends CloudFilesBlobSignerLiveTest {
- public CloudFilesUSBlobSignerLiveTest() {
- provider = "rackspace-cloudfiles-us";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSContainerIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSContainerIntegrationLiveTest.java b/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSContainerIntegrationLiveTest.java
deleted file mode 100644
index 2fe511e..0000000
--- a/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSContainerIntegrationLiveTest.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.us.blobstore.integration;
-
-import org.jclouds.rackspace.cloudfiles.v1.blobstore.integration.CloudFilesContainerIntegrationLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", testName = "CloudFilesUSContainerIntegrationLiveTest")
-public class CloudFilesUSContainerIntegrationLiveTest extends CloudFilesContainerIntegrationLiveTest {
- public CloudFilesUSContainerIntegrationLiveTest() {
- provider = "rackspace-cloudfiles-us";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSContainerLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSContainerLiveTest.java b/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSContainerLiveTest.java
deleted file mode 100644
index 44daffd..0000000
--- a/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSContainerLiveTest.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.us.blobstore.integration;
-
-import org.jclouds.rackspace.cloudfiles.v1.blobstore.integration.CloudFilesContainerLiveTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", testName = "CloudFilesUSContainerLiveTest")
-public class CloudFilesUSContainerLiveTest extends CloudFilesContainerLiveTest {
- public CloudFilesUSContainerLiveTest() {
- provider = "rackspace-cloudfiles-us";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSServiceIntegrationLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSServiceIntegrationLiveTest.java b/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSServiceIntegrationLiveTest.java
deleted file mode 100644
index 698b733..0000000
--- a/rackspace-cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/us/blobstore/integration/CloudFilesUSServiceIntegrationLiveTest.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.us.blobstore.integration;
-
-import java.util.Set;
-
-import org.jclouds.rackspace.cloudfiles.v1.blobstore.integration.CloudFilesServiceIntegrationLiveTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "live", testName = "CloudFilesUSServiceIntegrationLiveTest")
-public class CloudFilesUSServiceIntegrationLiveTest extends CloudFilesServiceIntegrationLiveTest {
- public CloudFilesUSServiceIntegrationLiveTest() {
- provider = "rackspace-cloudfiles-us";
- }
-
- @Override
- protected Set<String> getIso3166Codes() {
- return ImmutableSet.<String> of("US-IL", "US-TX", "US-VA", "AU-NSW", "HK");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles-us/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-us/src/test/resources/logback.xml b/rackspace-cloudfiles-us/src/test/resources/logback.xml
deleted file mode 100644
index ce891f1..0000000
--- a/rackspace-cloudfiles-us/src/test/resources/logback.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.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.
-
--->
-<configuration scan="false">
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-wire.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-blobstore.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <root>
- <level value="warn" />
- </root>
-
- <logger name="org.jclouds">
- <level value="DEBUG" />
- <appender-ref ref="FILE" />
- </logger>
-
-<!--
- <logger name="jclouds.wire">
- <level value="DEBUG" />
- <appender-ref ref="WIREFILE" />
- </logger>
--->
-
- <logger name="jclouds.headers">
- <level value="DEBUG" />
- <appender-ref ref="WIREFILE" />
- </logger>
-
- <logger name="jclouds.blobstore">
- <level value="DEBUG" />
- <appender-ref ref="BLOBSTOREFILE" />
- </logger>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles/README.md
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles/README.md b/rackspace-cloudfiles/README.md
deleted file mode 100644
index 3da83d2..0000000
--- a/rackspace-cloudfiles/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Rackspace Cloud Files
-==========================
-
-The new Rackspace Cloud Files multi-region based service API.
-
-This new "rackspace-cloudfiles" API supercedes the jclouds "cloudfiles" API, which will eventually be deprecated.
-
-With this multi-region support, each BlobStore can be isolated to a specific region:
-
- RegionScopedBlobStoreContext ctx =
- contextBuilder.buildView(RegionScopedBlobStoreContext.class);
-
- Set<String> regionIds = ctx.configuredRegions();
-
- // isolated to a specific region
- BlobStore dfwBlobStore = ctx.blobStoreInRegion("DFW");
- BlobStore iadBlobStore = ctx.blobStoreInRegion("IAD");
-
-Production ready?
-Beta
-
-This API is new to jclouds and hence is in Beta. That means we need people to use it and give us feedback. Based on that feedback, minor changes to the interfaces may happen. This code will replace org.jclouds.openstack.swift.SwiftClient in jclouds 2.0 and it is recommended you adopt it sooner than later.
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles/pom.xml b/rackspace-cloudfiles/pom.xml
deleted file mode 100644
index 3a9e370..0000000
--- a/rackspace-cloudfiles/pom.xml
+++ /dev/null
@@ -1,176 +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 />
- </parent>
-
- <!-- TODO: when out of labs, switch to org.jclouds.api -->
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>rackspace-cloudfiles</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <name>jclouds rackspace-cloudfiles api</name>
- <description>jclouds components to access Rackspace Cloud Files</description>
- <packaging>bundle</packaging>
-
- <properties>
- <!-- identity endpoint -->
- <test.rackspace-cloudfiles.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudfiles.endpoint>
- <test.rackspace-cloudfiles.api-version>1</test.rackspace-cloudfiles.api-version>
- <test.rackspace-cloudfiles.build-version />
- <test.rackspace-cloudfiles.identity>FIXME_IDENTITY</test.rackspace-cloudfiles.identity>
- <test.rackspace-cloudfiles.credential>FIXME_CREDENTIALS</test.rackspace-cloudfiles.credential>
- <jclouds.osgi.export>org.jclouds.rackspace.cloudfiles.v1*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
- </properties>
-
- <repositories>
- <repository>
- <id>apache-snapshots</id>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-swift</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-swift</artifactId>
- <version>${project.parent.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-keystone</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-keystone</artifactId>
- <version>${project.parent.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>rackspace-cloudidentity</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${project.parent.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-blobstore</artifactId>
- <version>${project.parent.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-depchain</artifactId>
- <version>1.2.0</version>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-slf4j</artifactId>
- <version>${project.parent.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp</groupId>
- <artifactId>mockwebserver</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.auto.service</groupId>
- <artifactId>auto-service</artifactId>
- <scope>provided</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>
- <jclouds.blobstore.httpstream.url>${jclouds.blobstore.httpstream.url}</jclouds.blobstore.httpstream.url>
- <jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5>
- <test.rackspace-cloudfiles.endpoint>${test.rackspace-cloudfiles.endpoint}</test.rackspace-cloudfiles.endpoint>
- <test.rackspace-cloudfiles.api-version>${test.rackspace-cloudfiles.api-version}</test.rackspace-cloudfiles.api-version>
- <test.rackspace-cloudfiles.build-version>${test.rackspace-cloudfiles.build-version}</test.rackspace-cloudfiles.build-version>
- <test.rackspace-cloudfiles.identity>${test.rackspace-cloudfiles.identity}</test.rackspace-cloudfiles.identity>
- <test.rackspace-cloudfiles.credential>${test.rackspace-cloudfiles.credential}</test.rackspace-cloudfiles.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-labs-openstack/blob/e7d93f40/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java
deleted file mode 100644
index 7c25ec2..0000000
--- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java
+++ /dev/null
@@ -1,51 +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.v1;
-
-import org.jclouds.openstack.swift.v1.SwiftApi;
-import org.jclouds.rackspace.cloudfiles.v1.features.CDNApi;
-import org.jclouds.rackspace.cloudfiles.v1.functions.RegionToCDNEndpoint;
-import org.jclouds.rest.annotations.Delegate;
-import org.jclouds.rest.annotations.EndpointParam;
-
-import com.google.common.annotations.Beta;
-
-/**
- * Rackspace Cloud Files is an affordable, redundant, scalable, and dynamic storage service
- * offering. The core storage system is designed to provide a secure, network-accessible way to
- * store an unlimited number of files. Each file can be as large as 5 gigabytes.
- * <p/>
- * Additionally, Cloud Files provides a simple yet powerful way to publish and distribute content
- * behind a Content Distribution Network.
- *
- * @see CDNApi
- * @see SwiftApi
- */
-@Beta
-public interface CloudFilesApi extends SwiftApi {
-
- /**
- * Provides access to Cloud Files CDN features.
- *
- * @param region the region to access the CDN API.
- *
- * @return the {@link CDNApi} for the specified region.
- */
- @Delegate
- CDNApi getCDNApi(@EndpointParam(parser = RegionToCDNEndpoint.class) String region);
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/e7d93f40/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiMetadata.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiMetadata.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiMetadata.java
deleted file mode 100644
index 3055678..0000000
--- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiMetadata.java
+++ /dev/null
@@ -1,104 +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.v1;
-
-import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
-import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
-import static org.jclouds.reflect.Reflection2.typeToken;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.apis.ApiMetadata;
-import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
-import org.jclouds.openstack.swift.v1.SwiftApiMetadata;
-import org.jclouds.openstack.swift.v1.blobstore.RegionScopedBlobStoreContext;
-import org.jclouds.openstack.swift.v1.blobstore.config.SignUsingTemporaryUrls;
-import org.jclouds.openstack.swift.v1.blobstore.config.SwiftBlobStoreContextModule;
-import org.jclouds.openstack.swift.v1.config.SwiftTypeAdapters;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.rackspace.cloudfiles.v1.config.CloudFilesHttpApiModule;
-import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
-import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
-import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
-import org.jclouds.rest.internal.BaseHttpApiMetadata;
-
-import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-
-/**
- * Implementation of {@link ApiMetadata} for Cloud Files.
- */
-@AutoService(ApiMetadata.class)
-public class CloudFilesApiMetadata extends BaseHttpApiMetadata<CloudFilesApi> {
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromApiMetadata(this);
- }
-
- public CloudFilesApiMetadata() {
- this(new Builder());
- }
-
- protected CloudFilesApiMetadata(Builder builder) {
- super(builder);
- }
-
- public static Properties defaultProperties() {
- Properties properties = SwiftApiMetadata.defaultProperties();
- properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
- properties.setProperty(SERVICE_TYPE, ServiceType.OBJECT_STORE);
- return properties;
- }
-
- public static class Builder extends BaseHttpApiMetadata.Builder<CloudFilesApi, Builder> {
-
- protected Builder() {
- id("rackspace-cloudfiles")
- .name("Rackspace Cloud Files API")
- .identityName("${userName}")
- .credentialName("${apiKey}")
- .documentation(URI.create("http://docs.rackspace.com/files/api/v1/cf-devguide/content/index.html"))
- .version("1.0")
- .endpointName("Rackspace Cloud Identity service URL ending in /v2.0/")
- .defaultEndpoint("https://identity.api.rackspacecloud.com/v2.0/")
- .defaultProperties(CloudFilesApiMetadata.defaultProperties())
- .view(typeToken(RegionScopedBlobStoreContext.class))
- .defaultModules(ImmutableSet.<Class<? extends Module>>builder()
- .add(CloudIdentityAuthenticationApiModule.class)
- .add(CloudIdentityAuthenticationModule.class)
- .add(RegionModule.class)
- .add(SwiftTypeAdapters.class)
- .add(CloudFilesHttpApiModule.class)
- .add(SwiftBlobStoreContextModule.class)
- .add(SignUsingTemporaryUrls.class)
- .build());
- }
-
- @Override
- public CloudFilesApiMetadata build() {
- return new CloudFilesApiMetadata(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}