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

moved classes into packages more aligned with existing conventions

This commit is contained in:
Adrian Cole 2010-09-01 08:59:33 -07:00
parent 90bab80b88
commit a788a98f70
11 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java
View File

@ -79,6 +79,7 @@ import org.jclouds.crypto.Crypto;
import org.jclouds.crypto.CryptoStreams; import org.jclouds.crypto.CryptoStreams;
import org.jclouds.date.DateService; import org.jclouds.date.DateService;
import org.jclouds.domain.Location; import org.jclouds.domain.Location;
import org.jclouds.filesystem.strategy.FilesystemStorageStrategy;
import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpCommand;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponse;
@ -99,7 +100,6 @@ import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.blobstore.ContainerNotFoundException; import org.jclouds.blobstore.ContainerNotFoundException;
import org.jclouds.blobstore.KeyNotFoundException; import org.jclouds.blobstore.KeyNotFoundException;
import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl; import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl;
import org.jclouds.filesystem.utils.FilesystemStorageStrategy;
import org.jclouds.io.Payload; import org.jclouds.io.Payload;
import org.jclouds.io.payloads.FilePayload; import org.jclouds.io.payloads.FilePayload;
import org.jclouds.logging.Logger; import org.jclouds.logging.Logger;

4
filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStore.java → filesystem/src/main/java/org/jclouds/filesystem/FilesystemBlobStore.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.filesystem.config; package org.jclouds.filesystem;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -28,5 +28,5 @@ import org.jclouds.concurrent.Timeout;
* *
* @author Alfredo "Rainbowbreeze" Morresi * @author Alfredo "Rainbowbreeze" Morresi
*/ */
@Timeout(duration = 30, timeUnit = TimeUnit.SECONDS) interface FilesystemBlobStore extends BlobStore { @Timeout(duration = 30, timeUnit = TimeUnit.SECONDS) public interface FilesystemBlobStore extends BlobStore {
} }

7
filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStoreContextModule.java
View File

@ -39,9 +39,10 @@ import org.jclouds.blobstore.util.BlobUtils;
import org.jclouds.domain.Location; 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.filesystem.utils.FileSystemBlobUtilsImpl; import org.jclouds.filesystem.FilesystemBlobStore;
import org.jclouds.filesystem.utils.FilesystemStorageStrategy; import org.jclouds.filesystem.strategy.FilesystemStorageStrategy;
import org.jclouds.filesystem.utils.FilesystemStorageStrategyImpl; import org.jclouds.filesystem.strategy.internal.FilesystemStorageStrategyImpl;
import org.jclouds.filesystem.util.internal.FileSystemBlobUtilsImpl;
/** /**
* *

1
filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStoreModule.java
View File

@ -21,6 +21,7 @@ package org.jclouds.filesystem.config;
import org.jclouds.blobstore.AsyncBlobStore; import org.jclouds.blobstore.AsyncBlobStore;
import org.jclouds.filesystem.FilesystemAsyncBlobStore; import org.jclouds.filesystem.FilesystemAsyncBlobStore;
import org.jclouds.filesystem.FilesystemBlobStore;
import org.jclouds.rest.config.RestClientModule; import org.jclouds.rest.config.RestClientModule;
/** /**

2
filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemConstants.java → filesystem/src/main/java/org/jclouds/filesystem/reference/FilesystemConstants.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.filesystem.config; package org.jclouds.filesystem.reference;
/** /**
* Common constants used in filesystem provider * Common constants used in filesystem provider

2
filesystem/src/main/java/org/jclouds/filesystem/utils/FilesystemStorageStrategy.java → filesystem/src/main/java/org/jclouds/filesystem/strategy/FilesystemStorageStrategy.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.filesystem.utils; package org.jclouds.filesystem.strategy;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

6
filesystem/src/main/java/org/jclouds/filesystem/utils/FilesystemStorageStrategyImpl.java → filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.filesystem.utils; package org.jclouds.filesystem.strategy.internal;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Set; import java.util.Set;
@ -37,7 +37,9 @@ import java.io.File;
import javax.annotation.Resource; import javax.annotation.Resource;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.name.Named; import com.google.inject.name.Named;
import org.jclouds.filesystem.config.FilesystemConstants;
import org.jclouds.filesystem.reference.FilesystemConstants;
import org.jclouds.filesystem.strategy.FilesystemStorageStrategy;
import org.jclouds.logging.Logger; import org.jclouds.logging.Logger;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;

3
filesystem/src/main/java/org/jclouds/filesystem/utils/FileSystemBlobUtilsImpl.java → filesystem/src/main/java/org/jclouds/filesystem/util/internal/FileSystemBlobUtilsImpl.java
View File

@ -17,13 +17,14 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.filesystem.utils; package org.jclouds.filesystem.util.internal;
import com.google.inject.Inject; import com.google.inject.Inject;
import org.jclouds.blobstore.AsyncBlobStore; import org.jclouds.blobstore.AsyncBlobStore;
import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.options.ListContainerOptions; import org.jclouds.blobstore.options.ListContainerOptions;
import org.jclouds.blobstore.util.BlobUtils; import org.jclouds.blobstore.util.BlobUtils;
import org.jclouds.filesystem.strategy.FilesystemStorageStrategy;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;

2
filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java
View File

@ -19,8 +19,8 @@
package org.jclouds.filesystem; package org.jclouds.filesystem;
import org.jclouds.filesystem.reference.FilesystemConstants;
import org.jclouds.filesystem.utils.TestUtils; import org.jclouds.filesystem.utils.TestUtils;
import org.jclouds.filesystem.config.FilesystemConstants;
import com.google.inject.CreationException; import com.google.inject.CreationException;
import org.jclouds.blobstore.options.GetOptions; import org.jclouds.blobstore.options.GetOptions;
import java.util.Iterator; import java.util.Iterator;

3
filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java
View File

@ -30,7 +30,8 @@ import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.inject.Module; import com.google.inject.Module;
import org.jclouds.filesystem.config.FilesystemConstants;
import org.jclouds.filesystem.reference.FilesystemConstants;
import org.jclouds.filesystem.utils.TestUtils; import org.jclouds.filesystem.utils.TestUtils;
/** /**

5
filesystem/src/test/java/org/jclouds/filesystem/utils/FilesystemStorageStrategyImplTest.java → filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java
View File

@ -17,7 +17,7 @@
* ==================================================================== * ====================================================================
*/ */
package org.jclouds.filesystem.utils; package org.jclouds.filesystem.strategy.internal;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -33,6 +33,9 @@ import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import org.jclouds.blobstore.options.ListContainerOptions; import org.jclouds.blobstore.options.ListContainerOptions;
import org.jclouds.filesystem.strategy.FilesystemStorageStrategy;
import org.jclouds.filesystem.strategy.internal.FilesystemStorageStrategyImpl;
import org.jclouds.filesystem.utils.TestUtils;
import org.jclouds.io.payloads.FilePayload; import org.jclouds.io.payloads.FilePayload;
import org.testng.annotations.*; import org.testng.annotations.*;