Issue 131: reorganized package structure

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2409 3d8758e0-26b5-11de-8745-db77d3ebf521

atmos/src/main/java/org/jclouds/atmosonline/saas/binders/BindAtmosObjectToEntityAndMetadataToHeaders.java

@@ -29,9 +29,9 @@ import javax.inject.Inject;
 import javax.ws.rs.core.HttpHeaders;
 
 import org.jclouds.atmosonline.saas.domain.AtmosObject;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.Binder;
-import org.jclouds.util.EncryptionService;
 
 public class BindAtmosObjectToEntityAndMetadataToHeaders implements Binder {
    private final BindUserMetadataToHeaders metaBinder;

atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/AtmosAsyncBlobStore.java

@@ -52,9 +52,9 @@ import org.jclouds.blobstore.domain.Blob.Factory;
 import org.jclouds.blobstore.functions.BlobToHttpGetOptions;
 import org.jclouds.blobstore.strategy.ClearListStrategy;
 import org.jclouds.concurrent.FutureFunctionCallable;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.options.GetOptions;
 import org.jclouds.logging.Logger.LoggerFactory;
-import org.jclouds.util.EncryptionService;
 import org.jclouds.util.Utils;
 
 import com.google.common.base.Function;

atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/AtmosBlobStore.java

@@ -47,9 +47,9 @@ import org.jclouds.blobstore.domain.ResourceMetadata;
 import org.jclouds.blobstore.domain.Blob.Factory;
 import org.jclouds.blobstore.functions.BlobToHttpGetOptions;
 import org.jclouds.blobstore.strategy.ClearListStrategy;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.options.GetOptions;
 import org.jclouds.logging.Logger.LoggerFactory;
-import org.jclouds.util.EncryptionService;
 import org.jclouds.util.Utils;
 
 import com.google.common.base.Supplier;

atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/functions/ObjectToBlobMetadata.java

@@ -35,7 +35,7 @@ import org.jclouds.atmosonline.saas.functions.AtmosObjectName;
 import org.jclouds.blobstore.domain.MutableBlobMetadata;
 import org.jclouds.blobstore.domain.ResourceType;
 import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl;
-import org.jclouds.util.EncryptionService;
+import org.jclouds.encryption.EncryptionService;
 
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableSet;

atmos/src/main/java/org/jclouds/atmosonline/saas/config/AtmosStorageRestClientModule.java

@@ -39,6 +39,8 @@ import org.jclouds.atmosonline.saas.handlers.AtmosStorageClientErrorRetryHandler
 import org.jclouds.atmosonline.saas.handlers.ParseAtmosStorageErrorFromXmlContent;
 import org.jclouds.concurrent.ExpirableSupplier;
 import org.jclouds.concurrent.internal.SyncProxy;
+import org.jclouds.date.DateService;
+import org.jclouds.date.TimeStamp;
 import org.jclouds.http.HttpErrorHandler;
 import org.jclouds.http.HttpRetryHandler;
 import org.jclouds.http.RequiresHttp;
@@ -47,8 +49,6 @@ import org.jclouds.http.annotation.Redirection;
 import org.jclouds.http.annotation.ServerError;
 import org.jclouds.rest.ConfiguresRestClient;
 import org.jclouds.rest.RestClientFactory;
-import org.jclouds.util.DateService;
-import org.jclouds.util.TimeStamp;
 
 import com.google.common.base.Supplier;
 import com.google.inject.AbstractModule;

atmos/src/main/java/org/jclouds/atmosonline/saas/filters/SignRequest.java

@@ -38,6 +38,8 @@ import javax.ws.rs.core.HttpHeaders;
 import org.apache.commons.io.IOUtils;
 import org.jclouds.atmosonline.saas.reference.AtmosStorageConstants;
 import org.jclouds.atmosonline.saas.reference.AtmosStorageHeaders;
+import org.jclouds.date.TimeStamp;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpConstants;
 import org.jclouds.http.HttpException;
 import org.jclouds.http.HttpRequest;
@@ -45,8 +47,6 @@ import org.jclouds.http.HttpRequestFilter;
 import org.jclouds.http.HttpUtils;
 import org.jclouds.http.internal.SignatureWire;
 import org.jclouds.logging.Logger;
-import org.jclouds.util.EncryptionService;
-import org.jclouds.util.TimeStamp;
 
 import com.google.common.annotations.VisibleForTesting;
 

atmos/src/main/java/org/jclouds/atmosonline/saas/functions/ParseSystemMetadataFromHeaders.java

@@ -33,8 +33,8 @@ import javax.inject.Singleton;
 import org.jclouds.atmosonline.saas.domain.FileType;
 import org.jclouds.atmosonline.saas.domain.SystemMetadata;
 import org.jclouds.atmosonline.saas.reference.AtmosStorageHeaders;
+import org.jclouds.date.DateService;
 import org.jclouds.http.HttpResponse;
-import org.jclouds.util.DateService;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Maps;

atmos/src/test/java/org/jclouds/atmosonline/saas/AtmosStorageClientTest.java

@@ -46,6 +46,8 @@ import org.jclouds.blobstore.binders.BindBlobToMultipartFormTest;
 import org.jclouds.blobstore.config.BlobStoreObjectModule;
 import org.jclouds.blobstore.functions.ReturnVoidOnNotFoundOr404;
 import org.jclouds.blobstore.functions.ThrowKeyNotFoundOn404;
+import org.jclouds.date.TimeStamp;
+import org.jclouds.encryption.internal.Base64;
 import org.jclouds.http.functions.ParseURIFromListOrLocationHeaderIf20x;
 import org.jclouds.http.functions.ReturnVoidIf2xx;
 import org.jclouds.http.options.GetOptions;
@@ -55,8 +57,6 @@ import org.jclouds.rest.RestClientTest;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
 import org.jclouds.rest.internal.RestAnnotationProcessor;
 import org.jclouds.util.Jsr330;
-import org.jclouds.util.TimeStamp;
-import org.jclouds.util.internal.Base64;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 

atmos/src/test/java/org/jclouds/atmosonline/saas/config/AtmosStorageRestClientModuleTest.java

@@ -32,12 +32,12 @@ import org.jclouds.atmosonline.saas.handlers.ParseAtmosStorageErrorFromXmlConten
 import org.jclouds.atmosonline.saas.reference.AtmosStorageConstants;
 import org.jclouds.concurrent.WithinThreadExecutorService;
 import org.jclouds.concurrent.config.ExecutorServiceModule;
+import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.jclouds.http.functions.config.ParserModule;
 import org.jclouds.http.handlers.DelegatingErrorHandler;
 import org.jclouds.http.handlers.DelegatingRetryHandler;
 import org.jclouds.http.handlers.RedirectionRetryHandler;
 import org.jclouds.util.Jsr330;
-import org.jclouds.util.internal.SimpleDateFormatDateService;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Supplier;

atmos/src/test/java/org/jclouds/atmosonline/saas/filters/SignRequestTest.java

@@ -37,9 +37,9 @@ import org.jclouds.atmosonline.saas.reference.AtmosStorageConstants;
 import org.jclouds.atmosonline.saas.reference.AtmosStorageHeaders;
 import org.jclouds.concurrent.WithinThreadExecutorService;
 import org.jclouds.concurrent.config.ExecutorServiceModule;
+import org.jclouds.date.TimeStamp;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.util.Jsr330;
-import org.jclouds.util.TimeStamp;
 import org.jclouds.util.Utils;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;

atmos/src/test/java/org/jclouds/atmosonline/saas/functions/ParseSystemMetadataFromHeadersTest.java

@@ -27,8 +27,8 @@ import static org.testng.Assert.assertEquals;
 
 import org.jclouds.atmosonline.saas.domain.FileType;
 import org.jclouds.atmosonline.saas.domain.SystemMetadata;
+import org.jclouds.date.DateService;
 import org.jclouds.http.HttpResponse;
-import org.jclouds.util.DateService;
 import org.testng.annotations.Test;
 
 import com.google.inject.Guice;

aws/core/src/main/java/org/jclouds/aws/ec2/config/EC2RestClientModule.java

@@ -39,6 +39,8 @@ import org.jclouds.aws.handlers.AWSRedirectionRetryHandler;
 import org.jclouds.aws.handlers.ParseAWSErrorFromXmlContent;
 import org.jclouds.aws.util.RequestSigner;
 import org.jclouds.concurrent.internal.SyncProxy;
+import org.jclouds.date.DateService;
+import org.jclouds.date.TimeStamp;
 import org.jclouds.http.HttpErrorHandler;
 import org.jclouds.http.HttpRetryHandler;
 import org.jclouds.http.RequiresHttp;
@@ -47,8 +49,6 @@ import org.jclouds.http.annotation.Redirection;
 import org.jclouds.http.annotation.ServerError;
 import org.jclouds.rest.ConfiguresRestClient;
 import org.jclouds.rest.RestClientFactory;
-import org.jclouds.util.DateService;
-import org.jclouds.util.TimeStamp;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;

aws/core/src/main/java/org/jclouds/aws/ec2/filters/FormSigner.java

@@ -48,6 +48,8 @@ import javax.ws.rs.core.HttpHeaders;
 import org.apache.commons.io.IOUtils;
 import org.jclouds.aws.reference.AWSConstants;
 import org.jclouds.aws.util.RequestSigner;
+import org.jclouds.date.TimeStamp;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpConstants;
 import org.jclouds.http.HttpException;
 import org.jclouds.http.HttpRequest;
@@ -57,8 +59,6 @@ import org.jclouds.http.internal.SignatureWire;
 import org.jclouds.logging.Logger;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
 import org.jclouds.rest.internal.RestAnnotationProcessor;
-import org.jclouds.util.EncryptionService;
-import org.jclouds.util.TimeStamp;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;

aws/core/src/main/java/org/jclouds/aws/ec2/xml/BaseReservationHandler.java

@@ -35,9 +35,9 @@ import org.jclouds.aws.ec2.domain.InstanceState;
 import org.jclouds.aws.ec2.domain.InstanceType;
 import org.jclouds.aws.ec2.domain.Reservation;
 import org.jclouds.aws.ec2.domain.RunningInstance;
+import org.jclouds.date.DateService;
 import org.jclouds.http.functions.ParseSax.HandlerWithResult;
 import org.jclouds.logging.Logger;
-import org.jclouds.util.DateService;
 import org.xml.sax.Attributes;
 
 import com.google.common.collect.Sets;

aws/core/src/main/java/org/jclouds/aws/ec2/xml/DescribeInstancesResponseHandler.java

@@ -28,7 +28,7 @@ import java.util.SortedSet;
 import javax.inject.Inject;
 
 import org.jclouds.aws.ec2.domain.Reservation;
-import org.jclouds.util.DateService;
+import org.jclouds.date.DateService;
 
 import com.google.common.collect.Sets;
 

aws/core/src/main/java/org/jclouds/aws/ec2/xml/RunInstancesResponseHandler.java

@@ -26,7 +26,7 @@ package org.jclouds.aws.ec2.xml;
 import javax.inject.Inject;
 
 import org.jclouds.aws.ec2.domain.Reservation;
-import org.jclouds.util.DateService;
+import org.jclouds.date.DateService;
 
 /**
  * Parses the following XML document:

aws/core/src/main/java/org/jclouds/aws/s3/config/S3RestClientModule.java

@@ -40,6 +40,8 @@ import org.jclouds.aws.s3.reference.S3Constants;
 import org.jclouds.aws.util.RequestSigner;
 import org.jclouds.concurrent.ExpirableSupplier;
 import org.jclouds.concurrent.internal.SyncProxy;
+import org.jclouds.date.DateService;
+import org.jclouds.date.TimeStamp;
 import org.jclouds.http.HttpErrorHandler;
 import org.jclouds.http.HttpRetryHandler;
 import org.jclouds.http.RequiresHttp;
@@ -48,8 +50,6 @@ import org.jclouds.http.annotation.Redirection;
 import org.jclouds.http.annotation.ServerError;
 import org.jclouds.rest.ConfiguresRestClient;
 import org.jclouds.rest.RestClientFactory;
-import org.jclouds.util.DateService;
-import org.jclouds.util.TimeStamp;
 
 import com.google.common.base.Supplier;
 import com.google.inject.AbstractModule;

aws/core/src/main/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignature.java

@@ -40,6 +40,8 @@ import javax.ws.rs.core.HttpHeaders;
 import org.apache.commons.io.IOUtils;
 import org.jclouds.aws.s3.reference.S3Constants;
 import org.jclouds.aws.util.RequestSigner;
+import org.jclouds.date.TimeStamp;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpConstants;
 import org.jclouds.http.HttpException;
 import org.jclouds.http.HttpRequest;
@@ -47,8 +49,6 @@ import org.jclouds.http.HttpRequestFilter;
 import org.jclouds.http.HttpUtils;
 import org.jclouds.http.internal.SignatureWire;
 import org.jclouds.logging.Logger;
-import org.jclouds.util.EncryptionService;
-import org.jclouds.util.TimeStamp;
 
 import com.google.common.annotations.VisibleForTesting;
 

aws/core/src/main/java/org/jclouds/aws/s3/functions/ParseObjectMetadataFromHeaders.java

@@ -31,10 +31,10 @@ import org.jclouds.aws.s3.domain.MutableObjectMetadata;
 import org.jclouds.aws.s3.reference.S3Headers;
 import org.jclouds.blobstore.domain.BlobMetadata;
 import org.jclouds.blobstore.functions.ParseSystemAndUserMetadataFromHeaders;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.rest.InvocationContext;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.jclouds.util.EncryptionService;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;

aws/core/src/main/java/org/jclouds/aws/s3/options/CopyObjectOptions.java

@@ -36,9 +36,9 @@ import javax.inject.Named;
 
 import org.jclouds.aws.s3.domain.CannedAccessPolicy;
 import org.jclouds.aws.s3.reference.S3Headers;
+import org.jclouds.date.DateService;
+import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.jclouds.http.options.BaseHttpRequestOptions;
-import org.jclouds.util.DateService;
-import org.jclouds.util.internal.SimpleDateFormatDateService;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.LinkedHashMultimap;

aws/core/src/main/java/org/jclouds/aws/s3/xml/CopyObjectHandler.java

@@ -29,8 +29,8 @@ import javax.inject.Inject;
 
 import org.jclouds.aws.s3.domain.ObjectMetadata;
 import org.jclouds.aws.s3.domain.internal.CopyObjectResult;
+import org.jclouds.date.DateService;
 import org.jclouds.http.functions.ParseSax;
-import org.jclouds.util.DateService;
 
 /**
  * Parses the response from Amazon S3 COPY Object command.

aws/core/src/main/java/org/jclouds/aws/s3/xml/ListAllMyBucketsHandler.java

@@ -30,8 +30,8 @@ import javax.inject.Inject;
 
 import org.jclouds.aws.s3.domain.BucketMetadata;
 import org.jclouds.aws.s3.domain.CanonicalUser;
+import org.jclouds.date.DateService;
 import org.jclouds.http.functions.ParseSax;
-import org.jclouds.util.DateService;
 
 import com.google.common.collect.Sets;
 

aws/core/src/main/java/org/jclouds/aws/s3/xml/ListBucketHandler.java

@@ -34,9 +34,9 @@ import org.jclouds.aws.s3.domain.ObjectMetadata;
 import org.jclouds.aws.s3.domain.ObjectMetadata.StorageClass;
 import org.jclouds.aws.s3.domain.internal.BucketListObjectMetadata;
 import org.jclouds.aws.s3.domain.internal.TreeSetListBucketResponse;
+import org.jclouds.date.DateService;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.functions.ParseSax;
-import org.jclouds.util.DateService;
-import org.jclouds.util.EncryptionService;
 import org.xml.sax.Attributes;
 
 import com.google.common.collect.Sets;

aws/core/src/test/java/org/jclouds/aws/ec2/EC2ClientTest.java

@@ -49,6 +49,7 @@ import org.jclouds.aws.ec2.xml.KeyPairResponseHandler;
 import org.jclouds.aws.ec2.xml.RunInstancesResponseHandler;
 import org.jclouds.aws.ec2.xml.TerminateInstancesResponseHandler;
 import org.jclouds.aws.reference.AWSConstants;
+import org.jclouds.date.TimeStamp;
 import org.jclouds.http.functions.ParseSax;
 import org.jclouds.http.functions.ReturnStringIf200;
 import org.jclouds.http.functions.ReturnVoidIf2xx;
@@ -58,7 +59,6 @@ import org.jclouds.rest.RestClientTest;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
 import org.jclouds.rest.internal.RestAnnotationProcessor;
 import org.jclouds.util.Jsr330;
-import org.jclouds.util.TimeStamp;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 

aws/core/src/test/java/org/jclouds/aws/ec2/xml/DescribeInstancesResponseHandlerTest.java

@@ -34,8 +34,8 @@ import org.jclouds.aws.ec2.domain.InstanceState;
 import org.jclouds.aws.ec2.domain.InstanceType;
 import org.jclouds.aws.ec2.domain.Reservation;
 import org.jclouds.aws.ec2.domain.RunningInstance;
+import org.jclouds.date.DateService;
 import org.jclouds.http.functions.BaseHandlerTest;
-import org.jclouds.util.DateService;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 

aws/core/src/test/java/org/jclouds/aws/ec2/xml/RunInstancesResponseHandlerTest.java

@@ -32,8 +32,8 @@ import org.jclouds.aws.ec2.domain.InstanceState;
 import org.jclouds.aws.ec2.domain.InstanceType;
 import org.jclouds.aws.ec2.domain.Reservation;
 import org.jclouds.aws.ec2.domain.RunningInstance;
+import org.jclouds.date.DateService;
 import org.jclouds.http.functions.BaseHandlerTest;
-import org.jclouds.util.DateService;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 

aws/core/src/test/java/org/jclouds/aws/ec2/xml/TerminateInstancesResponseHandlerTest.java

@@ -30,8 +30,8 @@ import java.util.SortedSet;
 
 import org.jclouds.aws.ec2.domain.InstanceState;
 import org.jclouds.aws.ec2.domain.TerminatedInstance;
+import org.jclouds.date.DateService;
 import org.jclouds.http.functions.BaseHandlerTest;
-import org.jclouds.util.DateService;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 

aws/core/src/test/java/org/jclouds/aws/s3/S3ClientTest.java

@@ -55,6 +55,7 @@ import org.jclouds.blobstore.functions.ReturnVoidOnNotFoundOr404;
 import org.jclouds.blobstore.functions.ThrowContainerNotFoundOn404;
 import org.jclouds.blobstore.functions.ThrowKeyNotFoundOn404;
 import org.jclouds.blobstore.reference.BlobStoreConstants;
+import org.jclouds.date.TimeStamp;
 import org.jclouds.http.functions.ParseETagHeader;
 import org.jclouds.http.functions.ParseSax;
 import org.jclouds.http.functions.ReturnFalseOn404;
@@ -67,7 +68,6 @@ import org.jclouds.rest.RestClientTest;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
 import org.jclouds.rest.internal.RestAnnotationProcessor;
 import org.jclouds.util.Jsr330;
-import org.jclouds.util.TimeStamp;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 

aws/core/src/test/java/org/jclouds/aws/s3/config/S3RestClientModuleTest.java

@@ -32,11 +32,11 @@ import org.jclouds.aws.handlers.ParseAWSErrorFromXmlContent;
 import org.jclouds.aws.s3.reference.S3Constants;
 import org.jclouds.concurrent.WithinThreadExecutorService;
 import org.jclouds.concurrent.config.ExecutorServiceModule;
+import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.jclouds.http.functions.config.ParserModule;
 import org.jclouds.http.handlers.DelegatingErrorHandler;
 import org.jclouds.http.handlers.DelegatingRetryHandler;
 import org.jclouds.util.Jsr330;
-import org.jclouds.util.internal.SimpleDateFormatDateService;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Supplier;

aws/core/src/test/java/org/jclouds/aws/s3/functions/ParseObjectMetadataFromHeadersTest.java

@@ -41,9 +41,9 @@ import org.jclouds.aws.s3.reference.S3Headers;
 import org.jclouds.blobstore.domain.MutableBlobMetadata;
 import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl;
 import org.jclouds.blobstore.functions.ParseSystemAndUserMetadataFromHeaders;
+import org.jclouds.encryption.EncryptionService;
+import org.jclouds.encryption.internal.JCEEncryptionService;
 import org.jclouds.http.HttpResponse;
-import org.jclouds.util.EncryptionService;
-import org.jclouds.util.internal.JCEEncryptionService;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 

aws/core/src/test/java/org/jclouds/aws/s3/internal/StubS3AsyncClient.java

@@ -66,9 +66,9 @@ import org.jclouds.blobstore.integration.internal.StubAsyncBlobStore;
 import org.jclouds.blobstore.integration.internal.StubAsyncBlobStore.FutureBase;
 import org.jclouds.blobstore.options.ListContainerOptions;
 import org.jclouds.concurrent.FutureFunctionWrapper;
+import org.jclouds.date.DateService;
 import org.jclouds.http.options.GetOptions;
 import org.jclouds.logging.Logger.LoggerFactory;
-import org.jclouds.util.DateService;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;

aws/core/src/test/java/org/jclouds/aws/s3/options/CopyObjectOptionsTest.java

@@ -39,7 +39,7 @@ import java.util.Map;
 
 import org.jclouds.aws.s3.domain.CannedAccessPolicy;
 import org.jclouds.aws.s3.reference.S3Headers;
-import org.jclouds.util.internal.SimpleDateFormatDateService;
+import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

aws/core/src/test/java/org/jclouds/aws/s3/xml/CopyObjectHandlerTest.java

@@ -29,9 +29,9 @@ import java.io.InputStream;
 
 import org.jclouds.aws.s3.domain.ObjectMetadata;
 import org.jclouds.aws.s3.domain.internal.CopyObjectResult;
+import org.jclouds.date.DateService;
+import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.jclouds.http.functions.BaseHandlerTest;
-import org.jclouds.util.DateService;
-import org.jclouds.util.internal.SimpleDateFormatDateService;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 

aws/core/src/test/java/org/jclouds/aws/s3/xml/ListBucketHandlerTest.java

@@ -35,12 +35,12 @@ import org.jclouds.aws.s3.domain.ObjectMetadata;
 import org.jclouds.aws.s3.domain.ObjectMetadata.StorageClass;
 import org.jclouds.aws.s3.domain.internal.BucketListObjectMetadata;
 import org.jclouds.aws.s3.domain.internal.TreeSetListBucketResponse;
+import org.jclouds.date.DateService;
+import org.jclouds.encryption.EncryptionService;
+import org.jclouds.encryption.internal.JCEEncryptionService;
 import org.jclouds.http.HttpException;
 import org.jclouds.http.functions.BaseHandlerTest;
 import org.jclouds.http.functions.ParseSax;
-import org.jclouds.util.DateService;
-import org.jclouds.util.EncryptionService;
-import org.jclouds.util.internal.JCEEncryptionService;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 

aws/core/src/test/java/org/jclouds/aws/s3/xml/S3ParserTest.java

@@ -41,10 +41,10 @@ import org.jclouds.aws.s3.domain.CanonicalUser;
 import org.jclouds.aws.s3.domain.ListBucketResponse;
 import org.jclouds.aws.s3.domain.ObjectMetadata;
 import org.jclouds.aws.s3.domain.ObjectMetadata.StorageClass;
+import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.jclouds.http.HttpException;
 import org.jclouds.http.functions.ParseSax;
 import org.jclouds.http.functions.config.ParserModule;
-import org.jclouds.util.internal.SimpleDateFormatDateService;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;

aws/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/Util.java

@@ -44,9 +44,9 @@ import org.jclouds.aws.s3.domain.ObjectMetadata.StorageClass;
 import org.jclouds.aws.s3.options.CopyObjectOptions;
 import org.jclouds.aws.s3.options.ListBucketOptions;
 import org.jclouds.aws.s3.options.PutObjectOptions;
+import org.jclouds.date.DateService;
+import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.jclouds.http.options.GetOptions;
-import org.jclouds.util.DateService;
-import org.jclouds.util.internal.SimpleDateFormatDateService;
 import org.jets3t.service.S3ServiceException;
 import org.jets3t.service.acl.AccessControlList;
 import org.jets3t.service.acl.CanonicalGrantee;

aws/perftest/src/test/java/com/amazon/s3/DateServiceTest.java

@@ -35,7 +35,7 @@ import org.testng.annotations.Test;
  * @author James Murty
  */
 @Test(sequential = true, timeOut = 2 * 60 * 1000, testName = "s3.DateTest")
-public class DateServiceTest extends org.jclouds.util.DateServiceTest {
+public class DateServiceTest extends org.jclouds.date.DateServiceTest {
 
    @Test
    void testAmazonParseDateSerialResponseTime() {

aws/perftest/src/test/java/com/amazon/s3/S3ParserTest.java

@@ -34,7 +34,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorCompletionService;
 
 import org.apache.commons.io.IOUtils;
-import org.jclouds.util.internal.SimpleDateFormatDateService;
+import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.testng.annotations.Test;
 
 /**

azure/src/main/java/org/jclouds/azure/storage/blob/binders/BindAzureBlobToEntity.java

@@ -34,8 +34,8 @@ import org.jclouds.azure.storage.blob.blobstore.functions.AzureBlobToBlob;
 import org.jclouds.azure.storage.blob.domain.AzureBlob;
 import org.jclouds.azure.storage.blob.reference.AzureBlobConstants;
 import org.jclouds.blobstore.binders.BindBlobToEntityAndUserMetadataToHeadersWithPrefix;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpRequest;
-import org.jclouds.util.EncryptionService;
 
 public class BindAzureBlobToEntity extends BindBlobToEntityAndUserMetadataToHeadersWithPrefix {
 

azure/src/main/java/org/jclouds/azure/storage/blob/functions/ParseContainerPropertiesFromHeaders.java

@@ -33,11 +33,11 @@ import org.jclouds.azure.storage.blob.domain.ContainerProperties;
 import org.jclouds.azure.storage.blob.domain.MutableContainerPropertiesWithMetadata;
 import org.jclouds.azure.storage.blob.domain.internal.MutableContainerPropertiesWithMetadataImpl;
 import org.jclouds.azure.storage.blob.reference.AzureBlobConstants;
+import org.jclouds.date.DateService;
 import org.jclouds.http.HttpException;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.rest.InvocationContext;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.jclouds.util.DateService;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;

azure/src/main/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandler.java

@@ -33,8 +33,8 @@ import org.jclouds.azure.storage.blob.domain.ListableContainerProperties;
 import org.jclouds.azure.storage.blob.domain.internal.ListableContainerPropertiesImpl;
 import org.jclouds.azure.storage.domain.BoundedSortedSet;
 import org.jclouds.azure.storage.domain.internal.BoundedTreeSet;
+import org.jclouds.date.DateService;
 import org.jclouds.http.functions.ParseSax;
-import org.jclouds.util.DateService;
 
 import com.google.common.collect.Sets;
 

azure/src/main/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandler.java

@@ -33,9 +33,9 @@ import org.jclouds.azure.storage.blob.domain.ListBlobsResponse;
 import org.jclouds.azure.storage.blob.domain.ListableBlobProperties;
 import org.jclouds.azure.storage.blob.domain.internal.ListableBlobPropertiesImpl;
 import org.jclouds.azure.storage.blob.domain.internal.TreeSetListBlobsResponse;
+import org.jclouds.date.DateService;
 import org.jclouds.http.HttpUtils;
 import org.jclouds.http.functions.ParseSax;
-import org.jclouds.util.DateService;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 

azure/src/main/java/org/jclouds/azure/storage/config/AzureStorageRestClientModule.java

@@ -31,14 +31,14 @@ import javax.inject.Named;
 
 import org.jclouds.azure.storage.handlers.ParseAzureStorageErrorFromXmlContent;
 import org.jclouds.concurrent.ExpirableSupplier;
+import org.jclouds.date.DateService;
+import org.jclouds.date.TimeStamp;
 import org.jclouds.http.HttpErrorHandler;
 import org.jclouds.http.RequiresHttp;
 import org.jclouds.http.annotation.ClientError;
 import org.jclouds.http.annotation.Redirection;
 import org.jclouds.http.annotation.ServerError;
 import org.jclouds.rest.ConfiguresRestClient;
-import org.jclouds.util.DateService;
-import org.jclouds.util.TimeStamp;
 
 import com.google.common.base.Supplier;
 import com.google.inject.AbstractModule;

azure/src/main/java/org/jclouds/azure/storage/filters/SharedKeyAuthentication.java

@@ -37,6 +37,8 @@ import javax.ws.rs.core.HttpHeaders;
 
 import org.apache.commons.io.IOUtils;
 import org.jclouds.azure.storage.reference.AzureStorageConstants;
+import org.jclouds.date.TimeStamp;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpConstants;
 import org.jclouds.http.HttpException;
 import org.jclouds.http.HttpRequest;
@@ -44,8 +46,6 @@ import org.jclouds.http.HttpRequestFilter;
 import org.jclouds.http.HttpUtils;
 import org.jclouds.http.internal.SignatureWire;
 import org.jclouds.logging.Logger;
-import org.jclouds.util.EncryptionService;
-import org.jclouds.util.TimeStamp;
 
 import com.google.common.annotations.VisibleForTesting;
 

azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientLiveTest.java

@@ -43,12 +43,12 @@ import org.jclouds.azure.storage.blob.domain.ListableContainerProperties;
 import org.jclouds.azure.storage.blob.options.CreateContainerOptions;
 import org.jclouds.azure.storage.domain.BoundedSortedSet;
 import org.jclouds.azure.storage.options.ListOptions;
+import org.jclouds.encryption.EncryptionService;
+import org.jclouds.encryption.internal.JCEEncryptionService;
 import org.jclouds.http.HttpResponseException;
 import org.jclouds.http.options.GetOptions;
 import org.jclouds.logging.log4j.config.Log4JLoggingModule;
-import org.jclouds.util.EncryptionService;
 import org.jclouds.util.Utils;
-import org.jclouds.util.internal.JCEEncryptionService;
 import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.Test;
 

azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientTest.java

@@ -49,6 +49,7 @@ import org.jclouds.blobstore.functions.ReturnVoidOnNotFoundOr404;
 import org.jclouds.blobstore.reference.BlobStoreConstants;
 import org.jclouds.concurrent.WithinThreadExecutorService;
 import org.jclouds.concurrent.config.ExecutorServiceModule;
+import org.jclouds.encryption.internal.Base64;
 import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
 import org.jclouds.http.functions.ParseSax;
 import org.jclouds.http.functions.ReturnTrueIf2xx;
@@ -60,7 +61,6 @@ import org.jclouds.rest.config.RestModule;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
 import org.jclouds.rest.internal.RestAnnotationProcessor;
 import org.jclouds.util.Jsr330;
-import org.jclouds.util.internal.Base64;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 

azure/src/test/java/org/jclouds/azure/storage/blob/config/RestAzureBlobClientModuleTest.java

@@ -31,12 +31,12 @@ import org.jclouds.azure.storage.handlers.ParseAzureStorageErrorFromXmlContent;
 import org.jclouds.azure.storage.reference.AzureStorageConstants;
 import org.jclouds.concurrent.WithinThreadExecutorService;
 import org.jclouds.concurrent.config.ExecutorServiceModule;
+import org.jclouds.encryption.internal.Base64;
 import org.jclouds.http.functions.config.ParserModule;
 import org.jclouds.http.handlers.DelegatingErrorHandler;
 import org.jclouds.http.handlers.DelegatingRetryHandler;
 import org.jclouds.http.handlers.RedirectionRetryHandler;
 import org.jclouds.util.Jsr330;
-import org.jclouds.util.internal.Base64;
 import org.testng.annotations.Test;
 
 import com.google.inject.AbstractModule;

azure/src/test/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandlerTest.java

@@ -33,8 +33,8 @@ import org.jclouds.azure.storage.blob.domain.ListableContainerProperties;
 import org.jclouds.azure.storage.blob.domain.internal.ListableContainerPropertiesImpl;
 import org.jclouds.azure.storage.domain.BoundedSortedSet;
 import org.jclouds.azure.storage.domain.internal.BoundedTreeSet;
+import org.jclouds.date.DateService;
 import org.jclouds.http.functions.BaseHandlerTest;
-import org.jclouds.util.DateService;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 

azure/src/test/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandlerTest.java

@@ -33,8 +33,8 @@ import org.jclouds.azure.storage.blob.domain.ListBlobsResponse;
 import org.jclouds.azure.storage.blob.domain.ListableBlobProperties;
 import org.jclouds.azure.storage.blob.domain.internal.ListableBlobPropertiesImpl;
 import org.jclouds.azure.storage.blob.domain.internal.TreeSetListBlobsResponse;
+import org.jclouds.date.DateService;
 import org.jclouds.http.functions.BaseHandlerTest;
-import org.jclouds.util.DateService;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 

azure/src/test/java/org/jclouds/azure/storage/config/AzureStorageRestClientModuleTest.java

@@ -32,13 +32,13 @@ import static org.testng.Assert.assertFalse;
 import org.jclouds.azure.storage.handlers.ParseAzureStorageErrorFromXmlContent;
 import org.jclouds.concurrent.WithinThreadExecutorService;
 import org.jclouds.concurrent.config.ExecutorServiceModule;
+import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.jclouds.http.HttpRetryHandler;
 import org.jclouds.http.functions.config.ParserModule;
 import org.jclouds.http.handlers.DelegatingErrorHandler;
 import org.jclouds.http.handlers.DelegatingRetryHandler;
 import org.jclouds.http.handlers.RedirectionRetryHandler;
 import org.jclouds.util.Jsr330;
-import org.jclouds.util.internal.SimpleDateFormatDateService;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Supplier;

azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationTest.java

@@ -35,10 +35,10 @@ import org.jclouds.azure.storage.config.AzureStorageRestClientModule;
 import org.jclouds.azure.storage.reference.AzureStorageConstants;
 import org.jclouds.concurrent.WithinThreadExecutorService;
 import org.jclouds.concurrent.config.ExecutorServiceModule;
+import org.jclouds.encryption.internal.Base64;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.functions.config.ParserModule;
 import org.jclouds.util.Jsr330;
-import org.jclouds.util.internal.Base64;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;

azure/src/test/java/org/jclouds/azure/storage/queue/AzureQueueClientTest.java

@@ -40,6 +40,7 @@ import org.jclouds.azure.storage.options.ListOptions;
 import org.jclouds.azure.storage.reference.AzureStorageConstants;
 import org.jclouds.concurrent.WithinThreadExecutorService;
 import org.jclouds.concurrent.config.ExecutorServiceModule;
+import org.jclouds.encryption.internal.Base64;
 import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
 import org.jclouds.http.functions.ParseSax;
 import org.jclouds.http.functions.ReturnTrueIf2xx;
@@ -49,7 +50,6 @@ import org.jclouds.rest.config.RestModule;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
 import org.jclouds.rest.internal.RestAnnotationProcessor;
 import org.jclouds.util.Jsr330;
-import org.jclouds.util.internal.Base64;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 

blobstore/src/main/java/org/jclouds/blobstore/binders/BindBlobToEntity.java

@@ -29,9 +29,9 @@ import javax.inject.Inject;
 import javax.ws.rs.core.HttpHeaders;
 
 import org.jclouds.blobstore.domain.Blob;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.Binder;
-import org.jclouds.util.EncryptionService;
 
 /**
  * 

blobstore/src/main/java/org/jclouds/blobstore/binders/BindBlobToEntityAndUserMetadataToHeadersWithPrefix.java

@@ -29,8 +29,8 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.jclouds.blobstore.domain.Blob;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpRequest;
-import org.jclouds.util.EncryptionService;
 
 /**
  * 

blobstore/src/main/java/org/jclouds/blobstore/functions/HttpGetOptionsListToGetOptions.java

@@ -28,7 +28,7 @@ import java.util.Date;
 import javax.inject.Inject;
 
 import org.jclouds.blobstore.options.GetOptions;
-import org.jclouds.util.DateService;
+import org.jclouds.date.DateService;
 
 import com.google.common.base.Function;
 

blobstore/src/main/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeaders.java

@@ -33,12 +33,12 @@ import javax.inject.Provider;
 import javax.ws.rs.core.HttpHeaders;
 
 import org.jclouds.blobstore.domain.MutableBlobMetadata;
+import org.jclouds.date.DateService;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpException;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.rest.InvocationContext;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.jclouds.util.DateService;
-import org.jclouds.util.EncryptionService;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;

blobstore/src/main/java/org/jclouds/blobstore/functions/impl/JCEGenerateMD5.java

@@ -26,8 +26,8 @@ package org.jclouds.blobstore.functions.impl;
 import javax.inject.Singleton;
 
 import org.jclouds.blobstore.functions.GenerateMD5;
-import org.jclouds.util.EncryptionService;
+import org.jclouds.encryption.EncryptionService;
-import org.jclouds.util.internal.JCEEncryptionService;
+import org.jclouds.encryption.internal.JCEEncryptionService;
 
 /**
  * 

blobstore/src/main/java/org/jclouds/blobstore/functions/impl/JCEGenerateMD5Result.java

@@ -29,8 +29,8 @@ import javax.inject.Singleton;
 
 import org.jclouds.blobstore.domain.MD5InputStreamResult;
 import org.jclouds.blobstore.functions.GenerateMD5Result;
-import org.jclouds.util.EncryptionService;
+import org.jclouds.encryption.EncryptionService;
-import org.jclouds.util.internal.JCEEncryptionService;
+import org.jclouds.encryption.internal.JCEEncryptionService;
 
 /**
  * 
@@ -41,7 +41,7 @@ public class JCEGenerateMD5Result implements GenerateMD5Result {
    private static final EncryptionService encryptionService = new JCEEncryptionService();
 
    public MD5InputStreamResult apply(InputStream toEncode) {
-      org.jclouds.util.EncryptionService.MD5InputStreamResult result = encryptionService
+      org.jclouds.encryption.EncryptionService.MD5InputStreamResult result = encryptionService
                .generateMD5Result(toEncode);
       return new MD5InputStreamResult(result.data, result.md5, result.length);
    }

blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobMetadataFromHeadersTest.java

@@ -37,11 +37,11 @@ import javax.ws.rs.core.MediaType;
 import org.jclouds.blobstore.domain.BlobMetadata;
 import org.jclouds.blobstore.domain.MutableBlobMetadata;
 import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl;
+import org.jclouds.date.internal.SimpleDateFormatDateService;
+import org.jclouds.encryption.internal.JCEEncryptionService;
 import org.jclouds.http.HttpException;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.jclouds.util.internal.JCEEncryptionService;
-import org.jclouds.util.internal.SimpleDateFormatDateService;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 

blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java

@@ -45,8 +45,8 @@ import org.jclouds.blobstore.domain.Blob;
 import org.jclouds.blobstore.domain.BlobMetadata;
 import org.jclouds.blobstore.domain.ResourceMetadata;
 import org.jclouds.blobstore.util.BlobStoreUtils;
+import org.jclouds.encryption.internal.JCEEncryptionService;
 import org.jclouds.http.HttpResponseException;
-import org.jclouds.util.internal.JCEEncryptionService;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 

blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobLiveTest.java

@@ -31,7 +31,7 @@ import java.net.URL;
 import java.net.URLConnection;
 
 import org.jclouds.blobstore.domain.Blob;
-import org.jclouds.util.internal.JCEEncryptionService;
+import org.jclouds.encryption.internal.JCEEncryptionService;
 import org.testng.annotations.Optional;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;

blobstore/src/test/java/org/jclouds/blobstore/integration/internal/StubAsyncBlobStore.java

@@ -78,13 +78,13 @@ import org.jclouds.blobstore.options.ListContainerOptions;
 import org.jclouds.blobstore.strategy.GetDirectoryStrategy;
 import org.jclouds.blobstore.strategy.IsDirectoryStrategy;
 import org.jclouds.blobstore.strategy.MkdirStrategy;
+import org.jclouds.date.DateService;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpCommand;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.HttpResponseException;
 import org.jclouds.http.options.HttpRequestOptions;
-import org.jclouds.util.DateService;
-import org.jclouds.util.EncryptionService;
 import org.jclouds.util.Utils;
 
 import com.google.common.base.Function;

core/src/main/java/org/jclouds/date/DateService.java

@@ -21,11 +21,11 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.util;
+package org.jclouds.date;
 
 import java.util.Date;
 
-import org.jclouds.util.internal.SimpleDateFormatDateService;
+import org.jclouds.date.internal.SimpleDateFormatDateService;
 
 import com.google.inject.ImplementedBy;
 

core/src/main/java/org/jclouds/date/TimeStamp.java

@@ -21,7 +21,7 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.util;
+package org.jclouds.date;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

core/src/main/java/org/jclouds/date/internal/SimpleDateFormatDateService.java

@@ -21,7 +21,7 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.util.internal;
+package org.jclouds.date.internal;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -32,7 +32,7 @@ import java.util.SimpleTimeZone;
 import net.jcip.annotations.GuardedBy;
 import net.jcip.annotations.ThreadSafe;
 
-import org.jclouds.util.DateService;
+import org.jclouds.date.DateService;
 
 /**
  * 

core/src/main/java/org/jclouds/encryption/EncryptionService.java

@@ -21,7 +21,7 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.util;
+package org.jclouds.encryption;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -33,7 +33,7 @@ import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 
-import org.jclouds.util.internal.JCEEncryptionService;
+import org.jclouds.encryption.internal.JCEEncryptionService;
 
 import com.google.inject.ImplementedBy;
 

core/src/main/java/org/jclouds/encryption/internal/Base64.java

@@ -5,7 +5,7 @@
 //  http://iharder.sourceforge.net/current/java/base64/
 //
 
-package org.jclouds.util.internal;
+package org.jclouds.encryption.internal;
 
 
 /**

core/src/main/java/org/jclouds/encryption/internal/BaseEncryptionService.java

@@ -1,4 +1,4 @@
-package org.jclouds.util.internal;
+package org.jclouds.encryption.internal;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -10,7 +10,7 @@ import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 
-import org.jclouds.util.EncryptionService;
+import org.jclouds.encryption.EncryptionService;
 
 /**
  * 

core/src/main/java/org/jclouds/encryption/internal/JCEEncryptionService.java

@@ -1,4 +1,4 @@
-package org.jclouds.util.internal;
+package org.jclouds.encryption.internal;
 
 import java.io.File;
 import java.io.FileInputStream;

core/src/main/java/org/jclouds/http/filters/BasicAuthentication.java

@@ -32,10 +32,10 @@ import java.util.List;
 import javax.inject.Singleton;
 import javax.ws.rs.core.HttpHeaders;
 
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpException;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.HttpRequestFilter;
-import org.jclouds.util.EncryptionService;
 
 /**
  * Uses Basic Authentication to sign the request.

core/src/main/java/org/jclouds/http/functions/ParseContentMD5FromHeaders.java

@@ -26,11 +26,11 @@ package org.jclouds.http.functions;
 import javax.annotation.Resource;
 
 import org.apache.commons.io.IOUtils;
+import org.jclouds.encryption.internal.Base64;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.logging.Logger;
 import org.jclouds.rest.InvocationContext;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.jclouds.util.internal.Base64;
 
 import com.google.common.base.Function;
 

core/src/main/java/org/jclouds/http/functions/config/ParserModule.java

@@ -35,9 +35,9 @@ import javax.inject.Singleton;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import org.jclouds.date.DateService;
 import org.jclouds.http.functions.ParseSax;
 import org.jclouds.http.functions.ParseSax.HandlerWithResult;
-import org.jclouds.util.DateService;
 import org.xml.sax.XMLReader;
 
 import com.google.common.collect.Sets;

core/src/main/java/org/jclouds/http/options/GetOptions.java

@@ -33,8 +33,8 @@ import java.util.List;
 
 import javax.ws.rs.core.HttpHeaders;
 
-import org.jclouds.util.DateService;
+import org.jclouds.date.DateService;
-import org.jclouds.util.internal.SimpleDateFormatDateService;
+import org.jclouds.date.internal.SimpleDateFormatDateService;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.Multimap;

core/src/test/java/org/jclouds/PerformanceTest.java

@@ -32,7 +32,7 @@ import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.jclouds.util.DateServiceTest;
+import org.jclouds.date.DateServiceTest;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;

core/src/test/java/org/jclouds/date/DateServiceTest.java

@@ -21,7 +21,7 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.util;
+package org.jclouds.date;
 
 import static org.testng.Assert.assertEquals;
 
@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 import org.jclouds.PerformanceTest;
+import org.jclouds.date.DateService;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 

core/src/test/java/org/jclouds/encryption/EncryptionServiceTest.java

@@ -21,7 +21,7 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.util;
+package org.jclouds.encryption;
 
 import static org.testng.Assert.assertEquals;
 
@@ -35,7 +35,8 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorCompletionService;
 
 import org.jclouds.PerformanceTest;
-import org.jclouds.util.internal.Base64;
+import org.jclouds.encryption.EncryptionService;
+import org.jclouds.encryption.internal.Base64;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;

core/src/test/java/org/jclouds/http/filters/BasicAuthenticationTest.java

@@ -30,8 +30,8 @@ import java.net.URI;
 
 import javax.ws.rs.core.HttpHeaders;
 
+import org.jclouds.encryption.internal.JCEEncryptionService;
 import org.jclouds.http.HttpRequest;
-import org.jclouds.util.internal.JCEEncryptionService;
 import org.testng.annotations.Test;
 
 /**

core/src/test/java/org/jclouds/http/internal/WireLiveTest.java

@@ -39,9 +39,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.IOUtils;
 import org.jclouds.concurrent.WithinThreadExecutorService;
+import org.jclouds.encryption.EncryptionService;
+import org.jclouds.encryption.internal.JCEEncryptionService;
 import org.jclouds.logging.Logger;
-import org.jclouds.util.EncryptionService;
-import org.jclouds.util.internal.JCEEncryptionService;
 import org.testng.annotations.Test;
 
 /**

core/src/test/java/org/jclouds/http/options/GetOptionsTest.java

@@ -36,7 +36,7 @@ import static org.testng.Assert.assertNull;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 
-import org.jclouds.util.internal.SimpleDateFormatDateService;
+import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 

core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java

@@ -63,6 +63,8 @@ import javax.ws.rs.core.MediaType;
 import org.apache.commons.io.IOUtils;
 import org.jclouds.concurrent.WithinThreadExecutorService;
 import org.jclouds.concurrent.config.ExecutorServiceModule;
+import org.jclouds.date.DateService;
+import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.jclouds.http.HttpException;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.HttpRequestFilter;
@@ -99,9 +101,7 @@ import org.jclouds.rest.binders.BindMapToMatrixParams;
 import org.jclouds.rest.binders.BindToJsonEntity;
 import org.jclouds.rest.binders.BindToStringEntity;
 import org.jclouds.rest.config.RestModule;
-import org.jclouds.util.DateService;
 import org.jclouds.util.Jsr330;
-import org.jclouds.util.internal.SimpleDateFormatDateService;
 import org.mortbay.jetty.HttpHeaders;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;

demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java

@@ -42,7 +42,7 @@ import org.jclouds.blobstore.BlobStoreContextBuilder;
 import org.jclouds.demo.tweetstore.controller.AddTweetsController;
 import org.jclouds.demo.tweetstore.controller.StoreTweetsController;
 import org.jclouds.gae.config.GaeHttpCommandExecutorServiceModule;
-import org.jclouds.twitter.TwitterAsyncClient;
+import org.jclouds.twitter.TwitterClient;
 import org.jclouds.twitter.TwitterContextFactory;
 
 import com.google.appengine.api.labs.taskqueue.Queue;
@@ -64,8 +64,8 @@ import com.google.inject.util.Jsr330;
  */
 public class GuiceServletConfig extends GuiceServletContextListener {
 
-   private Map<String, BlobStoreContext<?,?>> providerTypeToBlobStoreMap;
+   private Map<String, BlobStoreContext<?, ?>> providerTypeToBlobStoreMap;
-   private TwitterAsyncClient twitterClient;
+   private TwitterClient twitterClient;
    private String container;
 
    @SuppressWarnings("unchecked")
@@ -76,7 +76,7 @@ public class GuiceServletConfig extends GuiceServletContextListener {
 
       // shared across all blobstores and used to retrieve tweets
       twitterClient = TwitterContextFactory.createContext(props,
-               new GaeHttpCommandExecutorServiceModule()).getAsyncApi();
+               new GaeHttpCommandExecutorServiceModule()).getApi();
 
       // common namespace for storing tweets.
       container = checkNotNull(props.getProperty(PROPERTY_TWEETSTORE_CONTAINER),
@@ -88,12 +88,12 @@ public class GuiceServletConfig extends GuiceServletContextListener {
       // instantiate and store references to all blobstores by provider name
       providerTypeToBlobStoreMap = Maps.newHashMap();
       for (String className : contextBuilderClassNames) {
-         Class<BlobStoreContextBuilder<?,?>> builderClass;
+         Class<BlobStoreContextBuilder<?, ?>> builderClass;
-         Constructor<BlobStoreContextBuilder<?,?>> constructor;
+         Constructor<BlobStoreContextBuilder<?, ?>> constructor;
          String name;
-         BlobStoreContext<?,?> context;
+         BlobStoreContext<?, ?> context;
          try {
-            builderClass = (Class<BlobStoreContextBuilder<?,?>>) Class.forName(className);
+            builderClass = (Class<BlobStoreContextBuilder<?, ?>>) Class.forName(className);
             name = builderClass.getSimpleName().replaceAll("BlobStoreContextBuilder", "");
             constructor = builderClass.getConstructor(Properties.class);
             context = constructor.newInstance(props).withModules(
@@ -133,21 +133,20 @@ public class GuiceServletConfig extends GuiceServletContextListener {
       return Guice.createInjector(new ServletModule() {
          @Override
          protected void configureServlets() {
-            bind(new TypeLiteral<Map<String, BlobStoreContext<?,?>>>() {
+            bind(new TypeLiteral<Map<String, BlobStoreContext<?, ?>>>() {
             }).toInstance(GuiceServletConfig.this.providerTypeToBlobStoreMap);
-            bind(TwitterAsyncClient.class).toInstance(twitterClient);
+            bind(TwitterClient.class).toInstance(twitterClient);
             bindConstant().annotatedWith(Jsr330.named(PROPERTY_TWEETSTORE_CONTAINER)).to(container);
             serve("/store/*").with(StoreTweetsController.class);
             serve("/tweets/*").with(AddTweetsController.class);
             requestInjection(this);
          }
-      }
+      });
-      );
    }
 
    @Override
    public void contextDestroyed(ServletContextEvent servletContextEvent) {
-      for (BlobStoreContext<?,?> context : providerTypeToBlobStoreMap.values()) {
+      for (BlobStoreContext<?, ?> context : providerTypeToBlobStoreMap.values()) {
          context.close();
       }
       super.contextDestroyed(servletContextEvent);

extensions/bouncycastle/src/main/java/org/jclouds/encryption/bouncycastle/BouncyCastleEncryptionService.java

@@ -1,4 +1,27 @@
-package org.jclouds.util.internal;
+/**
+ *
+ * Copyright (C) 2009 Global Cloud Specialists, Inc. <info@globalcloudspecialists.com>
+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ */
+package org.jclouds.encryption.bouncycastle;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -8,6 +31,8 @@ import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 
+import javax.inject.Singleton;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.bouncycastle.crypto.Digest;
@@ -17,12 +42,14 @@ import org.bouncycastle.crypto.digests.SHA256Digest;
 import org.bouncycastle.crypto.macs.HMac;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.util.encoders.Base64;
+import org.jclouds.encryption.internal.BaseEncryptionService;
 import org.jclouds.util.Utils;
 
 /**
  * 
  * @author Adrian Cole
  */
+@Singleton
 public class BouncyCastleEncryptionService extends BaseEncryptionService {
    public String hmacSha256Base64(String toEncode, byte[] key) throws NoSuchAlgorithmException,
             NoSuchProviderException, InvalidKeyException {

extensions/bouncycastle/src/main/java/org/jclouds/encryption/bouncycastle/config/BouncyCastleEncryptionServiceModule.java

@@ -0,0 +1,44 @@
+/**
+ *
+ * Copyright (C) 2009 Global Cloud Specialists, Inc. <info@globalcloudspecialists.com>
+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ */
+package org.jclouds.encryption.bouncycastle.config;
+
+import org.jclouds.encryption.EncryptionService;
+import org.jclouds.encryption.bouncycastle.BouncyCastleEncryptionService;
+
+import com.google.inject.AbstractModule;
+
+/**
+ * Configures EncryptionService of type {@link BouncyCastleEncryptionService}
+ * 
+ * @author Adrian Cole
+ * 
+ */
+public class BouncyCastleEncryptionServiceModule extends AbstractModule {
+
+   @Override
+   protected void configure() {
+      bind(EncryptionService.class).to(BouncyCastleEncryptionService.class);
+   }
+
+}

extensions/bouncycastle/src/main/java/org/jclouds/util/internal/EncryptionService.java

@@ -1,90 +0,0 @@
-/**
- *
- * Copyright (C) 2009 Global Cloud Specialists, Inc. <info@globalcloudspecialists.com>
- *
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- */
-package org.jclouds.util.internal;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-
-import org.bouncycastle.crypto.Digest;
-
-/**
- * 
- * @author Adrian Cole
- */
-public interface EncryptionService {
-
-   String toHexString(byte[] raw);
-
-   byte[] fromHexString(String hex);
-
-   String hmacSha256Base64(String toEncode, byte[] key) throws NoSuchAlgorithmException,
-            NoSuchProviderException, InvalidKeyException;
-
-   byte[] hmac(String toEncode, byte[] key, Digest digest);
-
-   String hmacSha1Base64(String toEncode, byte[] key) throws NoSuchAlgorithmException,
-            NoSuchProviderException, InvalidKeyException;
-
-   String md5Hex(byte[] toEncode) throws NoSuchAlgorithmException, NoSuchProviderException,
-            InvalidKeyException, UnsupportedEncodingException;
-
-   String md5Base64(byte[] toEncode) throws NoSuchAlgorithmException, NoSuchProviderException,
-            InvalidKeyException;
-
-   byte[] md5(byte[] plainBytes);
-
-   byte[] md5(File toEncode);
-
-   String toBase64String(byte[] resBuf);
-
-   Long calculateSize(Object data);
-
-   byte[] md5(Object data);
-
-   MD5InputStreamResult generateMD5Result(InputStream toEncode);
-
-   public static class MD5InputStreamResult {
-      public final byte[] data;
-      public final byte[] md5;
-      public final long length;
-
-      MD5InputStreamResult(byte[] data, byte[] eTag, long length) {
-         this.data = checkNotNull(data, "data");
-         this.md5 = checkNotNull(eTag, "eTag");
-         checkArgument(length >= 0, "length cannot me negative");
-         this.length = length;
-      }
-
-   }
-
-   byte[] fromBase64String(String encoded);
-
-}

extensions/bouncycastle/src/test/java/org/jclouds/encryption/bouncycastle/BouncyCastleEncryptionServiceTest.java

@@ -1,6 +1,8 @@
-package org.jclouds.util.internal;
+package org.jclouds.encryption.bouncycastle;
 
-import org.jclouds.util.EncryptionServiceTest;
+import org.jclouds.encryption.EncryptionService;
+import org.jclouds.encryption.EncryptionServiceTest;
+import org.jclouds.encryption.bouncycastle.config.BouncyCastleEncryptionServiceModule;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
@@ -17,7 +19,8 @@ public class BouncyCastleEncryptionServiceTest extends EncryptionServiceTest {
 
    @BeforeTest
    protected void createEncryptionService() {
-      Injector i = Guice.createInjector();
+      Injector i = Guice.createInjector(new BouncyCastleEncryptionServiceModule());
-      encryptionService = i.getInstance(BouncyCastleEncryptionService.class);
+      encryptionService = i.getInstance(EncryptionService.class);
+      assert encryptionService instanceof BouncyCastleEncryptionService;
    }
 }

extensions/gae/pom.xml

@@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+    <!--
-   $HeadURL$
+        $HeadURL$ $Revision$ $Date$ Copyright (C) 2009 Adrian Cole
-   $Revision$
+        <adrian@jclouds.org>
-   $Date$
 
-   Copyright (C) 2009 Adrian Cole <adrian@jclouds.org>
+        ====================================================================
+        Licensed to the Apache Software Foundation (ASF) under one or
+        more contributor license agreements. See the NOTICE file
+        distributed with this work for additional information regarding
+        copyright ownership. The ASF licenses this file to you under the
+        Apache License, Version 2.0 (the "License"); you may not use
+        this file except in compliance with the License. You may obtain
+        a copy of the License at
 
-   ====================================================================
+        http://www.apache.org/licenses/LICENSE-2.0.html Unless required
-   Licensed to the Apache Software Foundation (ASF) under one
+        by applicable law or agreed to in writing, software distributed
-   or more contributor license agreements.  See the NOTICE file
+        under the License is distributed on an "AS IS" BASIS, WITHOUT
-   distributed with this work for additional information
+        WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   regarding copyright ownership.  The ASF licenses this file
+        See the License for the specific language governing permissions
-   to you under the Apache License, Version 2.0 (the
+        and limitations under the License.
-   "License"); you may not use this file except in compliance
+        ====================================================================
-   with the License.  You may obtain a copy of the License at
+    -->
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     http://www.apache.org/licenses/LICENSE-2.0.html 
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   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>
@@ -67,14 +63,12 @@
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
-<!--
+            <!--
-            <exclusions>
+                <exclusions> <exclusion>
-                <exclusion>
+                <groupId>org.mortbay.jetty</groupId>
-                    <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty</artifactId> </exclusion>
-                    <artifactId>jetty</artifactId>
+                </exclusions>
-                </exclusion>
+            -->
-            </exclusions>
--->
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

extensions/joda/src/main/java/org/jclouds/date/joda/JodaDateService.java

@@ -21,14 +21,16 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.util.internal;
+package org.jclouds.date.joda;
 
 import java.util.Date;
 import java.util.Locale;
 
+import javax.inject.Singleton;
+
 import net.jcip.annotations.ThreadSafe;
 
-import org.jclouds.util.DateService;
+import org.jclouds.date.DateService;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;
@@ -40,6 +42,7 @@ import org.joda.time.format.DateTimeFormatter;
  * @author James Murty
  */
 @ThreadSafe
+@Singleton
 public class JodaDateService implements DateService {
 
    private static final DateTimeFormatter rfc822DateFormatter = DateTimeFormat.forPattern(

extensions/joda/src/main/java/org/jclouds/date/joda/config/JodaDateServiceModule.java

@@ -0,0 +1,44 @@
+/**
+ *
+ * Copyright (C) 2009 Global Cloud Specialists, Inc. <info@globalcloudspecialists.com>
+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ */
+package org.jclouds.date.joda.config;
+
+import org.jclouds.date.DateService;
+import org.jclouds.date.joda.JodaDateService;
+
+import com.google.inject.AbstractModule;
+
+/**
+ * Configures DateService of type {@link JodaDateService}
+ * 
+ * @author Adrian Cole
+ * 
+ */
+public class JodaDateServiceModule extends AbstractModule {
+
+   @Override
+   protected void configure() {
+      bind(DateService.class).to(JodaDateService.class);
+   }
+
+}

extensions/joda/src/test/java/org/jclouds/date/joda/JodaDateServiceTest.java

@@ -21,12 +21,17 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.util;
+package org.jclouds.date.joda;
 
-import org.jclouds.util.internal.JodaDateService;
+import org.jclouds.date.DateService;
+import org.jclouds.date.DateServiceTest;
+import org.jclouds.date.joda.config.JodaDateServiceModule;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
 /* 
  * TODO: Scrap any non-DateService references (eg Joda & Amazon) if/when
  * we confirm that the DateService is fast enough.
@@ -43,7 +48,9 @@ public class JodaDateServiceTest extends DateServiceTest {
    @Override
    @BeforeTest
    protected void createDateService() {
-      dateService = new JodaDateService();
+      Injector i = Guice.createInjector(new JodaDateServiceModule());
+      dateService = i.getInstance(DateService.class);
+      assert dateService instanceof JodaDateService;
    }
 
 }

mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java

@@ -33,6 +33,7 @@ import javax.inject.Named;
 import javax.inject.Singleton;
 
 import org.jclouds.concurrent.internal.SyncProxy;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpRetryHandler;
 import org.jclouds.http.RequiresHttp;
 import org.jclouds.http.annotation.ClientError;
@@ -54,7 +55,6 @@ import org.jclouds.mezeo.pcs2.handlers.PCSClientErrorRetryHandler;
 import org.jclouds.mezeo.pcs2.reference.PCSConstants;
 import org.jclouds.rest.ConfiguresRestClient;
 import org.jclouds.rest.RestClientFactory;
-import org.jclouds.util.EncryptionService;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;

mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java

@@ -31,6 +31,7 @@ import java.util.SortedSet;
 import javax.annotation.Resource;
 import javax.inject.Inject;
 
+import org.jclouds.date.DateService;
 import org.jclouds.http.functions.ParseSax;
 import org.jclouds.logging.Logger;
 import org.jclouds.mezeo.pcs2.domain.ContainerList;
@@ -38,7 +39,6 @@ import org.jclouds.mezeo.pcs2.domain.ResourceInfo;
 import org.jclouds.mezeo.pcs2.domain.internal.ContainerInfoImpl;
 import org.jclouds.mezeo.pcs2.domain.internal.ContainerListImpl;
 import org.jclouds.mezeo.pcs2.domain.internal.FileInfoImpl;
-import org.jclouds.util.DateService;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 

mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java

@@ -29,10 +29,10 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
+import org.jclouds.date.DateService;
 import org.jclouds.http.functions.ParseSax;
 import org.jclouds.mezeo.pcs2.domain.FileInfoWithMetadata;
 import org.jclouds.mezeo.pcs2.domain.internal.FileInfoWithMetadataImpl;
-import org.jclouds.util.DateService;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 

mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSClientTest.java

@@ -41,6 +41,7 @@ import org.jclouds.blobstore.binders.BindBlobToMultipartFormTest;
 import org.jclouds.blobstore.config.BlobStoreObjectModule;
 import org.jclouds.blobstore.functions.ReturnVoidOnNotFoundOr404;
 import org.jclouds.blobstore.functions.ThrowKeyNotFoundOn404;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.filters.BasicAuthentication;
 import org.jclouds.http.functions.ParseSax;
 import org.jclouds.http.functions.ParseURIFromListOrLocationHeaderIf20x;
@@ -59,7 +60,6 @@ import org.jclouds.mezeo.pcs2.xml.FileHandler;
 import org.jclouds.rest.RestClientTest;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
 import org.jclouds.rest.internal.RestAnnotationProcessor;
-import org.jclouds.util.EncryptionService;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 

mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudLiveTest.java

@@ -34,6 +34,7 @@ import javax.inject.Singleton;
 
 import org.jclouds.concurrent.WithinThreadExecutorService;
 import org.jclouds.concurrent.config.ExecutorServiceModule;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
 import org.jclouds.http.filters.BasicAuthentication;
 import org.jclouds.logging.Logger;
@@ -41,7 +42,6 @@ import org.jclouds.logging.Logger.LoggerFactory;
 import org.jclouds.mezeo.pcs2.PCSCloud.Response;
 import org.jclouds.rest.RestClientFactory;
 import org.jclouds.rest.config.RestModule;
-import org.jclouds.util.EncryptionService;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 

mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java

@@ -33,6 +33,7 @@ import javax.inject.Singleton;
 
 import org.jclouds.concurrent.WithinThreadExecutorService;
 import org.jclouds.concurrent.config.ExecutorServiceModule;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
 import org.jclouds.http.filters.BasicAuthentication;
 import org.jclouds.http.functions.ParseSax;
@@ -42,7 +43,6 @@ import org.jclouds.mezeo.pcs2.xml.CloudXlinkHandler;
 import org.jclouds.rest.config.RestModule;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
 import org.jclouds.rest.internal.RestAnnotationProcessor;
-import org.jclouds.util.EncryptionService;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 

mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java

@@ -28,13 +28,13 @@ import static org.testng.Assert.assertEquals;
 import java.io.InputStream;
 import java.net.URI;
 
+import org.jclouds.date.DateService;
 import org.jclouds.http.functions.BaseHandlerTest;
 import org.jclouds.mezeo.pcs2.domain.ContainerList;
 import org.jclouds.mezeo.pcs2.domain.ResourceInfo;
 import org.jclouds.mezeo.pcs2.domain.internal.ContainerInfoImpl;
 import org.jclouds.mezeo.pcs2.domain.internal.ContainerListImpl;
 import org.jclouds.mezeo.pcs2.domain.internal.FileInfoImpl;
-import org.jclouds.util.DateService;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 

mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java

@@ -28,10 +28,10 @@ import static org.testng.Assert.assertEquals;
 import java.io.InputStream;
 import java.net.URI;
 
+import org.jclouds.date.DateService;
 import org.jclouds.http.functions.BaseHandlerTest;
 import org.jclouds.mezeo.pcs2.domain.FileInfoWithMetadata;
 import org.jclouds.mezeo.pcs2.domain.internal.FileInfoWithMetadataImpl;
-import org.jclouds.util.DateService;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 

nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNClientLiveTest.java

@@ -34,9 +34,9 @@ import java.util.concurrent.TimeoutException;
 
 import org.jclouds.blobstore.domain.Blob;
 import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest;
+import org.jclouds.encryption.internal.Base64;
 import org.jclouds.logging.log4j.config.Log4JLoggingModule;
 import org.jclouds.nirvanix.sdn.domain.UploadInfo;
-import org.jclouds.util.internal.Base64;
 import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.Test;
 

nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequestTest.java

@@ -33,6 +33,7 @@ import javax.ws.rs.ext.RuntimeDelegate;
 
 import org.jclouds.concurrent.WithinThreadExecutorService;
 import org.jclouds.concurrent.config.ExecutorServiceModule;
+import org.jclouds.date.DateService;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
 import org.jclouds.logging.Logger;
@@ -42,7 +43,6 @@ import org.jclouds.rest.annotations.Endpoint;
 import org.jclouds.rest.config.RestModule;
 import org.jclouds.rest.internal.RestAnnotationProcessor;
 import org.jclouds.rest.internal.RuntimeDelegateImpl;
-import org.jclouds.util.DateService;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;

rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/binders/BindCFObjectToEntity.java

@@ -30,11 +30,11 @@ import javax.inject.Named;
 import javax.ws.rs.core.HttpHeaders;
 
 import org.jclouds.blobstore.binders.BindBlobToEntityAndUserMetadataToHeadersWithPrefix;
+import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.rackspace.cloudfiles.blobstore.functions.ObjectToBlob;
 import org.jclouds.rackspace.cloudfiles.domain.CFObject;
 import org.jclouds.rackspace.cloudfiles.reference.CloudFilesConstants;
-import org.jclouds.util.EncryptionService;
 
 public class BindCFObjectToEntity extends BindBlobToEntityAndUserMetadataToHeadersWithPrefix {
    private final ObjectToBlob object2Blob;