Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 440: extracted cloudservers and cloudfiles into their own api modules, moved rackspace into commons

This commit is contained in:
Adrian Cole 2011-01-08 10:46:54 -08:00
parent 609ac300be
commit 9d6537dfc2
200 changed files with 1153 additions and 674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
allblobstore/pom.xml
View File

@ -70,8 +70,8 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>org.jclouds.api</groupId>
<artifactId>jclouds-rackspace</artifactId> <artifactId>cloudfiles</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

4
allcompute/pom.xml
View File

@ -45,8 +45,8 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>org.jclouds.api</groupId>
<artifactId>jclouds-rackspace</artifactId> <artifactId>cloudservers</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

127
rackspace/pom.xml → apis/cloudfiles/pom.xml
View File

@ -1,106 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Copyright (C) 2010 Cloud Conscious, LLC. Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
<info@cloudconscious.com>
==================================================================== ====================================================================
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 Unless required by http://www.apache.org/licenses/LICENSE-2.0
applicable law or agreed to in writing, software distributed
under the License is distributed on an "AS IS" BASIS, WITHOUT Unless required by applicable law or agreed to in writing, software
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. distributed under the License is distributed on an "AS IS" BASIS,
See the License for the specific language governing permissions WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
and limitations under the License. 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" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4.0.0.xsd" >
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.jclouds</groupId> <groupId>org.jclouds</groupId>
<artifactId>jclouds-project</artifactId> <artifactId>jclouds-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../project/pom.xml</relativePath> <relativePath>../../project/pom.xml</relativePath>
</parent> </parent>
<artifactId>jclouds-rackspace</artifactId> <groupId>org.jclouds.api</groupId>
<name>jclouds rackspace components</name> <artifactId>cloudfiles</artifactId>
<name>jcloud cloudfiles api</name>
<description>jclouds components to access an implementation of CloudFiles</description>
<properties> <properties>
<test.rackspace.endpoint>https://auth.api.rackspacecloud.com</test.rackspace.endpoint> <test.initializer>org.jclouds.cloudfiles.blobstore.integration.CloudFilesTestInitializer</test.initializer>
<test.rackspace.apiversion>1.0</test.rackspace.apiversion> <test.cloudfiles.endpoint>https://auth.api.rackspacecloud.com</test.cloudfiles.endpoint>
<test.rackspace.identity>FIXME</test.rackspace.identity> <test.cloudfiles.apiversion>1.0</test.cloudfiles.apiversion>
<test.rackspace.credential>FIXME</test.rackspace.credential>
<test.initializer>org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesTestInitializer</test.initializer>
<!-- when instances are hung, open a ticket and add here -->
<jclouds.compute.blacklist-nodes>trmkrun-ccc,test.trmk-924</jclouds.compute.blacklist-nodes>
<test.cloudfiles.endpoint>${test.rackspace.endpoint}</test.cloudfiles.endpoint>
<test.cloudfiles.apiversion>${test.rackspace.apiversion}</test.cloudfiles.apiversion>
<test.cloudfiles.identity>${test.rackspace.identity}</test.cloudfiles.identity> <test.cloudfiles.identity>${test.rackspace.identity}</test.cloudfiles.identity>
<test.cloudfiles.credential>${test.rackspace.credential}</test.cloudfiles.credential> <test.cloudfiles.credential>${test.rackspace.credential}</test.cloudfiles.credential>
<test.cloudservers.endpoint>${test.rackspace.endpoint}</test.cloudservers.endpoint>
<test.cloudservers.apiversion>${test.rackspace.apiversion}</test.cloudservers.apiversion>
<test.cloudservers.identity>${test.rackspace.identity}</test.cloudservers.identity>
<test.cloudservers.credential>${test.rackspace.credential}</test.cloudservers.credential>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>org.jclouds.common</groupId>
<artifactId>rackspace-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-blobstore</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-core</artifactId> <artifactId>jclouds-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>org.jclouds.common</groupId>
<artifactId>jclouds-blobstore</artifactId> <artifactId>rackspace-common</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>org.jclouds</groupId>
<artifactId>jclouds-blobstore</artifactId> <artifactId>jclouds-blobstore</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>org.jclouds</groupId>
<artifactId>jclouds-compute</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jclouds-compute</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jclouds-log4j</artifactId> <artifactId>jclouds-log4j</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>log4j</groupId>
<artifactId>jclouds-jsch</artifactId> <artifactId>log4j</artifactId>
<version>${project.version}</version> <version>1.2.16</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles> <profiles>
<profile> <profile>
<id>live</id> <id>live</id>
@ -134,26 +121,6 @@
<name>test.cloudfiles.credential</name> <name>test.cloudfiles.credential</name>
<value>${test.cloudfiles.credential}</value> <value>${test.cloudfiles.credential}</value>
</property> </property>
<property>
<name>test.cloudservers.endpoint</name>
<value>${test.cloudservers.endpoint}</value>
</property>
<property>
<name>test.cloudservers.apiversion</name>
<value>${test.cloudservers.apiversion}</value>
</property>
<property>
<name>test.cloudservers.identity</name>
<value>${test.cloudservers.identity}</value>
</property>
<property>
<name>test.cloudservers.credential</name>
<value>${test.cloudservers.credential}</value>
</property>
<property>
<name>jclouds.compute.blacklist-nodes</name>
<value>${jclouds.compute.blacklist-nodes}</value>
</property>
<property> <property>
<name>test.initializer</name> <name>test.initializer</name>
<value>${test.initializer}</value> <value>${test.initializer}</value>
@ -176,4 +143,6 @@
</profile> </profile>
</profiles> </profiles>
</project> </project>

38
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesAsyncClient.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles; package org.jclouds.cloudfiles;
import java.net.URI; import java.net.URI;
import java.util.Map; import java.util.Map;
@ -45,24 +45,24 @@ import org.jclouds.http.functions.ParseETagHeader;
import org.jclouds.http.options.GetOptions; import org.jclouds.http.options.GetOptions;
import org.jclouds.rackspace.CloudFiles; import org.jclouds.rackspace.CloudFiles;
import org.jclouds.rackspace.CloudFilesCDN; import org.jclouds.rackspace.CloudFilesCDN;
import org.jclouds.rackspace.cloudfiles.binders.BindCFObjectMetadataToRequest; import org.jclouds.cloudfiles.binders.BindCFObjectMetadataToRequest;
import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; import org.jclouds.cloudfiles.domain.AccountMetadata;
import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.cloudfiles.domain.CFObject;
import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; import org.jclouds.cloudfiles.domain.ContainerCDNMetadata;
import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; import org.jclouds.cloudfiles.domain.ContainerMetadata;
import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata;
import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; import org.jclouds.cloudfiles.domain.ObjectInfo;
import org.jclouds.rackspace.cloudfiles.functions.ObjectName; import org.jclouds.cloudfiles.functions.ObjectName;
import org.jclouds.rackspace.cloudfiles.functions.ParseAccountMetadataResponseFromHeaders; import org.jclouds.cloudfiles.functions.ParseAccountMetadataResponseFromHeaders;
import org.jclouds.rackspace.cloudfiles.functions.ParseCdnUriFromHeaders; import org.jclouds.cloudfiles.functions.ParseCdnUriFromHeaders;
import org.jclouds.rackspace.cloudfiles.functions.ParseContainerCDNMetadataFromHeaders; import org.jclouds.cloudfiles.functions.ParseContainerCDNMetadataFromHeaders;
import org.jclouds.rackspace.cloudfiles.functions.ParseObjectFromHeadersAndHttpContent; import org.jclouds.cloudfiles.functions.ParseObjectFromHeadersAndHttpContent;
import org.jclouds.rackspace.cloudfiles.functions.ParseObjectInfoFromHeaders; import org.jclouds.cloudfiles.functions.ParseObjectInfoFromHeaders;
import org.jclouds.rackspace.cloudfiles.functions.ParseObjectInfoListFromJsonResponse; import org.jclouds.cloudfiles.functions.ParseObjectInfoListFromJsonResponse;
import org.jclouds.rackspace.cloudfiles.functions.ReturnTrueOn404FalseOn409; import org.jclouds.cloudfiles.functions.ReturnTrueOn404FalseOn409;
import org.jclouds.rackspace.cloudfiles.options.ListCdnContainerOptions; import org.jclouds.cloudfiles.options.ListCdnContainerOptions;
import org.jclouds.rackspace.cloudfiles.options.ListContainerOptions; import org.jclouds.cloudfiles.options.ListContainerOptions;
import org.jclouds.rackspace.cloudfiles.reference.CloudFilesHeaders; import org.jclouds.cloudfiles.reference.CloudFilesHeaders;
import org.jclouds.rackspace.filters.AuthenticateRequest; import org.jclouds.rackspace.filters.AuthenticateRequest;
import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.BinderParam;
import org.jclouds.rest.annotations.Endpoint; import org.jclouds.rest.annotations.Endpoint;

18
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesClient.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesClient.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles; package org.jclouds.cloudfiles;
import java.net.URI; import java.net.URI;
import java.util.Map; import java.util.Map;
@ -29,14 +29,14 @@ import org.jclouds.blobstore.ContainerNotFoundException;
import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.PageSet;
import org.jclouds.concurrent.Timeout; import org.jclouds.concurrent.Timeout;
import org.jclouds.http.options.GetOptions; import org.jclouds.http.options.GetOptions;
import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; import org.jclouds.cloudfiles.domain.AccountMetadata;
import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.cloudfiles.domain.CFObject;
import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; import org.jclouds.cloudfiles.domain.ContainerCDNMetadata;
import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; import org.jclouds.cloudfiles.domain.ContainerMetadata;
import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata;
import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; import org.jclouds.cloudfiles.domain.ObjectInfo;
import org.jclouds.rackspace.cloudfiles.options.ListCdnContainerOptions; import org.jclouds.cloudfiles.options.ListCdnContainerOptions;
import org.jclouds.rackspace.cloudfiles.options.ListContainerOptions; import org.jclouds.cloudfiles.options.ListContainerOptions;
import java.util.concurrent.Future; import java.util.concurrent.Future;

6
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesContextBuilder.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesContextBuilder.java Executable file → Normal file
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles; package org.jclouds.cloudfiles;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
@ -25,8 +25,8 @@ import java.util.Properties;
import org.jclouds.blobstore.BlobStoreContextBuilder; import org.jclouds.blobstore.BlobStoreContextBuilder;
import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
import org.jclouds.logging.jdk.config.JDKLoggingModule; import org.jclouds.logging.jdk.config.JDKLoggingModule;
import org.jclouds.rackspace.cloudfiles.blobstore.config.CloudFilesBlobStoreContextModule; import org.jclouds.cloudfiles.blobstore.config.CloudFilesBlobStoreContextModule;
import org.jclouds.rackspace.cloudfiles.config.CloudFilesRestClientModule; import org.jclouds.cloudfiles.config.CloudFilesRestClientModule;
import com.google.inject.Injector; import com.google.inject.Injector;
import com.google.inject.Module; import com.google.inject.Module;

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesPropertiesBuilder.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesPropertiesBuilder.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles; package org.jclouds.cloudfiles;
import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX;

6
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/binders/BindCFObjectMetadataToRequest.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/binders/BindCFObjectMetadataToRequest.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.binders; package org.jclouds.cloudfiles.binders;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -29,8 +29,8 @@ import javax.ws.rs.core.MediaType;
import org.jclouds.blobstore.binders.BindUserMetadataToHeadersWithPrefix; import org.jclouds.blobstore.binders.BindUserMetadataToHeadersWithPrefix;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
import org.jclouds.http.utils.ModifyRequest; import org.jclouds.http.utils.ModifyRequest;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.ObjectToBlob; import org.jclouds.cloudfiles.blobstore.functions.ObjectToBlob;
import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.cloudfiles.domain.CFObject;
import org.jclouds.rest.Binder; import org.jclouds.rest.Binder;
@Singleton @Singleton

28
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesAsyncBlobStore.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/CloudFilesAsyncBlobStore.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore; package org.jclouds.cloudfiles.blobstore;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.blobstore.util.BlobStoreUtils.createParentIfNeededAsync; import static org.jclouds.blobstore.util.BlobStoreUtils.createParentIfNeededAsync;
@ -46,18 +46,18 @@ import org.jclouds.collect.Memoized;
import org.jclouds.concurrent.Futures; import org.jclouds.concurrent.Futures;
import org.jclouds.domain.Location; import org.jclouds.domain.Location;
import org.jclouds.http.options.GetOptions; import org.jclouds.http.options.GetOptions;
import org.jclouds.rackspace.cloudfiles.CloudFilesAsyncClient; import org.jclouds.cloudfiles.CloudFilesAsyncClient;
import org.jclouds.rackspace.cloudfiles.CloudFilesClient; import org.jclouds.cloudfiles.CloudFilesClient;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.BlobStoreListContainerOptionsToListContainerOptions; import org.jclouds.cloudfiles.blobstore.functions.BlobStoreListContainerOptionsToListContainerOptions;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.BlobToObject; import org.jclouds.cloudfiles.blobstore.functions.BlobToObject;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.ContainerToResourceList; import org.jclouds.cloudfiles.blobstore.functions.ContainerToResourceList;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.ContainerToResourceMetadata; import org.jclouds.cloudfiles.blobstore.functions.ContainerToResourceMetadata;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.ObjectToBlob; import org.jclouds.cloudfiles.blobstore.functions.ObjectToBlob;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.ObjectToBlobMetadata; import org.jclouds.cloudfiles.blobstore.functions.ObjectToBlobMetadata;
import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.cloudfiles.domain.CFObject;
import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; import org.jclouds.cloudfiles.domain.ContainerMetadata;
import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata;
import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; import org.jclouds.cloudfiles.domain.ObjectInfo;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
@ -144,7 +144,7 @@ public class CloudFilesAsyncBlobStore extends BaseAsyncBlobStore {
*/ */
@Override @Override
public ListenableFuture<PageSet<? extends StorageMetadata>> list(String container, ListContainerOptions options) { public ListenableFuture<PageSet<? extends StorageMetadata>> list(String container, ListContainerOptions options) {
org.jclouds.rackspace.cloudfiles.options.ListContainerOptions httpOptions = container2ContainerListOptions org.jclouds.cloudfiles.options.ListContainerOptions httpOptions = container2ContainerListOptions
.apply(options); .apply(options);
ListenableFuture<PageSet<ObjectInfo>> returnVal = async.listObjects(container, httpOptions); ListenableFuture<PageSet<ObjectInfo>> returnVal = async.listObjects(container, httpOptions);
ListenableFuture<PageSet<? extends StorageMetadata>> list = Futures.compose(returnVal, container2ResourceList, ListenableFuture<PageSet<? extends StorageMetadata>> list = Futures.compose(returnVal, container2ResourceList,

10
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobRequestSigner.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobRequestSigner.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore; package org.jclouds.cloudfiles.blobstore;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.blobstore.util.BlobStoreUtils.cleanRequest; import static org.jclouds.blobstore.util.BlobStoreUtils.cleanRequest;
@ -31,9 +31,9 @@ import org.jclouds.blobstore.BlobRequestSigner;
import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.Blob;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
import org.jclouds.http.options.GetOptions; import org.jclouds.http.options.GetOptions;
import org.jclouds.rackspace.cloudfiles.CloudFilesAsyncClient; import org.jclouds.cloudfiles.CloudFilesAsyncClient;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.BlobToObject; import org.jclouds.cloudfiles.blobstore.functions.BlobToObject;
import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.cloudfiles.domain.CFObject;
import org.jclouds.rest.internal.RestAnnotationProcessor; import org.jclouds.rest.internal.RestAnnotationProcessor;
/** /**
@ -74,4 +74,4 @@ public class CloudFilesBlobRequestSigner implements BlobRequestSigner {
return cleanRequest(processor.createRequest(deleteMethod, container, name)); return cleanRequest(processor.createRequest(deleteMethod, container, name));
} }
} }

20
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobStore.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobStore.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore; package org.jclouds.cloudfiles.blobstore;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.blobstore.util.BlobStoreUtils.createParentIfNeededAsync; import static org.jclouds.blobstore.util.BlobStoreUtils.createParentIfNeededAsync;
@ -42,14 +42,14 @@ import org.jclouds.blobstore.util.BlobUtils;
import org.jclouds.collect.Memoized; import org.jclouds.collect.Memoized;
import org.jclouds.domain.Location; import org.jclouds.domain.Location;
import org.jclouds.http.options.GetOptions; import org.jclouds.http.options.GetOptions;
import org.jclouds.rackspace.cloudfiles.CloudFilesClient; import org.jclouds.cloudfiles.CloudFilesClient;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.BlobStoreListContainerOptionsToListContainerOptions; import org.jclouds.cloudfiles.blobstore.functions.BlobStoreListContainerOptionsToListContainerOptions;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.BlobToObject; import org.jclouds.cloudfiles.blobstore.functions.BlobToObject;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.ContainerToResourceList; import org.jclouds.cloudfiles.blobstore.functions.ContainerToResourceList;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.ContainerToResourceMetadata; import org.jclouds.cloudfiles.blobstore.functions.ContainerToResourceMetadata;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.ObjectToBlob; import org.jclouds.cloudfiles.blobstore.functions.ObjectToBlob;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.ObjectToBlobMetadata; import org.jclouds.cloudfiles.blobstore.functions.ObjectToBlobMetadata;
import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; import org.jclouds.cloudfiles.domain.ContainerMetadata;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
@ -135,7 +135,7 @@ public class CloudFilesBlobStore extends BaseBlobStore {
*/ */
@Override @Override
public PageSet<? extends StorageMetadata> list(String container, ListContainerOptions options) { public PageSet<? extends StorageMetadata> list(String container, ListContainerOptions options) {
org.jclouds.rackspace.cloudfiles.options.ListContainerOptions httpOptions = container2ContainerListOptions org.jclouds.cloudfiles.options.ListContainerOptions httpOptions = container2ContainerListOptions
.apply(options); .apply(options);
PageSet<? extends StorageMetadata> list = container2ResourceList.apply(sync.listObjects(container, httpOptions)); PageSet<? extends StorageMetadata> list = container2ResourceList.apply(sync.listObjects(container, httpOptions));
return options.isDetailed() ? fetchBlobMetadataProvider.get().setContainerName(container).apply(list) : list; return options.isDetailed() ? fetchBlobMetadataProvider.get().setContainerName(container).apply(list) : list;

12
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/config/CloudFilesBlobStoreContextModule.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/config/CloudFilesBlobStoreContextModule.java Executable file → Normal file
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.config; package org.jclouds.cloudfiles.blobstore.config;
import java.util.Set; import java.util.Set;
@ -32,11 +32,11 @@ import org.jclouds.blobstore.config.BlobStoreMapModule;
import org.jclouds.blobstore.internal.BlobStoreContextImpl; import org.jclouds.blobstore.internal.BlobStoreContextImpl;
import org.jclouds.collect.Memoized; import org.jclouds.collect.Memoized;
import org.jclouds.domain.Location; import org.jclouds.domain.Location;
import org.jclouds.rackspace.cloudfiles.CloudFilesAsyncClient; import org.jclouds.cloudfiles.CloudFilesAsyncClient;
import org.jclouds.rackspace.cloudfiles.CloudFilesClient; import org.jclouds.cloudfiles.CloudFilesClient;
import org.jclouds.rackspace.cloudfiles.blobstore.CloudFilesAsyncBlobStore; import org.jclouds.cloudfiles.blobstore.CloudFilesAsyncBlobStore;
import org.jclouds.rackspace.cloudfiles.blobstore.CloudFilesBlobRequestSigner; import org.jclouds.cloudfiles.blobstore.CloudFilesBlobRequestSigner;
import org.jclouds.rackspace.cloudfiles.blobstore.CloudFilesBlobStore; import org.jclouds.cloudfiles.blobstore.CloudFilesBlobStore;
import org.jclouds.rackspace.config.RackspaceLocationsSupplier; import org.jclouds.rackspace.config.RackspaceLocationsSupplier;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;

10
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/BlobStoreListContainerOptionsToListContainerOptions.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/BlobStoreListContainerOptionsToListContainerOptions.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.functions; package org.jclouds.cloudfiles.blobstore.functions;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -33,11 +33,11 @@ import com.google.common.base.Function;
@Singleton @Singleton
public class BlobStoreListContainerOptionsToListContainerOptions public class BlobStoreListContainerOptionsToListContainerOptions
implements implements
Function<ListContainerOptions, org.jclouds.rackspace.cloudfiles.options.ListContainerOptions> { Function<ListContainerOptions, org.jclouds.cloudfiles.options.ListContainerOptions> {
public org.jclouds.rackspace.cloudfiles.options.ListContainerOptions apply( public org.jclouds.cloudfiles.options.ListContainerOptions apply(
ListContainerOptions from) { ListContainerOptions from) {
checkNotNull(from, "set options to instance NONE instead of passing null"); checkNotNull(from, "set options to instance NONE instead of passing null");
org.jclouds.rackspace.cloudfiles.options.ListContainerOptions options = new org.jclouds.rackspace.cloudfiles.options.ListContainerOptions(); org.jclouds.cloudfiles.options.ListContainerOptions options = new org.jclouds.cloudfiles.options.ListContainerOptions();
if ((from.getDir() == null) && (from.isRecursive())) { if ((from.getDir() == null) && (from.isRecursive())) {
options.withPrefix(""); options.withPrefix("");
} }
@ -60,4 +60,4 @@ public class BlobStoreListContainerOptionsToListContainerOptions
return options; return options;
} }
} }

6
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/BlobToObject.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/BlobToObject.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.functions; package org.jclouds.cloudfiles.blobstore.functions;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -25,7 +25,7 @@ import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.Blob;
import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.cloudfiles.domain.CFObject;
import com.google.common.base.Function; import com.google.common.base.Function;
@ -51,4 +51,4 @@ public class BlobToObject implements Function<Blob, CFObject> {
object.setAllHeaders(from.getAllHeaders()); object.setAllHeaders(from.getAllHeaders());
return object; return object;
} }
} }

4
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/BlobToObjectGetOptions.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/BlobToObjectGetOptions.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.functions; package org.jclouds.cloudfiles.blobstore.functions;
import javax.inject.Singleton; import javax.inject.Singleton;
@ -58,4 +58,4 @@ public class BlobToObjectGetOptions implements
} }
return httpOptions; return httpOptions;
} }
} }

6
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ContainerToResourceList.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/ContainerToResourceList.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.functions; package org.jclouds.cloudfiles.blobstore.functions;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
@ -28,7 +28,7 @@ import org.jclouds.blobstore.domain.StorageMetadata;
import org.jclouds.blobstore.domain.StorageType; import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.blobstore.domain.internal.PageSetImpl; import org.jclouds.blobstore.domain.internal.PageSetImpl;
import org.jclouds.blobstore.domain.internal.StorageMetadataImpl; import org.jclouds.blobstore.domain.internal.StorageMetadataImpl;
import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; import org.jclouds.cloudfiles.domain.ObjectInfo;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
@ -59,4 +59,4 @@ public class ContainerToResourceList implements Function<PageSet<ObjectInfo>, Pa
}), from.getNextMarker()); }), from.getNextMarker());
} }
} }

6
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ContainerToResourceMetadata.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/ContainerToResourceMetadata.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.functions; package org.jclouds.cloudfiles.blobstore.functions;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
@ -27,7 +27,7 @@ import org.jclouds.blobstore.domain.StorageMetadata;
import org.jclouds.blobstore.domain.StorageType; import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.blobstore.domain.internal.MutableStorageMetadataImpl; import org.jclouds.blobstore.domain.internal.MutableStorageMetadataImpl;
import org.jclouds.domain.Location; import org.jclouds.domain.Location;
import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; import org.jclouds.cloudfiles.domain.ContainerMetadata;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
@ -51,4 +51,4 @@ public class ContainerToResourceMetadata implements Function<ContainerMetadata,
to.setType(StorageType.CONTAINER); to.setType(StorageType.CONTAINER);
return to; return to;
} }
} }

4
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ObjectToBlob.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/ObjectToBlob.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.functions; package org.jclouds.cloudfiles.blobstore.functions;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -26,7 +26,7 @@ import javax.inject.Singleton;
import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.domain.Blob.Factory; import org.jclouds.blobstore.domain.Blob.Factory;
import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.cloudfiles.domain.CFObject;
import com.google.common.base.Function; import com.google.common.base.Function;

8
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ObjectToBlobMetadata.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/ObjectToBlobMetadata.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.functions; package org.jclouds.cloudfiles.blobstore.functions;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
@ -27,8 +27,8 @@ import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl; import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl;
import org.jclouds.blobstore.strategy.IfDirectoryReturnNameStrategy; import org.jclouds.blobstore.strategy.IfDirectoryReturnNameStrategy;
import org.jclouds.crypto.CryptoStreams; import org.jclouds.crypto.CryptoStreams;
import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata;
import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; import org.jclouds.cloudfiles.domain.ObjectInfo;
import com.google.common.base.Function; import com.google.common.base.Function;
@ -69,4 +69,4 @@ public class ObjectToBlobMetadata implements Function<ObjectInfo, MutableBlobMet
} }
return to; return to;
} }
} }

8
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ResourceToObjectInfo.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/functions/ResourceToObjectInfo.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.functions; package org.jclouds.cloudfiles.blobstore.functions;
import java.util.Map.Entry; import java.util.Map.Entry;
@ -27,8 +27,8 @@ import org.jclouds.blobstore.domain.BlobMetadata;
import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageMetadata;
import org.jclouds.blobstore.domain.StorageType; import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.crypto.CryptoStreams; import org.jclouds.crypto.CryptoStreams;
import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata;
import org.jclouds.rackspace.cloudfiles.domain.internal.MutableObjectInfoWithMetadataImpl; import org.jclouds.cloudfiles.domain.internal.MutableObjectInfoWithMetadataImpl;
import com.google.common.base.Function; import com.google.common.base.Function;
@ -60,4 +60,4 @@ public class ResourceToObjectInfo implements Function<StorageMetadata, MutableOb
return to; return to;
} }
} }

10
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/config/CFObjectModule.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/config/CFObjectModule.java
View File

@ -17,15 +17,15 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.config; package org.jclouds.cloudfiles.config;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Provider; import javax.inject.Provider;
import org.jclouds.blobstore.config.BlobStoreObjectModule; import org.jclouds.blobstore.config.BlobStoreObjectModule;
import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.cloudfiles.domain.CFObject;
import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata;
import org.jclouds.rackspace.cloudfiles.domain.internal.CFObjectImpl; import org.jclouds.cloudfiles.domain.internal.CFObjectImpl;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.Provides; import com.google.inject.Provides;
@ -63,4 +63,4 @@ public class CFObjectModule extends AbstractModule {
return factory.create(null); return factory.create(null);
} }
} }

10
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/config/CloudFilesRestClientModule.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/config/CloudFilesRestClientModule.java Executable file → Normal file
View File

@ -17,16 +17,16 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.config; package org.jclouds.cloudfiles.config;
import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.HttpErrorHandler;
import org.jclouds.http.RequiresHttp; import org.jclouds.http.RequiresHttp;
import org.jclouds.http.annotation.ClientError; import org.jclouds.http.annotation.ClientError;
import org.jclouds.http.annotation.Redirection; import org.jclouds.http.annotation.Redirection;
import org.jclouds.http.annotation.ServerError; import org.jclouds.http.annotation.ServerError;
import org.jclouds.rackspace.cloudfiles.CloudFilesAsyncClient; import org.jclouds.cloudfiles.CloudFilesAsyncClient;
import org.jclouds.rackspace.cloudfiles.CloudFilesClient; import org.jclouds.cloudfiles.CloudFilesClient;
import org.jclouds.rackspace.cloudfiles.handlers.ParseCloudFilesErrorFromHttpResponse; import org.jclouds.cloudfiles.handlers.ParseCloudFilesErrorFromHttpResponse;
import org.jclouds.rackspace.config.RackspaceAuthenticationRestModule; import org.jclouds.rackspace.config.RackspaceAuthenticationRestModule;
import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.ConfiguresRestClient;
import org.jclouds.rest.config.RestClientModule; import org.jclouds.rest.config.RestClientModule;
@ -68,4 +68,4 @@ public class CloudFilesRestClientModule extends
bind(HttpErrorHandler.class).annotatedWith(ServerError.class).to( bind(HttpErrorHandler.class).annotatedWith(ServerError.class).to(
ParseCloudFilesErrorFromHttpResponse.class); ParseCloudFilesErrorFromHttpResponse.class);
} }
} }

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/AccountMetadata.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/AccountMetadata.java Executable file → Normal file
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.domain; package org.jclouds.cloudfiles.domain;
/** /**
* *

4
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/CFObject.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/CFObject.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.domain; package org.jclouds.cloudfiles.domain;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -42,4 +42,4 @@ public interface CFObject extends PayloadEnclosing, Comparable<CFObject> {
Multimap<String, String> getAllHeaders(); Multimap<String, String> getAllHeaders();
void setAllHeaders(Multimap<String, String> allHeaders); void setAllHeaders(Multimap<String, String> allHeaders);
} }

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerCDNMetadata.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/ContainerCDNMetadata.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.domain; package org.jclouds.cloudfiles.domain;
import java.net.URI; import java.net.URI;

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ContainerMetadata.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/ContainerMetadata.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.domain; package org.jclouds.cloudfiles.domain;
/** /**

6
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/MutableObjectInfoWithMetadata.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/MutableObjectInfoWithMetadata.java
View File

@ -17,12 +17,12 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.domain; package org.jclouds.cloudfiles.domain;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
import org.jclouds.rackspace.cloudfiles.domain.internal.MutableObjectInfoWithMetadataImpl; import org.jclouds.cloudfiles.domain.internal.MutableObjectInfoWithMetadataImpl;
import com.google.inject.ImplementedBy; import com.google.inject.ImplementedBy;
@ -46,4 +46,4 @@ public interface MutableObjectInfoWithMetadata extends ObjectInfo {
Map<String, String> getMetadata(); Map<String, String> getMetadata();
} }

4
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/ObjectInfo.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/ObjectInfo.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.domain; package org.jclouds.cloudfiles.domain;
import java.util.Date; import java.util.Date;
@ -38,4 +38,4 @@ public interface ObjectInfo extends Comparable<ObjectInfo> {
Date getLastModified(); Date getLastModified();
} }

6
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/CFObjectImpl.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/CFObjectImpl.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.domain.internal; package org.jclouds.cloudfiles.domain.internal;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -26,8 +26,8 @@ import javax.inject.Inject;
import org.jclouds.http.HttpUtils; import org.jclouds.http.HttpUtils;
import org.jclouds.http.internal.PayloadEnclosingImpl; import org.jclouds.http.internal.PayloadEnclosingImpl;
import org.jclouds.io.Payload; import org.jclouds.io.Payload;
import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.cloudfiles.domain.CFObject;
import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata;
import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;

8
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/DelegatingMutableObjectInfoWithMetadata.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/DelegatingMutableObjectInfoWithMetadata.java
View File

@ -17,14 +17,14 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.domain.internal; package org.jclouds.cloudfiles.domain.internal;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
import org.jclouds.io.payloads.BaseMutableContentMetadata; import org.jclouds.io.payloads.BaseMutableContentMetadata;
import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata;
import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; import org.jclouds.cloudfiles.domain.ObjectInfo;
/** /**
* *
@ -129,4 +129,4 @@ public class DelegatingMutableObjectInfoWithMetadata extends BaseMutableContentM
public int compareTo(ObjectInfo o) { public int compareTo(ObjectInfo o) {
return delegate.compareTo(o); return delegate.compareTo(o);
} }
} }

8
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/MutableObjectInfoWithMetadataImpl.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/MutableObjectInfoWithMetadataImpl.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.domain.internal; package org.jclouds.cloudfiles.domain.internal;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
@ -25,8 +25,8 @@ import java.util.Map;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata;
import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; import org.jclouds.cloudfiles.domain.ObjectInfo;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -143,4 +143,4 @@ public class MutableObjectInfoWithMetadataImpl implements MutableObjectInfoWithM
this.lastModified = lastModified; this.lastModified = lastModified;
} }
} }

6
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/internal/ObjectInfoImpl.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/domain/internal/ObjectInfoImpl.java
View File

@ -17,12 +17,12 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.domain.internal; package org.jclouds.cloudfiles.domain.internal;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; import org.jclouds.cloudfiles.domain.ObjectInfo;
public class ObjectInfoImpl implements ObjectInfo { public class ObjectInfoImpl implements ObjectInfo {
String name; String name;
@ -115,4 +115,4 @@ public class ObjectInfoImpl implements ObjectInfo {
+ ", last_modified=" + last_modified.getTime() + ", name=" + name + ", last_modified=" + last_modified.getTime() + ", name=" + name
+ "]"; + "]";
} }
} }

6
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ObjectName.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ObjectName.java
View File

@ -17,9 +17,9 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.functions; package org.jclouds.cloudfiles.functions;
import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.cloudfiles.domain.CFObject;
import com.google.common.base.Function; import com.google.common.base.Function;
@ -33,4 +33,4 @@ public class ObjectName implements Function<Object, String> {
return ((CFObject) from).getInfo().getName(); return ((CFObject) from).getInfo().getName();
} }
} }

8
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseAccountMetadataResponseFromHeaders.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseAccountMetadataResponseFromHeaders.java Executable file → Normal file
View File

@ -17,13 +17,13 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.functions; package org.jclouds.cloudfiles.functions;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponse;
import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; import org.jclouds.cloudfiles.domain.AccountMetadata;
import org.jclouds.rackspace.cloudfiles.reference.CloudFilesHeaders; import org.jclouds.cloudfiles.reference.CloudFilesHeaders;
import com.google.common.base.Function; import com.google.common.base.Function;
@ -49,4 +49,4 @@ public class ParseAccountMetadataResponseFromHeaders implements
Long.parseLong(containersCountString), Long.parseLong(containersCountString),
Long.parseLong(bytesString)); Long.parseLong(bytesString));
} }
} }

8
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseCdnUriFromHeaders.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseCdnUriFromHeaders.java
View File

@ -17,15 +17,15 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.functions; package org.jclouds.cloudfiles.functions;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI; import java.net.URI;
import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponse;
import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; import org.jclouds.cloudfiles.domain.AccountMetadata;
import org.jclouds.rackspace.cloudfiles.reference.CloudFilesHeaders; import org.jclouds.cloudfiles.reference.CloudFilesHeaders;
import com.google.common.base.Function; import com.google.common.base.Function;
@ -44,4 +44,4 @@ public class ParseCdnUriFromHeaders implements Function<HttpResponse, URI> {
CloudFilesHeaders.CDN_URI); CloudFilesHeaders.CDN_URI);
return URI.create(cdnUri); return URI.create(cdnUri);
} }
} }

10
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.functions; package org.jclouds.cloudfiles.functions;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -25,9 +25,9 @@ import java.net.URI;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponse;
import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; import org.jclouds.cloudfiles.domain.AccountMetadata;
import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; import org.jclouds.cloudfiles.domain.ContainerCDNMetadata;
import org.jclouds.rackspace.cloudfiles.reference.CloudFilesHeaders; import org.jclouds.cloudfiles.reference.CloudFilesHeaders;
import org.jclouds.rest.InvocationContext; import org.jclouds.rest.InvocationContext;
import com.google.common.base.Function; import com.google.common.base.Function;
@ -66,4 +66,4 @@ public class ParseContainerCDNMetadataFromHeaders implements
this.request = request; this.request = request;
return this; return this;
} }
} }

8
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectFromHeadersAndHttpContent.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseObjectFromHeadersAndHttpContent.java
View File

@ -17,14 +17,14 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.functions; package org.jclouds.cloudfiles.functions;
import javax.inject.Inject; import javax.inject.Inject;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponse;
import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.cloudfiles.domain.CFObject;
import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata;
import org.jclouds.rest.InvocationContext; import org.jclouds.rest.InvocationContext;
import com.google.common.base.Function; import com.google.common.base.Function;
@ -63,4 +63,4 @@ public class ParseObjectFromHeadersAndHttpContent implements Function<HttpRespon
infoParser.setContext(request); infoParser.setContext(request);
return this; return this;
} }
} }

8
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectInfoFromHeaders.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseObjectInfoFromHeaders.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.functions; package org.jclouds.cloudfiles.functions;
import static org.jclouds.http.HttpUtils.attemptToParseSizeAndRangeFromHeaders; import static org.jclouds.http.HttpUtils.attemptToParseSizeAndRangeFromHeaders;
@ -28,8 +28,8 @@ import org.jclouds.blobstore.functions.ParseSystemAndUserMetadataFromHeaders;
import org.jclouds.crypto.CryptoStreams; import org.jclouds.crypto.CryptoStreams;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponse;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.ResourceToObjectInfo; import org.jclouds.cloudfiles.blobstore.functions.ResourceToObjectInfo;
import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata;
import org.jclouds.rest.InvocationContext; import org.jclouds.rest.InvocationContext;
import com.google.common.base.Function; import com.google.common.base.Function;
@ -71,4 +71,4 @@ public class ParseObjectInfoFromHeaders implements Function<HttpResponse, Mutabl
return this; return this;
} }
} }

10
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectInfoListFromJsonResponse.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseObjectInfoListFromJsonResponse.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.functions; package org.jclouds.cloudfiles.functions;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;
@ -34,9 +34,9 @@ import org.jclouds.blobstore.domain.internal.PageSetImpl;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
import org.jclouds.http.functions.ParseJson; import org.jclouds.http.functions.ParseJson;
import org.jclouds.json.Json; import org.jclouds.json.Json;
import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; import org.jclouds.cloudfiles.domain.ObjectInfo;
import org.jclouds.rackspace.cloudfiles.domain.internal.ObjectInfoImpl; import org.jclouds.cloudfiles.domain.internal.ObjectInfoImpl;
import org.jclouds.rackspace.cloudfiles.options.ListContainerOptions; import org.jclouds.cloudfiles.options.ListContainerOptions;
import org.jclouds.rest.InvocationContext; import org.jclouds.rest.InvocationContext;
import org.jclouds.rest.internal.GeneratedHttpRequest; import org.jclouds.rest.internal.GeneratedHttpRequest;
@ -94,4 +94,4 @@ public class ParseObjectInfoListFromJsonResponse extends ParseJson<PageSet<Objec
this.request = (GeneratedHttpRequest<?>) request; this.request = (GeneratedHttpRequest<?>) request;
return this; return this;
} }
} }

4
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/functions/ReturnTrueOn404FalseOn409.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ReturnTrueOn404FalseOn409.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.functions; package org.jclouds.cloudfiles.functions;
import static com.google.common.base.Predicates.in; import static com.google.common.base.Predicates.in;
import static com.google.common.collect.ImmutableSet.of; import static com.google.common.collect.ImmutableSet.of;
@ -36,4 +36,4 @@ public class ReturnTrueOn404FalseOn409 implements Function<Exception, Boolean> {
Boolean returnVal = returnValueOnCodeOrNull(from, true, in(of(404, 409))); Boolean returnVal = returnValueOnCodeOrNull(from, true, in(of(404, 409)));
return returnVal != null ? returnVal : Boolean.class.cast(propagateOrNull(from)); return returnVal != null ? returnVal : Boolean.class.cast(propagateOrNull(from));
} }
} }

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponse.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponse.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.handlers; package org.jclouds.cloudfiles.handlers;
import static org.jclouds.http.HttpUtils.releasePayload; import static org.jclouds.http.HttpUtils.releasePayload;

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/options/ListCdnContainerOptions.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/options/ListCdnContainerOptions.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.options; package org.jclouds.cloudfiles.options;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/options/ListContainerOptions.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/options/ListContainerOptions.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.options; package org.jclouds.cloudfiles.options;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/package-info.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/package-info.java Executable file → Normal file
View File

@ -23,4 +23,4 @@
* @see <a href="http://www.rackspacecloud.com/cf-devguide-20090311.pdf" /> * @see <a href="http://www.rackspacecloud.com/cf-devguide-20090311.pdf" />
* @author Adrian Cole * @author Adrian Cole
*/ */
package org.jclouds.rackspace.cloudfiles; package org.jclouds.cloudfiles;

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesConstants.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/CloudFilesConstants.java Executable file → Normal file
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.reference; package org.jclouds.cloudfiles.reference;
/** /**

4
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/reference/CloudFilesHeaders.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/CloudFilesHeaders.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.reference; package org.jclouds.cloudfiles.reference;
/** /**
@ -39,4 +39,4 @@ public interface CloudFilesHeaders {
public static final String CONTAINER_BYTES_USED = "X-Container-Bytes-Used"; public static final String CONTAINER_BYTES_USED = "X-Container-Bytes-Used";
public static final String CONTAINER_OBJECT_COUNT = "X-Container-Object-Count"; public static final String CONTAINER_OBJECT_COUNT = "X-Container-Object-Count";
public static final String USER_METADATA_PREFIX = "X-Object-Meta-"; public static final String USER_METADATA_PREFIX = "X-Object-Meta-";
} }

2
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/reference/package-info.java → apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/reference/package-info.java Executable file → Normal file
View File

@ -21,4 +21,4 @@
* This package contains properties and reference data used in Rackspace Cloud Files. * This package contains properties and reference data used in Rackspace Cloud Files.
* @author Adrian Cole * @author Adrian Cole
*/ */
package org.jclouds.rackspace.cloudfiles.reference; package org.jclouds.cloudfiles.reference;

20
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesClientLiveTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/CloudFilesClientLiveTest.java
View File

@ -17,9 +17,9 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles; package org.jclouds.cloudfiles;
import static org.jclouds.rackspace.cloudfiles.options.ListContainerOptions.Builder.underPath; import static org.jclouds.cloudfiles.options.ListContainerOptions.Builder.underPath;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertTrue;
@ -39,14 +39,14 @@ import org.jclouds.crypto.CryptoStreams;
import org.jclouds.http.HttpResponseException; import org.jclouds.http.HttpResponseException;
import org.jclouds.http.options.GetOptions; import org.jclouds.http.options.GetOptions;
import org.jclouds.io.Payloads; import org.jclouds.io.Payloads;
import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; import org.jclouds.cloudfiles.domain.AccountMetadata;
import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.cloudfiles.domain.CFObject;
import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; import org.jclouds.cloudfiles.domain.ContainerCDNMetadata;
import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; import org.jclouds.cloudfiles.domain.ContainerMetadata;
import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata;
import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; import org.jclouds.cloudfiles.domain.ObjectInfo;
import org.jclouds.rackspace.cloudfiles.options.ListCdnContainerOptions; import org.jclouds.cloudfiles.options.ListCdnContainerOptions;
import org.jclouds.rackspace.cloudfiles.options.ListContainerOptions; import org.jclouds.cloudfiles.options.ListContainerOptions;
import org.jclouds.util.Strings2; import org.jclouds.util.Strings2;
import org.testng.annotations.Test; import org.testng.annotations.Test;

8
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/binders/BindCFObjectMetadataToRequestTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/binders/BindCFObjectMetadataToRequestTest.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.binders; package org.jclouds.cloudfiles.binders;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
@ -30,8 +30,8 @@ import javax.ws.rs.HttpMethod;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
import org.jclouds.io.Payload; import org.jclouds.io.Payload;
import org.jclouds.io.Payloads; import org.jclouds.io.Payloads;
import org.jclouds.rackspace.cloudfiles.CloudFilesAsyncClient; import org.jclouds.cloudfiles.CloudFilesAsyncClient;
import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.cloudfiles.domain.CFObject;
import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestClientTest;
import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextFactory;
import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.RestContextSpec;
@ -152,4 +152,4 @@ public class BindCFObjectMetadataToRequestTest extends RestClientTest<CloudFiles
public RestContextSpec<?, ?> createContextSpec() { public RestContextSpec<?, ?> createContextSpec() {
return new RestContextFactory().createContextSpec("cloudfiles", "identity", "credential", new Properties()); return new RestContextFactory().createContextSpec("cloudfiles", "identity", "credential", new Properties());
} }
} }

10
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobRequestSignerTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/CloudFilesBlobRequestSignerTest.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore; package org.jclouds.cloudfiles.blobstore;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
@ -27,10 +27,10 @@ import java.util.Properties;
import org.jclouds.blobstore.BlobRequestSigner; import org.jclouds.blobstore.BlobRequestSigner;
import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.domain.Blob.Factory; import org.jclouds.blobstore.domain.Blob.Factory;
import org.jclouds.cloudfiles.CloudFilesAsyncClient;
import org.jclouds.cloudfiles.config.CloudFilesRestClientModule;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
import org.jclouds.rackspace.cloudfiles.CloudFilesAsyncClient; import org.jclouds.rackspace.TestRackspaceAuthenticationRestClientModule;
import org.jclouds.rackspace.cloudfiles.config.CloudFilesRestClientModule;
import org.jclouds.rackspace.cloudservers.TestRackspaceAuthenticationRestClientModule;
import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestClientTest;
import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextFactory;
import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.RestContextSpec;
@ -120,4 +120,4 @@ public class CloudFilesBlobRequestSignerTest extends RestClientTest<CloudFilesAs
return new RestContextFactory().createContextSpec("cloudfiles", "identity", "credential", new Properties()); return new RestContextFactory().createContextSpec("cloudfiles", "identity", "credential", new Properties());
} }
} }

6
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ListContainerOptionsToBlobStoreListContainerOptions.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/functions/ListContainerOptionsToBlobStoreListContainerOptions.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.functions; package org.jclouds.cloudfiles.blobstore.functions;
import javax.inject.Singleton; import javax.inject.Singleton;
@ -31,9 +31,9 @@ import com.google.common.base.Function;
@Singleton @Singleton
public class ListContainerOptionsToBlobStoreListContainerOptions public class ListContainerOptionsToBlobStoreListContainerOptions
implements implements
Function<org.jclouds.rackspace.cloudfiles.options.ListContainerOptions[], ListContainerOptions> { Function<org.jclouds.cloudfiles.options.ListContainerOptions[], ListContainerOptions> {
public ListContainerOptions apply( public ListContainerOptions apply(
org.jclouds.rackspace.cloudfiles.options.ListContainerOptions[] optionsList) { org.jclouds.cloudfiles.options.ListContainerOptions[] optionsList) {
ListContainerOptions options = new ListContainerOptions(); ListContainerOptions options = new ListContainerOptions();
if (optionsList.length != 0) { if (optionsList.length != 0) {
if (optionsList[0].getPath() != null && !optionsList[0].getPath().equals("")) { if (optionsList[0].getPath() != null && !optionsList[0].getPath().equals("")) {

6
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/functions/ResourceToObjectList.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/functions/ResourceToObjectList.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.functions; package org.jclouds.cloudfiles.blobstore.functions;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
@ -25,7 +25,7 @@ import javax.inject.Singleton;
import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.PageSet;
import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageMetadata;
import org.jclouds.blobstore.domain.internal.PageSetImpl; import org.jclouds.blobstore.domain.internal.PageSetImpl;
import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; import org.jclouds.cloudfiles.domain.ObjectInfo;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
@ -54,4 +54,4 @@ public class ResourceToObjectList implements
}), list.getNextMarker()); }), list.getNextMarker());
} }
} }

4
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobIntegrationLiveTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobIntegrationLiveTest.java Executable file → Normal file
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.cloudfiles.blobstore.integration;
import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest; import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest;
@ -51,4 +51,4 @@ public class CloudFilesBlobIntegrationLiveTest extends BaseBlobIntegrationTest {
assert blob.getMetadata().getContentMetadata().getContentLanguage() == null; assert blob.getMetadata().getContentMetadata().getContentLanguage() == null;
} }
} }

4
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobLiveTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobLiveTest.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.cloudfiles.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseBlobLiveTest; import org.jclouds.blobstore.integration.internal.BaseBlobLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -30,4 +30,4 @@ import org.testng.annotations.Test;
@Test(groups = { "live" }) @Test(groups = { "live" })
public class CloudFilesBlobLiveTest extends BaseBlobLiveTest { public class CloudFilesBlobLiveTest extends BaseBlobLiveTest {
} }

4
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobMapIntegrationLiveTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobMapIntegrationLiveTest.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.cloudfiles.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest; import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -28,4 +28,4 @@ import org.testng.annotations.Test;
@Test(groups = "live") @Test(groups = "live")
public class CloudFilesBlobMapIntegrationLiveTest extends BaseBlobMapIntegrationTest { public class CloudFilesBlobMapIntegrationLiveTest extends BaseBlobMapIntegrationTest {
} }

4
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesBlobSignerLiveTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesBlobSignerLiveTest.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.cloudfiles.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseBlobSignerLiveTest; import org.jclouds.blobstore.integration.internal.BaseBlobSignerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -29,4 +29,4 @@ import org.testng.annotations.Test;
@Test(groups = { "live" }) @Test(groups = { "live" })
public class CloudFilesBlobSignerLiveTest extends BaseBlobSignerLiveTest { public class CloudFilesBlobSignerLiveTest extends BaseBlobSignerLiveTest {
} }

4
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesContainerIntegrationLiveTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerIntegrationLiveTest.java Executable file → Normal file
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.cloudfiles.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest; import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -29,4 +29,4 @@ import org.testng.annotations.Test;
@Test(groups = "live") @Test(groups = "live")
public class CloudFilesContainerIntegrationLiveTest extends BaseContainerIntegrationTest { public class CloudFilesContainerIntegrationLiveTest extends BaseContainerIntegrationTest {
} }

4
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.cloudfiles.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest; import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -29,4 +29,4 @@ import org.testng.annotations.Test;
@Test(groups = { "live" }) @Test(groups = { "live" })
public class CloudFilesContainerLiveTest extends BaseContainerLiveTest { public class CloudFilesContainerLiveTest extends BaseContainerLiveTest {
} }

4
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesInputStreamMapIntegrationLiveTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesInputStreamMapIntegrationLiveTest.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.cloudfiles.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest; import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -28,4 +28,4 @@ import org.testng.annotations.Test;
@Test(groups = "live") @Test(groups = "live")
public class CloudFilesInputStreamMapIntegrationLiveTest extends BaseInputStreamMapIntegrationTest { public class CloudFilesInputStreamMapIntegrationLiveTest extends BaseInputStreamMapIntegrationTest {
} }

4
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesServiceIntegrationLiveTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesServiceIntegrationLiveTest.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.cloudfiles.blobstore.integration;
import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest; import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -28,4 +28,4 @@ import org.testng.annotations.Test;
@Test(groups = "live") @Test(groups = "live")
public class CloudFilesServiceIntegrationLiveTest extends BaseServiceIntegrationTest { public class CloudFilesServiceIntegrationLiveTest extends BaseServiceIntegrationTest {
} }

4
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesTestInitializer.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesTestInitializer.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.blobstore.integration; package org.jclouds.cloudfiles.blobstore.integration;
import java.io.IOException; import java.io.IOException;
@ -46,4 +46,4 @@ public class CloudFilesTestInitializer extends TransientBlobStoreTestInitializer
new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential)); new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential));
} }
} }

10
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/domain/internal/ParseObjectInfoListFromJsonResponseTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/domain/internal/ParseObjectInfoListFromJsonResponseTest.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.domain.internal; package org.jclouds.cloudfiles.domain.internal;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.createMock; import static org.easymock.classextension.EasyMock.createMock;
@ -30,9 +30,9 @@ import java.util.Set;
import org.jclouds.crypto.CryptoStreams; import org.jclouds.crypto.CryptoStreams;
import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.date.internal.SimpleDateFormatDateService;
import org.jclouds.json.config.GsonModule; import org.jclouds.json.config.GsonModule;
import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; import org.jclouds.cloudfiles.domain.ObjectInfo;
import org.jclouds.rackspace.cloudfiles.functions.ParseObjectInfoListFromJsonResponse; import org.jclouds.cloudfiles.functions.ParseObjectInfoListFromJsonResponse;
import org.jclouds.rackspace.cloudfiles.options.ListContainerOptions; import org.jclouds.cloudfiles.options.ListContainerOptions;
import org.jclouds.rackspace.config.RackspaceParserModule; import org.jclouds.rackspace.config.RackspaceParserModule;
import org.jclouds.rest.internal.GeneratedHttpRequest; import org.jclouds.rest.internal.GeneratedHttpRequest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -53,7 +53,7 @@ public class ParseObjectInfoListFromJsonResponseTest {
Injector i = Guice.createInjector(new RackspaceParserModule(), new GsonModule()); Injector i = Guice.createInjector(new RackspaceParserModule(), new GsonModule());
public void testApplyInputStream() { public void testApplyInputStream() {
InputStream is = getClass().getResourceAsStream("/cloudfiles/test_list_container.json"); InputStream is = getClass().getResourceAsStream("/test_list_container.json");
Set<ObjectInfo> expects = Sets.newHashSet(); Set<ObjectInfo> expects = Sets.newHashSet();
ObjectInfoImpl one = i.getInstance(ObjectInfoImpl.class); ObjectInfoImpl one = i.getInstance(ObjectInfoImpl.class);
one.name = "test_obj_1"; one.name = "test_obj_1";

2
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseAuthenticationResponseFromHeadersTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseAuthenticationResponseFromHeadersTest.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.functions; package org.jclouds.cloudfiles.functions;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;

6
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.functions; package org.jclouds.cloudfiles.functions;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
@ -30,7 +30,7 @@ import org.jclouds.http.HttpResponse;
import org.jclouds.http.functions.ParseJson; import org.jclouds.http.functions.ParseJson;
import org.jclouds.io.Payloads; import org.jclouds.io.Payloads;
import org.jclouds.json.config.GsonModule; import org.jclouds.json.config.GsonModule;
import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; import org.jclouds.cloudfiles.domain.ContainerCDNMetadata;
import org.jclouds.rackspace.config.RackspaceParserModule; import org.jclouds.rackspace.config.RackspaceParserModule;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -52,7 +52,7 @@ public class ParseContainerCDNMetadataListFromJsonResponseTest {
@Test @Test
public void testApplyInputStream() { public void testApplyInputStream() {
InputStream is = getClass().getResourceAsStream("/cloudfiles/test_list_cdn.json"); InputStream is = getClass().getResourceAsStream("/test_list_cdn.json");
Set<ContainerCDNMetadata> expects = ImmutableSortedSet.of( Set<ContainerCDNMetadata> expects = ImmutableSortedSet.of(
new ContainerCDNMetadata("adriancole-blobstore.testCDNOperationsContainerWithCDN", false, 3600, URI new ContainerCDNMetadata("adriancole-blobstore.testCDNOperationsContainerWithCDN", false, 3600, URI

4
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseContainerListFromJsonResponseTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseContainerListFromJsonResponseTest.java Executable file → Normal file
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.functions; package org.jclouds.cloudfiles.functions;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
@ -28,7 +28,7 @@ import org.jclouds.http.HttpResponse;
import org.jclouds.http.functions.ParseJson; import org.jclouds.http.functions.ParseJson;
import org.jclouds.io.Payloads; import org.jclouds.io.Payloads;
import org.jclouds.json.config.GsonModule; import org.jclouds.json.config.GsonModule;
import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; import org.jclouds.cloudfiles.domain.ContainerMetadata;
import org.jclouds.rackspace.config.RackspaceParserModule; import org.jclouds.rackspace.config.RackspaceParserModule;
import org.jclouds.util.Strings2; import org.jclouds.util.Strings2;
import org.testng.annotations.Test; import org.testng.annotations.Test;

4
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/functions/ParseObjectInfoFromHeadersTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/functions/ParseObjectInfoFromHeadersTest.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.functions; package org.jclouds.cloudfiles.functions;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.createMock; import static org.easymock.classextension.EasyMock.createMock;
@ -30,7 +30,7 @@ import org.jclouds.Constants;
import org.jclouds.blobstore.reference.BlobStoreConstants; import org.jclouds.blobstore.reference.BlobStoreConstants;
import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponse;
import org.jclouds.io.Payloads; import org.jclouds.io.Payloads;
import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata;
import org.jclouds.rest.internal.GeneratedHttpRequest; import org.jclouds.rest.internal.GeneratedHttpRequest;
import org.testng.annotations.Test; import org.testng.annotations.Test;

4
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponseTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/handlers/ParseCloudFilesErrorFromHttpResponseTest.java
View File

@ -1,4 +1,4 @@
package org.jclouds.rackspace.cloudfiles.handlers; package org.jclouds.cloudfiles.handlers;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.reportMatcher; import static org.easymock.EasyMock.reportMatcher;
@ -98,4 +98,4 @@ public class ParseCloudFilesErrorFromHttpResponseTest {
return null; return null;
} }
} }

32
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/internal/StubCloudFilesAsyncClient.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/internal/StubCloudFilesAsyncClient.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.internal; package org.jclouds.cloudfiles.internal;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.util.concurrent.Futures.immediateFuture; import static com.google.common.util.concurrent.Futures.immediateFuture;
@ -41,19 +41,19 @@ import org.jclouds.blobstore.functions.HttpGetOptionsListToGetOptions;
import org.jclouds.blobstore.options.ListContainerOptions; import org.jclouds.blobstore.options.ListContainerOptions;
import org.jclouds.concurrent.Futures; import org.jclouds.concurrent.Futures;
import org.jclouds.http.options.GetOptions; import org.jclouds.http.options.GetOptions;
import org.jclouds.rackspace.cloudfiles.CloudFilesAsyncClient; import org.jclouds.cloudfiles.CloudFilesAsyncClient;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.BlobToObject; import org.jclouds.cloudfiles.blobstore.functions.BlobToObject;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.ListContainerOptionsToBlobStoreListContainerOptions; import org.jclouds.cloudfiles.blobstore.functions.ListContainerOptionsToBlobStoreListContainerOptions;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.ObjectToBlob; import org.jclouds.cloudfiles.blobstore.functions.ObjectToBlob;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.ResourceToObjectInfo; import org.jclouds.cloudfiles.blobstore.functions.ResourceToObjectInfo;
import org.jclouds.rackspace.cloudfiles.blobstore.functions.ResourceToObjectList; import org.jclouds.cloudfiles.blobstore.functions.ResourceToObjectList;
import org.jclouds.rackspace.cloudfiles.domain.AccountMetadata; import org.jclouds.cloudfiles.domain.AccountMetadata;
import org.jclouds.rackspace.cloudfiles.domain.CFObject; import org.jclouds.cloudfiles.domain.CFObject;
import org.jclouds.rackspace.cloudfiles.domain.ContainerCDNMetadata; import org.jclouds.cloudfiles.domain.ContainerCDNMetadata;
import org.jclouds.rackspace.cloudfiles.domain.ContainerMetadata; import org.jclouds.cloudfiles.domain.ContainerMetadata;
import org.jclouds.rackspace.cloudfiles.domain.MutableObjectInfoWithMetadata; import org.jclouds.cloudfiles.domain.MutableObjectInfoWithMetadata;
import org.jclouds.rackspace.cloudfiles.domain.ObjectInfo; import org.jclouds.cloudfiles.domain.ObjectInfo;
import org.jclouds.rackspace.cloudfiles.options.ListCdnContainerOptions; import org.jclouds.cloudfiles.options.ListCdnContainerOptions;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
@ -153,7 +153,7 @@ public class StubCloudFilesAsyncClient implements CloudFilesAsyncClient {
} }
public ListenableFuture<? extends Set<ContainerMetadata>> listContainers( public ListenableFuture<? extends Set<ContainerMetadata>> listContainers(
org.jclouds.rackspace.cloudfiles.options.ListContainerOptions... options) { org.jclouds.cloudfiles.options.ListContainerOptions... options) {
return immediateFuture(Sets.newHashSet(Iterables.transform(blobStore.getContainerToBlobs().keySet(), return immediateFuture(Sets.newHashSet(Iterables.transform(blobStore.getContainerToBlobs().keySet(),
new Function<String, ContainerMetadata>() { new Function<String, ContainerMetadata>() {
public ContainerMetadata apply(String name) { public ContainerMetadata apply(String name) {
@ -163,7 +163,7 @@ public class StubCloudFilesAsyncClient implements CloudFilesAsyncClient {
} }
public ListenableFuture<PageSet<ObjectInfo>> listObjects(String container, public ListenableFuture<PageSet<ObjectInfo>> listObjects(String container,
org.jclouds.rackspace.cloudfiles.options.ListContainerOptions... optionsList) { org.jclouds.cloudfiles.options.ListContainerOptions... optionsList) {
ListContainerOptions options = container2ContainerListOptions.apply(optionsList); ListContainerOptions options = container2ContainerListOptions.apply(optionsList);
return Futures.compose(blobStore.list(container, options), resource2ObjectList, service); return Futures.compose(blobStore.list(container, options), resource2ObjectList, service);
} }

12
rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/options/ListContainerOptionsTest.java → apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/options/ListContainerOptionsTest.java
View File

@ -17,18 +17,18 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudfiles.options; package org.jclouds.cloudfiles.options;
import static org.jclouds.rackspace.cloudfiles.options.ListContainerOptions.Builder.afterMarker; import static org.jclouds.cloudfiles.options.ListContainerOptions.Builder.afterMarker;
import static org.jclouds.rackspace.cloudfiles.options.ListContainerOptions.Builder.underPath; import static org.jclouds.cloudfiles.options.ListContainerOptions.Builder.underPath;
import static org.jclouds.rackspace.cloudfiles.options.ListContainerOptions.Builder.maxResults; import static org.jclouds.cloudfiles.options.ListContainerOptions.Builder.maxResults;
import static org.jclouds.rackspace.cloudfiles.options.ListContainerOptions.Builder.withPrefix; import static org.jclouds.cloudfiles.options.ListContainerOptions.Builder.withPrefix;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.Collections; import java.util.Collections;
import org.jclouds.rackspace.cloudfiles.reference.CloudFilesConstants; import org.jclouds.cloudfiles.reference.CloudFilesConstants;
import org.jclouds.http.options.HttpRequestOptions; import org.jclouds.http.options.HttpRequestOptions;
import org.testng.annotations.Test; import org.testng.annotations.Test;

0
rackspace/src/test/resources/log4j.xml → apis/cloudfiles/src/test/resources/log4j.xml
View File

0
rackspace/src/test/resources/cloudfiles/test_list_cdn.json → apis/cloudfiles/src/test/resources/test_list_cdn.json
View File

0
rackspace/src/test/resources/cloudfiles/test_list_container.json → apis/cloudfiles/src/test/resources/test_list_container.json
View File

145
apis/cloudservers/pom.xml Normal file
View File

@ -0,0 +1,145 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
====================================================================
Licensed 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.jclouds</groupId>
<artifactId>jclouds-project</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../../project/pom.xml</relativePath>
</parent>
<groupId>org.jclouds.api</groupId>
<artifactId>cloudservers</artifactId>
<name>jcloud cloudservers api</name>
<description>jclouds components to access an implementation of CloudServers</description>
<properties>
<test.cloudservers.endpoint>https://auth.api.rackspacecloud.com</test.cloudservers.endpoint>
<test.cloudservers.apiversion>1.0</test.cloudservers.apiversion>
<test.cloudservers.identity>${test.rackspace.identity}</test.cloudservers.identity>
<test.cloudservers.credential>${test.rackspace.credential}</test.cloudservers.credential>
</properties>
<dependencies>
<dependency>
<groupId>org.jclouds.common</groupId>
<artifactId>rackspace-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-compute</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jclouds.common</groupId>
<artifactId>rackspace-common</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-compute</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-jsch</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-log4j</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>live</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>integration</id>
<phase>integration-test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<systemProperties>
<property>
<name>test.cloudservers.endpoint</name>
<value>${test.cloudservers.endpoint}</value>
</property>
<property>
<name>test.cloudservers.apiversion</name>
<value>${test.cloudservers.apiversion}</value>
</property>
<property>
<name>test.cloudservers.identity</name>
<value>${test.cloudservers.identity}</value>
</property>
<property>
<name>test.cloudservers.credential</name>
<value>${test.cloudservers.credential}</value>
</property>
<property>
<name>test.initializer</name>
<value>${test.initializer}</value>
</property>
</systemProperties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

42
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersAsyncClient.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersAsyncClient.java Executable file → Normal file
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers; package org.jclouds.cloudservers;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@ -34,26 +34,26 @@ import javax.ws.rs.core.MediaType;
import org.jclouds.http.functions.ReturnFalseOn404; import org.jclouds.http.functions.ReturnFalseOn404;
import org.jclouds.rackspace.CloudServers; import org.jclouds.rackspace.CloudServers;
import org.jclouds.rackspace.cloudservers.binders.BindAdminPassToJsonPayload; import org.jclouds.cloudservers.binders.BindAdminPassToJsonPayload;
import org.jclouds.rackspace.cloudservers.binders.BindBackupScheduleToJsonPayload; import org.jclouds.cloudservers.binders.BindBackupScheduleToJsonPayload;
import org.jclouds.rackspace.cloudservers.binders.BindConfirmResizeToJsonPayload; import org.jclouds.cloudservers.binders.BindConfirmResizeToJsonPayload;
import org.jclouds.rackspace.cloudservers.binders.BindCreateImageToJsonPayload; import org.jclouds.cloudservers.binders.BindCreateImageToJsonPayload;
import org.jclouds.rackspace.cloudservers.binders.BindRebootTypeToJsonPayload; import org.jclouds.cloudservers.binders.BindRebootTypeToJsonPayload;
import org.jclouds.rackspace.cloudservers.binders.BindResizeFlavorToJsonPayload; import org.jclouds.cloudservers.binders.BindResizeFlavorToJsonPayload;
import org.jclouds.rackspace.cloudservers.binders.BindRevertResizeToJsonPayload; import org.jclouds.cloudservers.binders.BindRevertResizeToJsonPayload;
import org.jclouds.rackspace.cloudservers.binders.BindServerNameToJsonPayload; import org.jclouds.cloudservers.binders.BindServerNameToJsonPayload;
import org.jclouds.rackspace.cloudservers.binders.BindSharedIpGroupToJsonPayload; import org.jclouds.cloudservers.binders.BindSharedIpGroupToJsonPayload;
import org.jclouds.rackspace.cloudservers.domain.Addresses; import org.jclouds.cloudservers.domain.Addresses;
import org.jclouds.rackspace.cloudservers.domain.BackupSchedule; import org.jclouds.cloudservers.domain.BackupSchedule;
import org.jclouds.rackspace.cloudservers.domain.Flavor; import org.jclouds.cloudservers.domain.Flavor;
import org.jclouds.rackspace.cloudservers.domain.Image; import org.jclouds.cloudservers.domain.Image;
import org.jclouds.rackspace.cloudservers.domain.RebootType; import org.jclouds.cloudservers.domain.RebootType;
import org.jclouds.rackspace.cloudservers.domain.Server; import org.jclouds.cloudservers.domain.Server;
import org.jclouds.rackspace.cloudservers.domain.SharedIpGroup; import org.jclouds.cloudservers.domain.SharedIpGroup;
import org.jclouds.rackspace.cloudservers.options.CreateServerOptions; import org.jclouds.cloudservers.options.CreateServerOptions;
import org.jclouds.rackspace.cloudservers.options.CreateSharedIpGroupOptions; import org.jclouds.cloudservers.options.CreateSharedIpGroupOptions;
import org.jclouds.rackspace.cloudservers.options.ListOptions; import org.jclouds.cloudservers.options.ListOptions;
import org.jclouds.rackspace.cloudservers.options.RebuildServerOptions; import org.jclouds.cloudservers.options.RebuildServerOptions;
import org.jclouds.rackspace.filters.AddTimestampQuery; import org.jclouds.rackspace.filters.AddTimestampQuery;
import org.jclouds.rackspace.filters.AuthenticateRequest; import org.jclouds.rackspace.filters.AuthenticateRequest;
import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.BinderParam;

24
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersClient.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersClient.java Executable file → Normal file
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers; package org.jclouds.cloudservers;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@ -26,17 +26,17 @@ import java.util.concurrent.TimeUnit;
import javax.ws.rs.PathParam; import javax.ws.rs.PathParam;
import org.jclouds.concurrent.Timeout; import org.jclouds.concurrent.Timeout;
import org.jclouds.rackspace.cloudservers.domain.Addresses; import org.jclouds.cloudservers.domain.Addresses;
import org.jclouds.rackspace.cloudservers.domain.BackupSchedule; import org.jclouds.cloudservers.domain.BackupSchedule;
import org.jclouds.rackspace.cloudservers.domain.Flavor; import org.jclouds.cloudservers.domain.Flavor;
import org.jclouds.rackspace.cloudservers.domain.Image; import org.jclouds.cloudservers.domain.Image;
import org.jclouds.rackspace.cloudservers.domain.RebootType; import org.jclouds.cloudservers.domain.RebootType;
import org.jclouds.rackspace.cloudservers.domain.Server; import org.jclouds.cloudservers.domain.Server;
import org.jclouds.rackspace.cloudservers.domain.SharedIpGroup; import org.jclouds.cloudservers.domain.SharedIpGroup;
import org.jclouds.rackspace.cloudservers.options.CreateServerOptions; import org.jclouds.cloudservers.options.CreateServerOptions;
import org.jclouds.rackspace.cloudservers.options.CreateSharedIpGroupOptions; import org.jclouds.cloudservers.options.CreateSharedIpGroupOptions;
import org.jclouds.rackspace.cloudservers.options.ListOptions; import org.jclouds.cloudservers.options.ListOptions;
import org.jclouds.rackspace.cloudservers.options.RebuildServerOptions; import org.jclouds.cloudservers.options.RebuildServerOptions;
import org.jclouds.rest.ResourceNotFoundException; import org.jclouds.rest.ResourceNotFoundException;
import java.util.concurrent.Future; import java.util.concurrent.Future;

6
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersContextBuilder.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersContextBuilder.java Executable file → Normal file
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers; package org.jclouds.cloudservers;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
@ -25,8 +25,8 @@ import java.util.Properties;
import org.jclouds.compute.ComputeServiceContextBuilder; import org.jclouds.compute.ComputeServiceContextBuilder;
import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
import org.jclouds.logging.jdk.config.JDKLoggingModule; import org.jclouds.logging.jdk.config.JDKLoggingModule;
import org.jclouds.rackspace.cloudservers.compute.config.CloudServersComputeServiceContextModule; import org.jclouds.cloudservers.compute.config.CloudServersComputeServiceContextModule;
import org.jclouds.rackspace.cloudservers.config.CloudServersRestClientModule; import org.jclouds.cloudservers.config.CloudServersRestClientModule;
import com.google.inject.Injector; import com.google.inject.Injector;
import com.google.inject.Module; import com.google.inject.Module;

2
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindAdminPassToJsonPayload.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindAdminPassToJsonPayload.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.binders; package org.jclouds.cloudservers.binders;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;

4
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindBackupScheduleToJsonPayload.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindBackupScheduleToJsonPayload.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.binders; package org.jclouds.cloudservers.binders;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
@ -26,7 +26,7 @@ import java.util.Map;
import javax.inject.Singleton; import javax.inject.Singleton;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
import org.jclouds.rackspace.cloudservers.domain.BackupSchedule; import org.jclouds.cloudservers.domain.BackupSchedule;
import org.jclouds.rest.binders.BindToJsonPayload; import org.jclouds.rest.binders.BindToJsonPayload;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;

2
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindConfirmResizeToJsonPayload.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindConfirmResizeToJsonPayload.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.binders; package org.jclouds.cloudservers.binders;
import javax.inject.Singleton; import javax.inject.Singleton;

2
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindCreateImageToJsonPayload.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindCreateImageToJsonPayload.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.binders; package org.jclouds.cloudservers.binders;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;

4
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindRebootTypeToJsonPayload.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindRebootTypeToJsonPayload.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.binders; package org.jclouds.cloudservers.binders;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -27,7 +27,7 @@ import java.util.Map;
import javax.inject.Singleton; import javax.inject.Singleton;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
import org.jclouds.rackspace.cloudservers.domain.RebootType; import org.jclouds.cloudservers.domain.RebootType;
import org.jclouds.rest.binders.BindToJsonPayload; import org.jclouds.rest.binders.BindToJsonPayload;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;

2
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindResizeFlavorToJsonPayload.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindResizeFlavorToJsonPayload.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.binders; package org.jclouds.cloudservers.binders;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;

2
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindRevertResizeToJsonPayload.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindRevertResizeToJsonPayload.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.binders; package org.jclouds.cloudservers.binders;
import javax.inject.Singleton; import javax.inject.Singleton;

2
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindServerNameToJsonPayload.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindServerNameToJsonPayload.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.binders; package org.jclouds.cloudservers.binders;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;

2
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/binders/BindSharedIpGroupToJsonPayload.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindSharedIpGroupToJsonPayload.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.binders; package org.jclouds.cloudservers.binders;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;

14
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersBindComputeStrategiesByClass.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersBindComputeStrategiesByClass.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.config; package org.jclouds.cloudservers.compute.config;
import org.jclouds.compute.config.BindComputeStrategiesByClass; import org.jclouds.compute.config.BindComputeStrategiesByClass;
import org.jclouds.compute.strategy.AddNodeWithTagStrategy; import org.jclouds.compute.strategy.AddNodeWithTagStrategy;
@ -27,11 +27,11 @@ import org.jclouds.compute.strategy.ListNodesStrategy;
import org.jclouds.compute.strategy.RebootNodeStrategy; import org.jclouds.compute.strategy.RebootNodeStrategy;
import org.jclouds.compute.strategy.ResumeNodeStrategy; import org.jclouds.compute.strategy.ResumeNodeStrategy;
import org.jclouds.compute.strategy.SuspendNodeStrategy; import org.jclouds.compute.strategy.SuspendNodeStrategy;
import org.jclouds.rackspace.cloudservers.compute.strategy.CloudServersAddNodeWithTagStrategy; import org.jclouds.cloudservers.compute.strategy.CloudServersAddNodeWithTagStrategy;
import org.jclouds.rackspace.cloudservers.compute.strategy.CloudServersDestroyNodeStrategy; import org.jclouds.cloudservers.compute.strategy.CloudServersDestroyNodeStrategy;
import org.jclouds.rackspace.cloudservers.compute.strategy.CloudServersGetNodeMetadataStrategy; import org.jclouds.cloudservers.compute.strategy.CloudServersGetNodeMetadataStrategy;
import org.jclouds.rackspace.cloudservers.compute.strategy.CloudServersListNodesStrategy; import org.jclouds.cloudservers.compute.strategy.CloudServersListNodesStrategy;
import org.jclouds.rackspace.cloudservers.compute.strategy.CloudServersLifeCycleStrategy; import org.jclouds.cloudservers.compute.strategy.CloudServersLifeCycleStrategy;
/** /**
* *
@ -74,4 +74,4 @@ public class CloudServersBindComputeStrategiesByClass extends BindComputeStrateg
protected Class<? extends SuspendNodeStrategy> defineStopNodeStrategy() { protected Class<? extends SuspendNodeStrategy> defineStopNodeStrategy() {
return CloudServersLifeCycleStrategy.class; return CloudServersLifeCycleStrategy.class;
} }
} }

8
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersBindComputeSuppliersByClass.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersBindComputeSuppliersByClass.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.config; package org.jclouds.cloudservers.compute.config;
import java.util.Set; import java.util.Set;
@ -25,8 +25,8 @@ import org.jclouds.compute.config.BindComputeSuppliersByClass;
import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.Image;
import org.jclouds.domain.Location; import org.jclouds.domain.Location;
import org.jclouds.rackspace.cloudservers.compute.suppliers.CloudServersHardwareSupplier; import org.jclouds.cloudservers.compute.suppliers.CloudServersHardwareSupplier;
import org.jclouds.rackspace.cloudservers.compute.suppliers.CloudServersImageSupplier; import org.jclouds.cloudservers.compute.suppliers.CloudServersImageSupplier;
import org.jclouds.rackspace.config.RackspaceLocationsSupplier; import org.jclouds.rackspace.config.RackspaceLocationsSupplier;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
@ -51,4 +51,4 @@ public class CloudServersBindComputeSuppliersByClass extends BindComputeSupplier
protected Class<? extends Supplier<Set<? extends Location>>> defineLocationSupplier() { protected Class<? extends Supplier<Set<? extends Location>>> defineLocationSupplier() {
return RackspaceLocationsSupplier.class; return RackspaceLocationsSupplier.class;
} }
} }

2
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModule.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceContextModule.java Executable file → Normal file
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.config; package org.jclouds.cloudservers.compute.config;
import org.jclouds.compute.config.BaseComputeServiceContextModule; import org.jclouds.compute.config.BaseComputeServiceContextModule;
import org.jclouds.compute.internal.BaseComputeService; import org.jclouds.compute.internal.BaseComputeService;

24
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceDependenciesModule.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceDependenciesModule.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.config; package org.jclouds.cloudservers.compute.config;
import java.util.Map; import java.util.Map;
@ -31,15 +31,15 @@ import org.jclouds.compute.domain.NodeState;
import org.jclouds.compute.domain.OperatingSystem; import org.jclouds.compute.domain.OperatingSystem;
import org.jclouds.compute.internal.BaseComputeService; import org.jclouds.compute.internal.BaseComputeService;
import org.jclouds.compute.internal.ComputeServiceContextImpl; import org.jclouds.compute.internal.ComputeServiceContextImpl;
import org.jclouds.rackspace.cloudservers.CloudServersAsyncClient; import org.jclouds.cloudservers.CloudServersAsyncClient;
import org.jclouds.rackspace.cloudservers.CloudServersClient; import org.jclouds.cloudservers.CloudServersClient;
import org.jclouds.rackspace.cloudservers.compute.functions.CloudServersImageToImage; import org.jclouds.cloudservers.compute.functions.CloudServersImageToImage;
import org.jclouds.rackspace.cloudservers.compute.functions.CloudServersImageToOperatingSystem; import org.jclouds.cloudservers.compute.functions.CloudServersImageToOperatingSystem;
import org.jclouds.rackspace.cloudservers.compute.functions.FlavorToHardware; import org.jclouds.cloudservers.compute.functions.FlavorToHardware;
import org.jclouds.rackspace.cloudservers.compute.functions.ServerToNodeMetadata; import org.jclouds.cloudservers.compute.functions.ServerToNodeMetadata;
import org.jclouds.rackspace.cloudservers.domain.Flavor; import org.jclouds.cloudservers.domain.Flavor;
import org.jclouds.rackspace.cloudservers.domain.Server; import org.jclouds.cloudservers.domain.Server;
import org.jclouds.rackspace.cloudservers.domain.ServerStatus; import org.jclouds.cloudservers.domain.ServerStatus;
import org.jclouds.rest.RestContext; import org.jclouds.rest.RestContext;
import org.jclouds.rest.internal.RestContextImpl; import org.jclouds.rest.internal.RestContextImpl;
@ -64,10 +64,10 @@ public class CloudServersComputeServiceDependenciesModule extends AbstractModule
bind(new TypeLiteral<Function<Server, NodeMetadata>>() { bind(new TypeLiteral<Function<Server, NodeMetadata>>() {
}).to(ServerToNodeMetadata.class); }).to(ServerToNodeMetadata.class);
bind(new TypeLiteral<Function<org.jclouds.rackspace.cloudservers.domain.Image, Image>>() { bind(new TypeLiteral<Function<org.jclouds.cloudservers.domain.Image, Image>>() {
}).to(CloudServersImageToImage.class); }).to(CloudServersImageToImage.class);
bind(new TypeLiteral<Function<org.jclouds.rackspace.cloudservers.domain.Image, OperatingSystem>>() { bind(new TypeLiteral<Function<org.jclouds.cloudservers.domain.Image, OperatingSystem>>() {
}).to(CloudServersImageToOperatingSystem.class); }).to(CloudServersImageToOperatingSystem.class);
bind(new TypeLiteral<Function<Flavor, Hardware>>() { bind(new TypeLiteral<Function<Flavor, Hardware>>() {

12
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToImage.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/CloudServersImageToImage.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.functions; package org.jclouds.cloudservers.compute.functions;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
@ -34,15 +34,15 @@ import com.google.common.base.Function;
* @author Adrian Cole * @author Adrian Cole
*/ */
@Singleton @Singleton
public class CloudServersImageToImage implements Function<org.jclouds.rackspace.cloudservers.domain.Image, Image> { public class CloudServersImageToImage implements Function<org.jclouds.cloudservers.domain.Image, Image> {
private final Function<org.jclouds.rackspace.cloudservers.domain.Image, OperatingSystem> imageToOs; private final Function<org.jclouds.cloudservers.domain.Image, OperatingSystem> imageToOs;
@Inject @Inject
CloudServersImageToImage(Function<org.jclouds.rackspace.cloudservers.domain.Image, OperatingSystem> imageToOs) { CloudServersImageToImage(Function<org.jclouds.cloudservers.domain.Image, OperatingSystem> imageToOs) {
this.imageToOs = imageToOs; this.imageToOs = imageToOs;
} }
public Image apply(org.jclouds.rackspace.cloudservers.domain.Image from) { public Image apply(org.jclouds.cloudservers.domain.Image from) {
ImageBuilder builder = new ImageBuilder(); ImageBuilder builder = new ImageBuilder();
builder.ids(from.getId() + ""); builder.ids(from.getId() + "");
builder.name(from.getName()); builder.name(from.getName());
@ -53,4 +53,4 @@ public class CloudServersImageToImage implements Function<org.jclouds.rackspace.
Image image = builder.build(); Image image = builder.build();
return image; return image;
} }
} }

8
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToOperatingSystem.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/CloudServersImageToOperatingSystem.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.functions; package org.jclouds.cloudservers.compute.functions;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -42,7 +42,7 @@ import com.google.common.base.Function;
*/ */
@Singleton @Singleton
public class CloudServersImageToOperatingSystem implements public class CloudServersImageToOperatingSystem implements
Function<org.jclouds.rackspace.cloudservers.domain.Image, OperatingSystem> { Function<org.jclouds.cloudservers.domain.Image, OperatingSystem> {
public static final Pattern DEFAULT_PATTERN = Pattern.compile("(([^ ]*) ([0-9.]+) ?.*)"); public static final Pattern DEFAULT_PATTERN = Pattern.compile("(([^ ]*) ([0-9.]+) ?.*)");
// Windows Server 2008 R2 x64 // Windows Server 2008 R2 x64
public static final Pattern WINDOWS_PATTERN = Pattern.compile("Windows (.*) (x[86][64])"); public static final Pattern WINDOWS_PATTERN = Pattern.compile("Windows (.*) (x[86][64])");
@ -58,7 +58,7 @@ public class CloudServersImageToOperatingSystem implements
this.osVersionMap = osVersionMap; this.osVersionMap = osVersionMap;
} }
public OperatingSystem apply(final org.jclouds.rackspace.cloudservers.domain.Image from) { public OperatingSystem apply(final org.jclouds.cloudservers.domain.Image from) {
OsFamily osFamily = null; OsFamily osFamily = null;
String osName = null; String osName = null;
String osArch = null; String osArch = null;
@ -89,4 +89,4 @@ public class CloudServersImageToOperatingSystem implements
} }
return new OperatingSystem(osFamily, osName, osVersion, osArch, osDescription, is64Bit); return new OperatingSystem(osFamily, osName, osVersion, osArch, osDescription, is64Bit);
} }
} }

6
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/FlavorToHardware.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/FlavorToHardware.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.functions; package org.jclouds.cloudservers.compute.functions;
import javax.inject.Singleton; import javax.inject.Singleton;
@ -26,7 +26,7 @@ import org.jclouds.compute.domain.HardwareBuilder;
import org.jclouds.compute.domain.Processor; import org.jclouds.compute.domain.Processor;
import org.jclouds.compute.domain.Volume; import org.jclouds.compute.domain.Volume;
import org.jclouds.compute.domain.internal.VolumeImpl; import org.jclouds.compute.domain.internal.VolumeImpl;
import org.jclouds.rackspace.cloudservers.domain.Flavor; import org.jclouds.cloudservers.domain.Flavor;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
@ -41,4 +41,4 @@ public class FlavorToHardware implements Function<Flavor, Hardware> {
.processors(ImmutableList.of(new Processor(from.getDisk() / 10.0, 1.0))).ram(from.getRam()) .processors(ImmutableList.of(new Processor(from.getDisk() / 10.0, 1.0))).ram(from.getRam())
.volumes(ImmutableList.<Volume> of(new VolumeImpl((float) from.getDisk(), true, true))).build(); .volumes(ImmutableList.<Volume> of(new VolumeImpl((float) from.getDisk(), true, true))).build();
} }
} }

8
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/ServerToNodeMetadata.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/ServerToNodeMetadata.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.functions; package org.jclouds.cloudservers.compute.functions;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.compute.util.ComputeServiceUtils.parseTagFromName; import static org.jclouds.compute.util.ComputeServiceUtils.parseTagFromName;
@ -42,8 +42,8 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.LocationScope; import org.jclouds.domain.LocationScope;
import org.jclouds.domain.internal.LocationImpl; import org.jclouds.domain.internal.LocationImpl;
import org.jclouds.logging.Logger; import org.jclouds.logging.Logger;
import org.jclouds.rackspace.cloudservers.domain.Server; import org.jclouds.cloudservers.domain.Server;
import org.jclouds.rackspace.cloudservers.domain.ServerStatus; import org.jclouds.cloudservers.domain.ServerStatus;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
@ -136,4 +136,4 @@ public class ServerToNodeMetadata implements Function<Server, NodeMetadata> {
} }
return null; return null;
} }
} }

8
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersAddNodeWithTagStrategy.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersAddNodeWithTagStrategy.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.strategy; package org.jclouds.cloudservers.compute.strategy;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -30,8 +30,8 @@ import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.Template; import org.jclouds.compute.domain.Template;
import org.jclouds.compute.strategy.AddNodeWithTagStrategy; import org.jclouds.compute.strategy.AddNodeWithTagStrategy;
import org.jclouds.domain.Credentials; import org.jclouds.domain.Credentials;
import org.jclouds.rackspace.cloudservers.CloudServersClient; import org.jclouds.cloudservers.CloudServersClient;
import org.jclouds.rackspace.cloudservers.domain.Server; import org.jclouds.cloudservers.domain.Server;
import com.google.common.base.Function; import com.google.common.base.Function;
@ -60,4 +60,4 @@ public class CloudServersAddNodeWithTagStrategy implements AddNodeWithTagStrateg
return serverToNodeMetadata.apply(from); return serverToNodeMetadata.apply(from);
} }
} }

6
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersDestroyNodeStrategy.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersDestroyNodeStrategy.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.strategy; package org.jclouds.cloudservers.compute.strategy;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
@ -25,7 +25,7 @@ import javax.inject.Singleton;
import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.strategy.DestroyNodeStrategy; import org.jclouds.compute.strategy.DestroyNodeStrategy;
import org.jclouds.compute.strategy.GetNodeMetadataStrategy; import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
import org.jclouds.rackspace.cloudservers.CloudServersClient; import org.jclouds.cloudservers.CloudServersClient;
/** /**
* @author Adrian Cole * @author Adrian Cole
@ -49,4 +49,4 @@ public class CloudServersDestroyNodeStrategy implements DestroyNodeStrategy {
return getNode.getNode(id); return getNode.getNode(id);
} }
} }

8
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersGetNodeMetadataStrategy.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersGetNodeMetadataStrategy.java
View File

@ -17,15 +17,15 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.strategy; package org.jclouds.cloudservers.compute.strategy;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.strategy.GetNodeMetadataStrategy; import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
import org.jclouds.rackspace.cloudservers.CloudServersClient; import org.jclouds.cloudservers.CloudServersClient;
import org.jclouds.rackspace.cloudservers.domain.Server; import org.jclouds.cloudservers.domain.Server;
import com.google.common.base.Function; import com.google.common.base.Function;
@ -51,4 +51,4 @@ public class CloudServersGetNodeMetadataStrategy implements GetNodeMetadataStrat
Server server = client.getServer(serverId); Server server = client.getServer(serverId);
return server == null ? null : serverToNodeMetadata.apply(server); return server == null ? null : serverToNodeMetadata.apply(server);
} }
} }

8
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersLifeCycleStrategy.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersLifeCycleStrategy.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.strategy; package org.jclouds.cloudservers.compute.strategy;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
@ -27,8 +27,8 @@ import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
import org.jclouds.compute.strategy.RebootNodeStrategy; import org.jclouds.compute.strategy.RebootNodeStrategy;
import org.jclouds.compute.strategy.ResumeNodeStrategy; import org.jclouds.compute.strategy.ResumeNodeStrategy;
import org.jclouds.compute.strategy.SuspendNodeStrategy; import org.jclouds.compute.strategy.SuspendNodeStrategy;
import org.jclouds.rackspace.cloudservers.CloudServersClient; import org.jclouds.cloudservers.CloudServersClient;
import org.jclouds.rackspace.cloudservers.domain.RebootType; import org.jclouds.cloudservers.domain.RebootType;
/** /**
* @author Adrian Cole * @author Adrian Cole
@ -62,4 +62,4 @@ public class CloudServersLifeCycleStrategy implements RebootNodeStrategy, Suspen
throw new UnsupportedOperationException("resume not supported"); throw new UnsupportedOperationException("resume not supported");
} }
} }

10
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/strategy/CloudServersListNodesStrategy.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersListNodesStrategy.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.strategy; package org.jclouds.cloudservers.compute.strategy;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
@ -26,9 +26,9 @@ import org.jclouds.compute.domain.ComputeMetadata;
import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.predicates.NodePredicates; import org.jclouds.compute.predicates.NodePredicates;
import org.jclouds.compute.strategy.ListNodesStrategy; import org.jclouds.compute.strategy.ListNodesStrategy;
import org.jclouds.rackspace.cloudservers.CloudServersClient; import org.jclouds.cloudservers.CloudServersClient;
import org.jclouds.rackspace.cloudservers.domain.Server; import org.jclouds.cloudservers.domain.Server;
import org.jclouds.rackspace.cloudservers.options.ListOptions; import org.jclouds.cloudservers.options.ListOptions;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
@ -59,4 +59,4 @@ public class CloudServersListNodesStrategy implements ListNodesStrategy {
return Iterables.filter(Iterables.transform(client.listServers(ListOptions.Builder.withDetails()), return Iterables.filter(Iterables.transform(client.listServers(ListOptions.Builder.withDetails()),
serverToNodeMetadata), filter); serverToNodeMetadata), filter);
} }
} }

10
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/suppliers/CloudServersHardwareSupplier.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/suppliers/CloudServersHardwareSupplier.java
View File

@ -17,9 +17,9 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.suppliers; package org.jclouds.cloudservers.compute.suppliers;
import static org.jclouds.rackspace.cloudservers.options.ListOptions.Builder.withDetails; import static org.jclouds.cloudservers.options.ListOptions.Builder.withDetails;
import java.util.Set; import java.util.Set;
@ -31,8 +31,8 @@ import javax.inject.Singleton;
import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.logging.Logger; import org.jclouds.logging.Logger;
import org.jclouds.rackspace.cloudservers.CloudServersClient; import org.jclouds.cloudservers.CloudServersClient;
import org.jclouds.rackspace.cloudservers.domain.Flavor; import org.jclouds.cloudservers.domain.Flavor;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
@ -65,4 +65,4 @@ public class CloudServersHardwareSupplier implements Supplier<Set<? extends Hard
logger.debug("<< hardware(%d)", hardware.size()); logger.debug("<< hardware(%d)", hardware.size());
return hardware; return hardware;
} }
} }

12
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/suppliers/CloudServersImageSupplier.java → apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/suppliers/CloudServersImageSupplier.java
View File

@ -17,9 +17,9 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.rackspace.cloudservers.compute.suppliers; package org.jclouds.cloudservers.compute.suppliers;
import static org.jclouds.rackspace.cloudservers.options.ListOptions.Builder.withDetails; import static org.jclouds.cloudservers.options.ListOptions.Builder.withDetails;
import java.util.Set; import java.util.Set;
@ -31,7 +31,7 @@ import javax.inject.Singleton;
import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.Image;
import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.logging.Logger; import org.jclouds.logging.Logger;
import org.jclouds.rackspace.cloudservers.CloudServersClient; import org.jclouds.cloudservers.CloudServersClient;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
@ -50,11 +50,11 @@ public class CloudServersImageSupplier implements Supplier<Set<? extends Image>>
protected Logger logger = Logger.NULL; protected Logger logger = Logger.NULL;
protected final CloudServersClient sync; protected final CloudServersClient sync;
protected final Function<org.jclouds.rackspace.cloudservers.domain.Image, Image> cloudServersImageToImage; protected final Function<org.jclouds.cloudservers.domain.Image, Image> cloudServersImageToImage;
@Inject @Inject
CloudServersImageSupplier(CloudServersClient sync, CloudServersImageSupplier(CloudServersClient sync,
Function<org.jclouds.rackspace.cloudservers.domain.Image, Image> cloudServersImageToImage) { Function<org.jclouds.cloudservers.domain.Image, Image> cloudServersImageToImage) {
this.sync = sync; this.sync = sync;
this.cloudServersImageToImage = cloudServersImageToImage; this.cloudServersImageToImage = cloudServersImageToImage;
} }
@ -68,4 +68,4 @@ public class CloudServersImageSupplier implements Supplier<Set<? extends Image>>
logger.debug("<< images(%d)", images.size()); logger.debug("<< images(%d)", images.size());
return images; return images;
} }
} }

Some files were not shown because too many files have changed in this diff Show More