Issue 67: convert to javax.inject annotations

git-svn-id: http://jclouds.googlecode.com/svn/trunk@1913 3d8758e0-26b5-11de-8745-db77d3ebf521
2009-09-24 05:37:25 +00:00 · 2009-09-24 05:37:25 +00:00 · 3cde3d6356
parent 7a6b9fe6cd
commit 3cde3d6356
134 changed files with 314 additions and 230 deletions
--- a/aws/ec2/core/src/main/java/org/jclouds/aws/ec2/commands/options/EC2RequestOptions.java
+++ b/aws/ec2/core/src/main/java/org/jclouds/aws/ec2/commands/options/EC2RequestOptions.java
@ -27,7 +27,7 @@ import org.jclouds.aws.ec2.reference.EC2Constants;
 import org.jclouds.http.options.HttpRequestOptions;
 import org.joda.time.DateTime;

-import com.google.inject.name.Named;
+import javax.inject.Named;

 /**
 * 
--- a/aws/ec2/core/src/main/java/org/jclouds/aws/ec2/internal/GuiceEC2Context.java
+++ b/aws/ec2/core/src/main/java/org/jclouds/aws/ec2/internal/GuiceEC2Context.java
@ -32,7 +32,7 @@ import org.jclouds.aws.ec2.EC2Context;
 import org.jclouds.lifecycle.Closer;
 import org.jclouds.logging.Logger;

-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;

 /**
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/binders/S3ObjectBinder.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/binders/S3ObjectBinder.java
@ -33,8 +33,8 @@ import org.jclouds.blobstore.binders.BlobBinder;
 import org.jclouds.blobstore.domain.Blob;
 import org.jclouds.http.HttpRequest;

-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;

 public class S3ObjectBinder extends BlobBinder {
   @Inject
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/RestS3ConnectionModule.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/RestS3ConnectionModule.java
@ -46,11 +46,11 @@ import org.jclouds.rest.RestClientFactory;
 import org.jclouds.rest.config.JaxrsModule;

 import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
-import com.google.inject.Singleton;
-import com.google.inject.name.Named;
+import javax.inject.Singleton;
+import javax.inject.Named;

 /**
 * Configures the S3 connection, including logging and http transport.
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/S3Object.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/domain/S3Object.java
@ -25,7 +25,7 @@ package org.jclouds.aws.s3.domain;

 import org.jclouds.blobstore.domain.Blob;

-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.assistedinject.Assisted;

 /**
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignature.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignature.java
@ -42,9 +42,9 @@ import org.jclouds.http.HttpUtils;
 import org.jclouds.util.DateService;

 import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.inject.Named;

 /**
 * Signs the S3 request. This will update timestamps at most once per second.
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ParseObjectFromHeadersAndHttpContent.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ParseObjectFromHeadersAndHttpContent.java
@ -27,7 +27,7 @@ import org.jclouds.aws.s3.domain.ObjectMetadata;
 import org.jclouds.aws.s3.domain.S3Object;
 import org.jclouds.blobstore.functions.ParseBlobFromHeadersAndHttpContent;

-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Parses response headers and creates a new S3Object from them and the HTTP content.
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ParseObjectMetadataFromHeaders.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/functions/ParseObjectMetadataFromHeaders.java
@ -35,8 +35,8 @@ import org.jclouds.http.HttpUtils;
 import org.jclouds.util.DateService;

 import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;

 /**
 * This parses @{link {@link org.jclouds.aws.s3.domain.ObjectMetadata} from HTTP headers.
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/handlers/AWSClientErrorRetryHandler.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/handlers/AWSClientErrorRetryHandler.java
@ -35,8 +35,8 @@ import org.jclouds.http.HttpRetryHandler;
 import org.jclouds.logging.Logger;
 import org.jclouds.util.Utils;

-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;

 /**
 * Handles Retryable responses with error codes in the 3xx range
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/handlers/AWSRedirectionRetryHandler.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/handlers/AWSRedirectionRetryHandler.java
@ -37,8 +37,8 @@ import org.jclouds.http.handlers.BackoffLimitedRetryHandler;
 import org.jclouds.http.handlers.RedirectionRetryHandler;
 import org.jclouds.util.Utils;

-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;

 /**
 * Handles Retryable responses with error codes in the 3xx range
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/handlers/ParseAWSErrorFromXmlContent.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/handlers/ParseAWSErrorFromXmlContent.java
@ -36,7 +36,7 @@ import org.jclouds.http.HttpResponseException;
 import org.jclouds.logging.Logger;
 import org.jclouds.util.Utils;

-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * This will parse and set an appropriate exception on the command object.
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/GuiceS3Context.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/GuiceS3Context.java
@ -38,9 +38,9 @@ import org.jclouds.blobstore.InputStreamMap;
 import org.jclouds.lifecycle.Closer;
 import org.jclouds.logging.Logger;

-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
-import com.google.inject.name.Named;
+import javax.inject.Named;

 /**
 * Uses a Guice Injector to configure the objects served by S3Context methods.
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3InputStreamMap.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3InputStreamMap.java
@ -29,7 +29,7 @@ import org.jclouds.aws.s3.domain.ObjectMetadata;
 import org.jclouds.aws.s3.domain.S3Object;
 import org.jclouds.blobstore.LiveInputStreamMap;

-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.assistedinject.Assisted;

 /**
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3ObjectMap.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3ObjectMap.java
@ -29,7 +29,7 @@ import org.jclouds.aws.s3.domain.ObjectMetadata;
 import org.jclouds.aws.s3.domain.S3Object;
 import org.jclouds.blobstore.LiveBlobMap;

-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.assistedinject.Assisted;

 /**
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/options/CopyObjectOptions.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/options/CopyObjectOptions.java
@ -39,8 +39,8 @@ import org.joda.time.DateTime;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;

 /**
 * Contains options supported in the REST API for the COPY object operation.
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/reference/S3Constants.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/reference/S3Constants.java
@ -34,7 +34,7 @@ import org.jclouds.blobstore.reference.BlobStoreConstants;
 public interface S3Constants extends AWSConstants, S3Headers, BlobStoreConstants {

   /**
-    * S3 service's XML Namespace, as used in XML request and response documents.
+    * S3 service's XML Jsr330pace, as used in XML request and response documents.
    */
   public static final String S3_REST_API_XML_NAMESPACE = "http://s3.amazonaws.com/doc/2006-03-01/";
   public static final String ENDPOINT = "Endpoint";
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/util/S3Utils.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/util/S3Utils.java
@ -39,7 +39,7 @@ import org.jclouds.http.HttpException;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.HttpUtils;

-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Encryption, Hashing, and IO Utilities needed to sign and verify S3 requests and responses.
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/CopyObjectHandler.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/CopyObjectHandler.java
@ -28,7 +28,7 @@ import org.jclouds.http.HttpUtils;
 import org.jclouds.http.functions.ParseSax;
 import org.jclouds.util.DateService;

-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Parses the response from Amazon S3 COPY Object command.
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListAllMyBucketsHandler.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListAllMyBucketsHandler.java
@ -31,7 +31,7 @@ import org.jclouds.aws.s3.domain.BucketMetadata;
 import org.jclouds.http.functions.ParseSax;
 import org.jclouds.util.DateService;

-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Parses the following XML document:
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListBucketHandler.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListBucketHandler.java
@ -37,7 +37,7 @@ import org.jclouds.util.DateService;
 import org.xml.sax.Attributes;

 import com.google.common.collect.Lists;
-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Parses the following XML document:
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/S3ParserFactory.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/S3ParserFactory.java
@ -34,8 +34,8 @@ import org.jclouds.aws.xml.ErrorHandler;
 import org.jclouds.http.functions.ParseSax;

 import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
+import javax.inject.Inject;
+import javax.inject.Provider;

 /**
 * Creates Parsers needed to interpret S3 Server messages. This class uses guice assisted inject,
--- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/config/S3ContextModuleTest.java
+++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/config/S3ContextModuleTest.java
@ -39,7 +39,7 @@ import org.testng.annotations.Test;

 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import com.google.inject.name.Names;
+import org.jclouds.util.Jsr330;

 /**
 * @author Adrian Cole
@ -52,17 +52,17 @@ public class S3ContextModuleTest {
               new WithinThreadExecutorService()), new S3ParserModule(), new S3ContextModule() {
         @Override
         protected void configure() {
-            bindConstant().annotatedWith(Names.named(S3Constants.PROPERTY_AWS_ACCESSKEYID)).to(
+            bindConstant().annotatedWith(Jsr330.named(S3Constants.PROPERTY_AWS_ACCESSKEYID)).to(
                     "localhost");
-            bindConstant().annotatedWith(Names.named(S3Constants.PROPERTY_AWS_SECRETACCESSKEY)).to(
+            bindConstant().annotatedWith(Jsr330.named(S3Constants.PROPERTY_AWS_SECRETACCESSKEY)).to(
                     "localhost");
-            bindConstant().annotatedWith(Names.named(S3Constants.PROPERTY_HTTP_ADDRESS)).to(
+            bindConstant().annotatedWith(Jsr330.named(S3Constants.PROPERTY_HTTP_ADDRESS)).to(
                     "localhost");
-            bindConstant().annotatedWith(Names.named(S3Constants.PROPERTY_HTTP_PORT)).to("1000");
-            bindConstant().annotatedWith(Names.named(S3Constants.PROPERTY_HTTP_SECURE)).to("false");
-            bindConstant().annotatedWith(Names.named(S3Constants.PROPERTY_HTTP_MAX_RETRIES))
+            bindConstant().annotatedWith(Jsr330.named(S3Constants.PROPERTY_HTTP_PORT)).to("1000");
+            bindConstant().annotatedWith(Jsr330.named(S3Constants.PROPERTY_HTTP_SECURE)).to("false");
+            bindConstant().annotatedWith(Jsr330.named(S3Constants.PROPERTY_HTTP_MAX_RETRIES))
                     .to("5");
-            bindConstant().annotatedWith(Names.named(S3Constants.PROPERTY_HTTP_MAX_REDIRECTS)).to(
+            bindConstant().annotatedWith(Jsr330.named(S3Constants.PROPERTY_HTTP_MAX_REDIRECTS)).to(
                     "5");
            super.configure();
         }
--- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignatureTest.java
+++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignatureTest.java
@ -40,7 +40,7 @@ import org.testng.annotations.Test;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import com.google.inject.name.Names;
+import org.jclouds.util.Jsr330;

@Test(groups = "unit", testName = "s3.RequestAuthorizeSignatureTest")
 public class RequestAuthorizeSignatureTest {
@ -152,9 +152,9 @@ public class RequestAuthorizeSignatureTest {
      injector = Guice.createInjector(new AbstractModule() {

         protected void configure() {
-            bindConstant().annotatedWith(Names.named(S3Constants.PROPERTY_AWS_ACCESSKEYID)).to(
+            bindConstant().annotatedWith(Jsr330.named(S3Constants.PROPERTY_AWS_ACCESSKEYID)).to(
                     "foo");
-            bindConstant().annotatedWith(Names.named(S3Constants.PROPERTY_AWS_SECRETACCESSKEY)).to(
+            bindConstant().annotatedWith(Jsr330.named(S3Constants.PROPERTY_AWS_SECRETACCESSKEY)).to(
                     "bar");
            bind(DateService.class);

--- a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformanceLiveTest.java
+++ b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformanceLiveTest.java
@ -47,7 +47,7 @@ import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;

-import com.google.inject.Provider;
+import javax.inject.Provider;

 /**
 * Tests relative performance of S3 functions.
--- a/aws/s3/samples/googleappengine/pom.xml
+++ b/aws/s3/samples/googleappengine/pom.xml
@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>com.google.code.guice</groupId>
 			<artifactId>guice-servlet</artifactId>
-			<version>2.0</version>
+			<version>2.1-r1089</version>
 		</dependency>
 		<dependency>
 			<groupId>displaytag</groupId>
--- a/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllBucketsController.java
+++ b/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllBucketsController.java
@ -42,9 +42,9 @@ import org.jclouds.samples.googleappengine.domain.BucketResult;
 import org.jclouds.samples.googleappengine.functions.MetadataToBucketResult;

 import com.google.common.collect.Lists;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;

 /**
 * Shows an example of how to use @{link S3Connection} injected with Guice.
--- a/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/JCloudsServlet.java
+++ b/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/JCloudsServlet.java
@ -41,8 +41,8 @@ import org.jclouds.aws.s3.domain.ListBucketResponse;
 import org.jclouds.blobstore.ContainerNotFoundException;
 import org.jclouds.logging.Logger;

-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;

 /**
 * Shows an example of how to use @{link S3Connection} injected with Guice.
--- a/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/config/GuiceServletConfig.java
+++ b/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/config/GuiceServletConfig.java
@ -23,7 +23,7 @@
 */
 package org.jclouds.samples.googleappengine.config;

-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.servlet.GuiceServletContextListener;
 import com.google.inject.servlet.ServletModule;
--- a/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/MetadataToBucketResult.java
+++ b/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/MetadataToBucketResult.java
@ -35,7 +35,7 @@ import org.jclouds.logging.Logger;
 import org.jclouds.samples.googleappengine.domain.BucketResult;

 import com.google.common.base.Function;
-import com.google.inject.Inject;
+import javax.inject.Inject;

 public class MetadataToBucketResult implements Function<BucketMetadata, BucketResult> {
   private final S3BlobStore connection;
--- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/binders/BlobBinder.java
+++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/binders/BlobBinder.java
@ -32,8 +32,8 @@ import org.jclouds.azure.storage.blob.domain.BlobMetadata;
 import org.jclouds.blobstore.domain.Blob;
 import org.jclouds.http.HttpRequest;

-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;

 public class BlobBinder extends org.jclouds.blobstore.binders.BlobBinder {
   @Inject
--- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/RestAzureBlobStoreModule.java
+++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/RestAzureBlobStoreModule.java
@ -32,7 +32,7 @@ import org.jclouds.http.RequiresHttp;
 import org.jclouds.rest.RestClientFactory;

 import com.google.inject.Provides;
-import com.google.inject.Singleton;
+import javax.inject.Singleton;

 /**
 * Configures the Azure Blob Service connection, including logging and http transport.
--- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/Blob.java
+++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/Blob.java
@ -23,7 +23,7 @@
 */
 package org.jclouds.azure.storage.blob.domain;

-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.assistedinject.Assisted;

 /**
--- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobFromHeadersAndHttpContent.java
+++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobFromHeadersAndHttpContent.java
@ -27,7 +27,7 @@ import org.jclouds.azure.storage.blob.domain.Blob;
 import org.jclouds.azure.storage.blob.domain.BlobMetadata;
 import org.jclouds.blobstore.functions.ParseBlobMetadataFromHeaders;

-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Parses response headers and creates a new Azure Blob from them and the HTTP content.
--- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobMetadataFromHeaders.java
+++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobMetadataFromHeaders.java
@ -31,8 +31,8 @@ import org.jclouds.azure.storage.blob.domain.BlobMetadata;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.util.DateService;

-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;

 /**
 * This parses @{link {@link org.jclouds.azure.storage.blob.domain.BlobMetadata} from HTTP headers.
--- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/GuiceAzureBlobContext.java
+++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/GuiceAzureBlobContext.java
@ -38,9 +38,9 @@ import org.jclouds.blobstore.InputStreamMap;
 import org.jclouds.lifecycle.Closer;
 import org.jclouds.logging.Logger;

-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
-import com.google.inject.name.Named;
+import javax.inject.Named;

 /**
 * Uses a Guice Injector to configure the objects served by AzureBlobContext methods.
--- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/LiveAzureBlobInputStreamMap.java
+++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/LiveAzureBlobInputStreamMap.java
@ -29,7 +29,7 @@ import org.jclouds.azure.storage.blob.domain.BlobMetadata;
 import org.jclouds.azure.storage.blob.domain.ContainerMetadata;
 import org.jclouds.blobstore.LiveInputStreamMap;

-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.assistedinject.Assisted;

 /**
--- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/LiveAzureBlobObjectMap.java
+++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/internal/LiveAzureBlobObjectMap.java
@ -29,7 +29,7 @@ import org.jclouds.azure.storage.blob.domain.BlobMetadata;
 import org.jclouds.azure.storage.blob.domain.ContainerMetadata;
 import org.jclouds.blobstore.LiveBlobMap;

-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.assistedinject.Assisted;

 /**
--- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandler.java
+++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandler.java
@ -35,7 +35,7 @@ import org.jclouds.http.functions.ParseSax;
 import org.jclouds.util.DateService;
 import org.joda.time.DateTime;

-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Parses the following XML document:
--- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/AzureBlobParserFactory.java
+++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/AzureBlobParserFactory.java
@ -29,8 +29,8 @@ import org.jclouds.azure.storage.domain.BoundedList;
 import org.jclouds.azure.storage.xml.AzureStorageParserFactory;
 import org.jclouds.http.functions.ParseSax;

-import com.google.inject.Inject;
-import com.google.inject.Provider;
+import javax.inject.Inject;
+import javax.inject.Provider;

 /**
 * Creates Parsers needed to interpret Azure Blob Service messages. This class uses guice assisted
--- a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandler.java
+++ b/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandler.java
@ -37,7 +37,7 @@ import org.joda.time.DateTime;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;

-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Parses the following XML document:
--- a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobStoreTest.java
+++ b/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobStoreTest.java
@ -55,7 +55,7 @@ import org.testng.annotations.Test;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
-import com.google.inject.name.Names;
+import org.jclouds.util.Jsr330;

 /**
 * Tests behavior of {@code AzureBlobStore}
@ -264,10 +264,10 @@ public class AzureBlobStoreTest {
                  protected void configure() {
                     bind(URI.class).toInstance(URI.create("http://blob.core.windows.net"));
                     bindConstant().annotatedWith(
-                              Names.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT)).to(
+                              Jsr330.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT)).to(
                              "myaccount");
                     bindConstant().annotatedWith(
-                              Names.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_KEY)).to(
+                              Jsr330.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_KEY)).to(
                              HttpUtils.toBase64String("key".getBytes()));
                  }

--- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/config/RestAzureStorageConnectionModule.java
+++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/config/RestAzureStorageConnectionModule.java
@ -41,11 +41,11 @@ import org.jclouds.logging.Logger;
 import org.jclouds.rest.config.JaxrsModule;

 import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
-import com.google.inject.Singleton;
-import com.google.inject.name.Named;
+import javax.inject.Singleton;
+import javax.inject.Named;

 /**
 * Configures the AzureStorage connection, including logging and http transport.
--- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/filters/SharedKeyAuthentication.java
+++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/filters/SharedKeyAuthentication.java
@ -40,9 +40,9 @@ import org.jclouds.http.HttpUtils;
 import org.jclouds.util.DateService;

 import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.inject.Named;

 /**
 * Signs the Azure Storage request. This will update timestamps at most once per second.
--- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java
+++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java
@ -36,7 +36,7 @@ import org.jclouds.http.HttpResponseException;
 import org.jclouds.logging.Logger;
 import org.jclouds.util.Utils;

-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * This will parse and set an appropriate exception on the command object.
--- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/util/AzureStorageUtils.java
+++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/util/AzureStorageUtils.java
@ -34,7 +34,7 @@ import org.jclouds.http.HttpCommand;
 import org.jclouds.http.HttpException;
 import org.jclouds.http.HttpResponse;

-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Encryption, Hashing, and IO Utilities needed to sign and verify Azure Storage requests and
--- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/AzureStorageParserFactory.java
+++ b/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/AzureStorageParserFactory.java
@ -27,8 +27,8 @@ import org.jclouds.azure.storage.domain.AzureStorageError;
 import org.jclouds.http.functions.ParseSax;

 import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
+import javax.inject.Inject;
+import javax.inject.Provider;

 /**
 * Creates Parsers needed to interpret Azure Storage Service messages. This class uses guice
--- a/azure/storage/core/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationLiveTest.java
+++ b/azure/storage/core/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationLiveTest.java
@ -45,7 +45,7 @@ import org.testng.annotations.Test;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import com.google.inject.name.Names;
+import org.jclouds.util.Jsr330;

 /**
 * Tests behavior of {@code JaxrsAnnotationProcessor}
@ -85,9 +85,9 @@ public class SharedKeyAuthenticationLiveTest {
         @Override
         protected void configure() {
            bindConstant().annotatedWith(
-                     Names.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT)).to(account);
+                     Jsr330.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT)).to(account);
            bindConstant().annotatedWith(
-                     Names.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_KEY)).to(key);
+                     Jsr330.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_KEY)).to(key);
         }

      }, new JaxrsModule(), new Log4JLoggingModule(), new ExecutorServiceModule(
--- a/azure/storage/core/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationTest.java
+++ b/azure/storage/core/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationTest.java
@ -41,7 +41,7 @@ import org.testng.annotations.Test;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import com.google.inject.name.Names;
+import org.jclouds.util.Jsr330;

@Test(groups = "unit", testName = "azurestorage.SharedKeyAuthenticationTest")
 public class SharedKeyAuthenticationTest {
@ -148,9 +148,9 @@ public class SharedKeyAuthenticationTest {

         protected void configure() {
            bindConstant().annotatedWith(
-                     Names.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT)).to(ACCOUNT);
+                     Jsr330.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT)).to(ACCOUNT);
            bindConstant().annotatedWith(
-                     Names.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_KEY)).to(KEY);
+                     Jsr330.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_KEY)).to(KEY);
            bind(DateService.class);

         }
--- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/RestAzureQueueConnectionModule.java
+++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/RestAzureQueueConnectionModule.java
@ -32,7 +32,7 @@ import org.jclouds.http.RequiresHttp;
 import org.jclouds.rest.RestClientFactory;

 import com.google.inject.Provides;
-import com.google.inject.Singleton;
+import javax.inject.Singleton;

 /**
 * Configures the Azure Queue Service connection, including logging and http transport.
--- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/internal/GuiceAzureQueueContext.java
+++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/internal/GuiceAzureQueueContext.java
@ -34,9 +34,9 @@ import org.jclouds.azure.storage.reference.AzureStorageConstants;
 import org.jclouds.lifecycle.Closer;
 import org.jclouds.logging.Logger;

-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
-import com.google.inject.name.Named;
+import javax.inject.Named;

 /**
 * Uses a Guice Injector to configure the objects served by AzureQueueContext methods.
--- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandler.java
+++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandler.java
@ -32,7 +32,7 @@ import org.jclouds.azure.storage.domain.BoundedList;
 import org.jclouds.azure.storage.queue.domain.QueueMetadata;
 import org.jclouds.http.functions.ParseSax;

-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Parses the following XML document:
--- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/AzureQueueParserFactory.java
+++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/AzureQueueParserFactory.java
@ -28,8 +28,8 @@ import org.jclouds.azure.storage.queue.domain.QueueMetadata;
 import org.jclouds.azure.storage.xml.AzureStorageParserFactory;
 import org.jclouds.http.functions.ParseSax;

-import com.google.inject.Inject;
-import com.google.inject.Provider;
+import javax.inject.Inject;
+import javax.inject.Provider;

 /**
 * Creates Parsers needed to interpret Azure Queue Service messages. This class uses guice assisted
--- a/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/AzureQueueConnectionTest.java
+++ b/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/AzureQueueConnectionTest.java
@ -52,7 +52,7 @@ import org.testng.annotations.Test;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
-import com.google.inject.name.Names;
+import org.jclouds.util.Jsr330;

 /**
 * Tests behavior of {@code AzureQueueConnection}
@ -170,10 +170,10 @@ public class AzureQueueConnectionTest {
                  protected void configure() {
                     bind(URI.class).toInstance(URI.create("http://localhost:8080"));
                     bindConstant().annotatedWith(
-                              Names.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT)).to(
+                              Jsr330.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT)).to(
                              "user");
                     bindConstant().annotatedWith(
-                              Names.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_KEY)).to(
+                              Jsr330.named(AzureStorageConstants.PROPERTY_AZURESTORAGE_KEY)).to(
                              HttpUtils.toBase64String("key".getBytes()));
                  }

--- a/blobstore/core/src/main/java/org/jclouds/blobstore/BaseBlobMap.java
+++ b/blobstore/core/src/main/java/org/jclouds/blobstore/BaseBlobMap.java
@ -49,9 +49,9 @@ import org.jclouds.util.Utils;

 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
-import com.google.inject.name.Named;
+import javax.inject.Named;

 /**
 * Implements core Map functionality with an {@link BlobStore}
--- a/blobstore/core/src/main/java/org/jclouds/blobstore/LiveBlobMap.java
+++ b/blobstore/core/src/main/java/org/jclouds/blobstore/LiveBlobMap.java
@ -37,7 +37,7 @@ import org.jclouds.blobstore.domain.BlobMetadata;
 import org.jclouds.blobstore.domain.ContainerMetadata;
 import org.jclouds.util.Utils;

-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.assistedinject.Assisted;

 /**
--- a/blobstore/core/src/main/java/org/jclouds/blobstore/LiveInputStreamMap.java
+++ b/blobstore/core/src/main/java/org/jclouds/blobstore/LiveInputStreamMap.java
@ -41,7 +41,7 @@ import org.jclouds.blobstore.domain.ContainerMetadata;
 import org.jclouds.util.Utils;

 import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.assistedinject.Assisted;

 /**
--- a/blobstore/core/src/main/java/org/jclouds/blobstore/binders/BlobBinder.java
+++ b/blobstore/core/src/main/java/org/jclouds/blobstore/binders/BlobBinder.java
@ -33,8 +33,8 @@ import org.jclouds.http.HttpRequest;
 import org.jclouds.http.HttpUtils;
 import org.jclouds.rest.EntityBinder;

-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;

 public class BlobBinder implements EntityBinder {
   private final String metadataPrefix;
--- a/blobstore/core/src/main/java/org/jclouds/blobstore/binders/UserMetadataBinder.java
+++ b/blobstore/core/src/main/java/org/jclouds/blobstore/binders/UserMetadataBinder.java
@ -31,8 +31,8 @@ import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.EntityBinder;

 import com.google.common.collect.Multimap;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;

 public class UserMetadataBinder implements EntityBinder {
   private final String metadataPrefix;
--- a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/Blob.java
+++ b/blobstore/core/src/main/java/org/jclouds/blobstore/domain/Blob.java
@ -33,7 +33,7 @@ import java.io.InputStream;
 import org.jclouds.http.HttpUtils;
 import org.jclouds.http.HttpUtils.MD5InputStreamResult;

-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.assistedinject.Assisted;

 /**
--- a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContent.java
+++ b/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContent.java
@ -32,7 +32,7 @@ import org.jclouds.http.HttpResponse;

 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Parses response headers and creates a new Blob from them and the HTTP content.
--- a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ParseBlobMetadataFromHeaders.java
+++ b/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ParseBlobMetadataFromHeaders.java
@ -37,8 +37,8 @@ import org.jclouds.util.DateService;

 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;

 /**
 * @author Adrian Cole
--- a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubTestInitializer.java
+++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubTestInitializer.java
@ -50,7 +50,7 @@ import org.jclouds.logging.Logger;
 import org.testng.ITestContext;

 import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Module;
--- a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
+++ b/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
@ -99,7 +99,7 @@ public class BaseBlobStoreIntegrationTest<S extends BlobStore<C, M, B>, C extend
   /**
    * two test groups integration and live.
    */
-   private volatile static BlockingQueue<String> containerNames = new ArrayBlockingQueue<String>(
+   private volatile static BlockingQueue<String> containerJsr330 = new ArrayBlockingQueue<String>(
            containerCount);

   @BeforeGroups(groups = { "integration", "live" })
@ -169,7 +169,7 @@ public class BaseBlobStoreIntegrationTest<S extends BlobStore<C, M, B>, C extend
                  } else {
                     try {
                        createContainerAndEnsureEmpty(client, context, containerName);
-                        containerNames.put(containerName);
+                        containerJsr330.put(containerName);
                     } catch (Throwable e) {
                        // throw away the container and try again with the next index
                        deleteContainerOrWarnIfUnable(client, context, containerName);
@ -177,8 +177,8 @@ public class BaseBlobStoreIntegrationTest<S extends BlobStore<C, M, B>, C extend
                     }
                  }
               }
-               testContext.setAttribute("containerNames", containerNames);
-               System.err.printf("*** containers to test: %s%n", containerNames);
+               testContext.setAttribute("containerJsr330", containerJsr330);
+               System.err.printf("*** containers to test: %s%n", containerJsr330);
               // careful not to keep too many files open
               context.close();
               initialized = true;
@ -338,7 +338,7 @@ public class BaseBlobStoreIntegrationTest<S extends BlobStore<C, M, B>, C extend

   public String getContainerName() throws InterruptedException, ExecutionException,
            TimeoutException {
-      String containerName = containerNames.poll(30, TimeUnit.SECONDS);
+      String containerName = containerJsr330.poll(30, TimeUnit.SECONDS);
      assert containerName != null : "unable to get a container for the test";
      emptyContainer(containerName);
      return containerName;
@ -357,7 +357,7 @@ public class BaseBlobStoreIntegrationTest<S extends BlobStore<C, M, B>, C extend
   public void returnContainer(final String containerName) throws InterruptedException,
            ExecutionException, TimeoutException {
      if (containerName != null) {
-         containerNames.add(containerName);
+         containerJsr330.add(containerName);
         /*
          * Ensure that any returned container name actually exists on the server. Return of a
          * non-existent container introduces subtle testing bugs, where later unrelated tests will
--- a/core/pom.xml
+++ b/core/pom.xml
@ -70,12 +70,17 @@
        <dependency>
            <groupId>com.google.code.guice</groupId>
            <artifactId>guice</artifactId>
-            <version>2.1-r1039</version>
+            <version>2.1-r1089</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>atinject</artifactId>
+            <version>1.0</version>
        </dependency>
        <dependency>
            <groupId>com.google.code.guice</groupId>
            <artifactId>guice-assistedinject</artifactId>
-            <version>2.0</version>
+            <version>2.1-r1089</version>
        </dependency>
        <dependency>
            <groupId>com.google.collections</groupId>
--- a/core/src/main/java/org/jclouds/cloud/CloudContextBuilder.java
+++ b/core/src/main/java/org/jclouds/cloud/CloudContextBuilder.java
@ -64,7 +64,7 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
-import com.google.inject.name.Names;
+import org.jclouds.util.Jsr330;

 /**
 * Creates {@link CloudContext} or {@link Injector} instances based on the most commonly requested
@ -199,7 +199,7 @@ public abstract class CloudContextBuilder<X extends CloudContext<?>> {
      modules.add(new AbstractModule() {
         @Override
         protected void configure() {
-            Names.bindProperties(binder(), checkNotNull(properties, "properties"));
+            Jsr330.bindProperties(binder(), checkNotNull(properties, "properties"));
         }
      });
      addContextModule(modules);
--- a/core/src/main/java/org/jclouds/http/TransformingHttpCommandExecutorServiceImpl.java
+++ b/core/src/main/java/org/jclouds/http/TransformingHttpCommandExecutorServiceImpl.java
@ -30,7 +30,7 @@ import java.util.concurrent.Future;
 import org.jclouds.concurrent.FutureFunctionCallable;

 import com.google.common.base.Function;
-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Executor which will invoke and transform the response of an {@code EndpointCommand} into generic
--- a/core/src/main/java/org/jclouds/http/TransformingHttpCommandImpl.java
+++ b/core/src/main/java/org/jclouds/http/TransformingHttpCommandImpl.java
@ -36,7 +36,7 @@ import javax.ws.rs.core.UriBuilder;
 import org.jclouds.logging.Logger;

 import com.google.common.base.Function;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 import com.google.inject.internal.Nullable;

--- a/core/src/main/java/org/jclouds/http/annotation/ClientError.java
+++ b/core/src/main/java/org/jclouds/http/annotation/ClientError.java
@ -23,7 +23,7 @@
 */
 package org.jclouds.http.annotation;

-import com.google.inject.BindingAnnotation;
+import javax.inject.Qualifier;
 import java.lang.annotation.Target;
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@ -37,7 +37,7 @@ import static java.lang.annotation.ElementType.METHOD;
 * 
 * @author Adrian Cole
 */
-@BindingAnnotation
+@Qualifier
@Target( { FIELD, PARAMETER, METHOD })
@Retention(RUNTIME)
 public @interface ClientError {
--- a/core/src/main/java/org/jclouds/http/annotation/Redirection.java
+++ b/core/src/main/java/org/jclouds/http/annotation/Redirection.java
@ -23,7 +23,7 @@
 */
 package org.jclouds.http.annotation;

-import com.google.inject.BindingAnnotation;
+import javax.inject.Qualifier;
 import java.lang.annotation.Target;
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@ -37,7 +37,7 @@ import static java.lang.annotation.ElementType.METHOD;
 * 
 * @author Adrian Cole
 */
-@BindingAnnotation
+@Qualifier
@Target( { FIELD, PARAMETER, METHOD })
@Retention(RUNTIME)
 public @interface Redirection {
--- a/core/src/main/java/org/jclouds/http/annotation/ServerError.java
+++ b/core/src/main/java/org/jclouds/http/annotation/ServerError.java
@ -23,7 +23,7 @@
 */
 package org.jclouds.http.annotation;

-import com.google.inject.BindingAnnotation;
+import javax.inject.Qualifier;
 import java.lang.annotation.Target;
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@ -37,7 +37,7 @@ import static java.lang.annotation.ElementType.METHOD;
 * 
 * @author Adrian Cole
 */
-@BindingAnnotation
+@Qualifier
@Target( { FIELD, PARAMETER, METHOD })
@Retention(RUNTIME)
 public @interface ServerError {
--- a/core/src/main/java/org/jclouds/http/binders/JsonBinder.java
+++ b/core/src/main/java/org/jclouds/http/binders/JsonBinder.java
@ -35,7 +35,7 @@ import org.jclouds.http.HttpRequest;
 import org.jclouds.rest.MapEntityBinder;

 import com.google.gson.Gson;
-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Binds the object to the request as a json object.
--- a/core/src/main/java/org/jclouds/http/functions/ParseJson.java
+++ b/core/src/main/java/org/jclouds/http/functions/ParseJson.java
@ -36,8 +36,8 @@ import org.jclouds.logging.Logger;

 import com.google.common.base.Function;
 import com.google.gson.Gson;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;

 /**
 * This object will parse the body of an HttpResponse and return the result of type <T> back to the
--- a/core/src/main/java/org/jclouds/http/functions/ParseSax.java
+++ b/core/src/main/java/org/jclouds/http/functions/ParseSax.java
@ -41,9 +41,9 @@ import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;

 import com.google.common.base.Function;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
-import com.google.inject.name.Named;
+import javax.inject.Named;

 /**
 * This object will parse the body of an HttpResponse and return the result of type <T> back to the
--- a/core/src/main/java/org/jclouds/http/functions/config/ParserModule.java
+++ b/core/src/main/java/org/jclouds/http/functions/config/ParserModule.java
@ -48,7 +48,7 @@ import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
-import com.google.inject.Singleton;
+import javax.inject.Singleton;
 import com.google.inject.TypeLiteral;
 import com.google.inject.assistedinject.FactoryProvider;

--- a/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java
+++ b/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java
@ -32,8 +32,8 @@ import org.jclouds.http.HttpRetryHandler;
 import org.jclouds.http.TransformingHttpCommand;
 import org.jclouds.logging.Logger;

-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;

 /**
 * Allow replayable request to be retried a limited number of times, and impose an exponential
--- a/core/src/main/java/org/jclouds/http/handlers/DelegatingErrorHandler.java
+++ b/core/src/main/java/org/jclouds/http/handlers/DelegatingErrorHandler.java
@ -31,7 +31,7 @@ import org.jclouds.http.annotation.Redirection;
 import org.jclouds.http.annotation.ServerError;

 import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Delegates to {@link HttpErrorHandler HttpErrorHandlers} who are annotated according to the
--- a/core/src/main/java/org/jclouds/http/handlers/DelegatingRetryHandler.java
+++ b/core/src/main/java/org/jclouds/http/handlers/DelegatingRetryHandler.java
@ -31,7 +31,7 @@ import org.jclouds.http.annotation.Redirection;
 import org.jclouds.http.annotation.ServerError;

 import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Delegates to {@link HttpRetryHandler HttpRetryHandlers} who are annotated according to the
--- a/core/src/main/java/org/jclouds/http/handlers/RedirectionRetryHandler.java
+++ b/core/src/main/java/org/jclouds/http/handlers/RedirectionRetryHandler.java
@ -38,8 +38,8 @@ import org.jclouds.http.HttpRetryHandler;
 import org.jclouds.logging.Logger;

 import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;

 /**
 * Handles Retryable responses with error codes in the 3xx range
@ -52,7 +52,6 @@ public class RedirectionRetryHandler implements HttpRetryHandler {
   @Resource
   protected Logger logger = Logger.NULL;

-   @Inject
   protected final BackoffLimitedRetryHandler backoffHandler;

   @Inject
--- a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
+++ b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
@ -49,8 +49,8 @@ import org.jclouds.http.handlers.DelegatingErrorHandler;
 import org.jclouds.http.handlers.DelegatingRetryHandler;

 import com.google.common.collect.Maps;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
+import javax.inject.Inject;
+import javax.inject.Named;

 /**
 * Basic implementation of a {@link HttpCommandExecutorService}.
--- a/core/src/main/java/org/jclouds/http/pool/ConnectionPoolTransformingHttpCommandExecutorService.java
+++ b/core/src/main/java/org/jclouds/http/pool/ConnectionPoolTransformingHttpCommandExecutorService.java
@ -46,7 +46,7 @@ import org.jclouds.util.Utils;

 import com.google.common.base.Function;
 import com.google.common.collect.MapMaker;
-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * // TODO: Adrian: Document this!
--- a/core/src/main/java/org/jclouds/http/pool/HttpCommandConnectionPool.java
+++ b/core/src/main/java/org/jclouds/http/pool/HttpCommandConnectionPool.java
@ -35,7 +35,7 @@ import org.jclouds.http.HttpCommandRendezvous;
 import org.jclouds.lifecycle.BaseLifeCycle;

 import com.google.inject.assistedinject.Assisted;
-import com.google.inject.name.Named;
+import javax.inject.Named;

 /**
 * // TODO: Adrian: Document this!
--- a/core/src/main/java/org/jclouds/http/pool/config/ConnectionPoolCommandExecutorServiceModule.java
+++ b/core/src/main/java/org/jclouds/http/pool/config/ConnectionPoolCommandExecutorServiceModule.java
@ -32,7 +32,7 @@ import org.jclouds.lifecycle.config.LifeCycleModule;

 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
-import com.google.inject.name.Named;
+import javax.inject.Named;

 /**
 * 
--- a/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java
+++ b/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java
@ -40,7 +40,7 @@ import javax.annotation.PreDestroy;
 import org.jclouds.lifecycle.Closer;

 import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.ProvisionException;
 import com.google.inject.TypeLiteral;
 import com.google.inject.spi.InjectionListener;
--- a/core/src/main/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResource.java
+++ b/core/src/main/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResource.java
@ -26,7 +26,7 @@ package org.jclouds.logging.config;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Predicate;
 import static com.google.common.collect.Sets.filter;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.ProvisionException;
 import com.google.inject.TypeLiteral;
 import com.google.inject.spi.InjectionListener;
--- a/core/src/main/java/org/jclouds/rest/HttpRequestOptionsBinder.java
+++ b/core/src/main/java/org/jclouds/rest/HttpRequestOptionsBinder.java
@ -28,7 +28,7 @@ import javax.ws.rs.core.HttpHeaders;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.options.HttpRequestOptions;

-import com.google.inject.Singleton;
+import javax.inject.Singleton;

 /**
 * Adds an entity to a request.
--- a/core/src/main/java/org/jclouds/rest/JaxrsAnnotationProcessor.java
+++ b/core/src/main/java/org/jclouds/rest/JaxrsAnnotationProcessor.java
@ -65,14 +65,14 @@ import com.google.common.collect.MapMaker;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Key;
-import com.google.inject.Singleton;
+import javax.inject.Singleton;
 import com.google.inject.TypeLiteral;
 import com.google.inject.assistedinject.Assisted;
 import com.google.inject.internal.Lists;
-import com.google.inject.name.Named;
+import javax.inject.Named;

 /**
 * Tests behavior of JaxrsUtil
--- a/core/src/main/java/org/jclouds/rest/RestClientFactory.java
+++ b/core/src/main/java/org/jclouds/rest/RestClientFactory.java
@ -28,7 +28,7 @@ import java.net.URI;

 import org.jclouds.rest.RestClientProxy.RestClientProxyFactory;

-import com.google.inject.Inject;
+import javax.inject.Inject;

 public class RestClientFactory {
   private final RestClientProxyFactory proxyFactory;
--- a/core/src/main/java/org/jclouds/rest/RestClientProxy.java
+++ b/core/src/main/java/org/jclouds/rest/RestClientProxy.java
@ -44,9 +44,9 @@ import org.jclouds.http.TransformingHttpCommand;
 import org.jclouds.logging.Logger;

 import com.google.common.base.Function;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
-import com.google.inject.name.Named;
+import javax.inject.Named;

 public class RestClientProxy implements InvocationHandler {
   private final JaxrsAnnotationProcessor util;
--- a/core/src/main/java/org/jclouds/rest/ToStringEntityBinder.java
+++ b/core/src/main/java/org/jclouds/rest/ToStringEntityBinder.java
@ -27,7 +27,7 @@ import javax.ws.rs.core.HttpHeaders;

 import org.jclouds.http.HttpRequest;

-import com.google.inject.Singleton;
+import javax.inject.Singleton;

 /**
 * Adds an entity to a request.
--- a/core/src/main/java/org/jclouds/util/Jsr330.java
+++ b/core/src/main/java/org/jclouds/util/Jsr330.java
@ -0,0 +1,80 @@
+/**
+ *
+ * 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;
+
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.inject.Named;
+
+import com.google.inject.Binder;
+import com.google.inject.Key;
+
+/**
+ * Utility methods for use with {@code @}{@link Named}.
+ * 
+ * @author crazybob@google.com (Bob Lee) - original code taken from
+ *         {@link com.google.inject.name.Names}
+ * @author Adrian Cole
+ */
+public class Jsr330 {
+
+   /**
+    * @see org.jclouds.util.Jsr330#named
+    */
+   public static Named named(String name) {
+      return com.google.inject.util.Jsr330.named(name);
+   }
+
+   /**
+    * Creates a constant binding to {@code @Named(key)} for each entry in {@code properties}.
+    */
+   public static void bindProperties(Binder binder, Map<String, String> properties) {
+      binder = binder.skipSources(Jsr330.class);
+      for (Map.Entry<String, String> entry : properties.entrySet()) {
+         String key = entry.getKey();
+         String value = entry.getValue();
+         binder.bind(Key.get(String.class, com.google.inject.util.Jsr330.named(key))).toInstance(
+                  value);
+      }
+   }
+
+   /**
+    * Creates a constant binding to {@code @Named(key)} for each property. This method binds all
+    * properties including those inherited from {@link Properties#defaults defaults}.
+    */
+   public static void bindProperties(Binder binder, Properties properties) {
+      binder = binder.skipSources(Jsr330.class);
+
+      // use enumeration to include the default properties
+      for (Enumeration<?> e = properties.propertyNames(); e.hasMoreElements();) {
+         String propertyName = (String) e.nextElement();
+         String value = properties.getProperty(propertyName);
+         binder.bind(Key.get(String.class, com.google.inject.util.Jsr330.named(propertyName)))
+                  .toInstance(value);
+      }
+   }
+
+}
--- a/core/src/test/java/org/jclouds/http/BaseJettyTest.java
+++ b/core/src/test/java/org/jclouds/http/BaseJettyTest.java
@ -54,7 +54,7 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
-import com.google.inject.name.Names;
+import org.jclouds.util.Jsr330;

 public abstract class BaseJettyTest {
   protected static final String XML = "<foo><bar>whoppers</bar></foo>";
@ -147,7 +147,7 @@ public abstract class BaseJettyTest {
      List<Module> modules = Lists.newArrayList(new AbstractModule() {
         @Override
         protected void configure() {
-            Names.bindProperties(binder(), properties);
+            Jsr330.bindProperties(binder(), properties);
         }
      }, new JDKLoggingModule(), new JaxrsModule(), createClientModule());
      CloudContextBuilder.addExecutorServiceIfNotPresent(modules);
--- a/core/src/test/java/org/jclouds/lifecycle/config/LifeCycleModuleTest.java
+++ b/core/src/test/java/org/jclouds/lifecycle/config/LifeCycleModuleTest.java
@ -36,7 +36,7 @@ import org.testng.annotations.Test;

 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;

 /**
--- a/core/src/test/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResourceTest.java
+++ b/core/src/test/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResourceTest.java
@ -41,7 +41,7 @@ import org.testng.annotations.Test;

 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;

@Test
--- a/core/src/test/java/org/jclouds/rest/JaxrsAnnotationProcessorTest.java
+++ b/core/src/test/java/org/jclouds/rest/JaxrsAnnotationProcessorTest.java
@ -39,6 +39,7 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.Future;

+import javax.inject.Named;
 import javax.ws.rs.GET;
 import javax.ws.rs.HeaderParam;
 import javax.ws.rs.HttpMethod;
@ -73,8 +74,7 @@ import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
-import com.google.inject.name.Named;
-import com.google.inject.name.Names;
+import org.jclouds.util.Jsr330;

 /**
 * Tests behavior of {@code JaxrsAnnotationProcessor}
@ -990,7 +990,7 @@ public class JaxrsAnnotationProcessorTest {
      factory = Guice.createInjector(new AbstractModule() {
         @Override
         protected void configure() {
-            bindConstant().annotatedWith(Names.named("testaccount")).to("ralphie");
+            bindConstant().annotatedWith(Jsr330.named("testaccount")).to("ralphie");
            bind(URI.class).toInstance(URI.create("http://localhost:8080"));
         }
      }, new JaxrsModule(), new ExecutorServiceModule(new WithinThreadExecutorService()),
--- a/extensions/gae/src/main/java/org/jclouds/gae/GaeHttpCommandExecutorService.java
+++ b/extensions/gae/src/main/java/org/jclouds/gae/GaeHttpCommandExecutorService.java
@ -56,7 +56,7 @@ import com.google.appengine.api.urlfetch.HTTPRequest;
 import com.google.appengine.api.urlfetch.HTTPResponse;
 import com.google.appengine.api.urlfetch.URLFetchService;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * Google App Engine version of {@link HttpCommandExecutorService}
--- a/extensions/gae/src/test/java/org/jclouds/gae/config/GaeHttpCommandExecutorServiceModuleTest.java
+++ b/extensions/gae/src/test/java/org/jclouds/gae/config/GaeHttpCommandExecutorServiceModuleTest.java
@ -37,7 +37,7 @@ import org.testng.annotations.Test;

 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import com.google.inject.name.Names;
+import org.jclouds.util.Jsr330;

 /**
 * Tests the ability to configure a {@link GaeHttpCommandExecutorService}
@ -58,7 +58,7 @@ public class GaeHttpCommandExecutorServiceModuleTest {
               new GaeHttpCommandExecutorServiceModule() {
                  @Override
                  protected void configure() {
-                     Names.bindProperties(binder(), properties);
+                     Jsr330.bindProperties(binder(), properties);
                     super.configure();
                  }
               });
--- a/extensions/httpnio/src/main/java/org/jclouds/http/httpnio/config/NioTransformingHttpCommandExecutorServiceModule.java
+++ b/extensions/httpnio/src/main/java/org/jclouds/http/httpnio/config/NioTransformingHttpCommandExecutorServiceModule.java
@ -27,6 +27,10 @@ import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;

+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import org.apache.http.ConnectionReuseStrategy;
 import org.apache.http.HttpEntity;
 import org.apache.http.impl.DefaultConnectionReuseStrategy;
@ -57,14 +61,11 @@ import org.jclouds.http.httpnio.pool.NioTransformingHttpCommandExecutorService;
 import org.jclouds.http.pool.PoolConstants;
 import org.jclouds.http.pool.config.ConnectionPoolCommandExecutorServiceModule;

-import com.google.inject.Inject;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
-import com.google.inject.Singleton;
 import com.google.inject.TypeLiteral;
 import com.google.inject.assistedinject.Assisted;
 import com.google.inject.assistedinject.FactoryProvider;
-import com.google.inject.name.Named;

 /**
 * 
@ -125,8 +126,7 @@ public class NioTransformingHttpCommandExecutorServiceModule extends
               Scopes.SINGLETON);
      bind(ByteBufferAllocator.class).to(HeapByteBufferAllocator.class);
      bind(NioHttpCommandConnectionPool.Factory.class).toProvider(
-               FactoryProvider.newFactory(
-                        new TypeLiteral<NioHttpCommandConnectionPool.Factory>() {
+               FactoryProvider.newFactory(new TypeLiteral<NioHttpCommandConnectionPool.Factory>() {
               }, new TypeLiteral<NioHttpCommandConnectionPool>() {
               }));
   }
--- a/extensions/httpnio/src/main/java/org/jclouds/http/httpnio/pool/NioHttpCommandConnectionPool.java
+++ b/extensions/httpnio/src/main/java/org/jclouds/http/httpnio/pool/NioHttpCommandConnectionPool.java
@ -58,9 +58,9 @@ import org.jclouds.http.pool.HttpCommandConnectionPool;
 import org.jclouds.http.pool.PoolConstants;

 import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
-import com.google.inject.name.Named;
+import javax.inject.Named;

 /**
 * Connection Pool for HTTP requests that utilizes Apache HTTPNio
--- a/extensions/httpnio/src/main/java/org/jclouds/http/httpnio/pool/NioHttpCommandExecutionHandler.java
+++ b/extensions/httpnio/src/main/java/org/jclouds/http/httpnio/pool/NioHttpCommandExecutionHandler.java
@ -43,7 +43,7 @@ import org.jclouds.http.handlers.DelegatingRetryHandler;
 import org.jclouds.http.httpnio.util.NioHttpUtils;
 import org.jclouds.logging.Logger;

-import com.google.inject.Inject;
+import javax.inject.Inject;

 /**
 * // TODO: Adrian: Document this!
--- a/extensions/httpnio/src/main/java/org/jclouds/http/httpnio/pool/NioTransformingHttpCommandExecutorService.java
+++ b/extensions/httpnio/src/main/java/org/jclouds/http/httpnio/pool/NioTransformingHttpCommandExecutorService.java
@ -30,8 +30,8 @@ import org.apache.http.nio.NHttpConnection;
 import org.jclouds.http.HttpCommandRendezvous;
 import org.jclouds.http.pool.ConnectionPoolTransformingHttpCommandExecutorService;

-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;

 /**
 * // TODO: Adrian: Document this!
--- a/Show More
+++ b/Show More