[infinispan-commits] Infinispan SVN: r504 - in trunk/cachestore/s3: src/main/java/org/infinispan/loaders/s3/jclouds and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: adriancole
Date: 2009-06-30 16:31:09 -0400 (Tue, 30 Jun 2009)
New Revision: 504

Modified:
   trunk/cachestore/s3/pom.xml
   trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/jclouds/JCloudsConnection.java
Log:
updated to jclouds beta 2

Modified: trunk/cachestore/s3/pom.xml
===================================================================
--- trunk/cachestore/s3/pom.xml	2009-06-29 11:31:56 UTC (rev 503)
+++ trunk/cachestore/s3/pom.xml	2009-06-30 20:31:09 UTC (rev 504)
@@ -37,19 +37,19 @@
       <dependency>
          <groupId>org.jclouds</groupId>
          <artifactId>jclouds-s3</artifactId>
-         <version>1.0-beta-1</version>
+         <version>1.0-beta-2</version>
       </dependency>
 
       <dependency>
          <groupId>org.jclouds</groupId>
          <artifactId>jclouds-httpnio</artifactId>
-         <version>1.0-beta-1</version>
+         <version>1.0-beta-2</version>
       </dependency>
 
       <dependency>
          <groupId>org.jclouds</groupId>
          <artifactId>jclouds-log4j</artifactId>
-         <version>1.0-beta-1</version>
+         <version>1.0-beta-2</version>
       </dependency>
 
       <dependency>

Modified: trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/jclouds/JCloudsConnection.java
===================================================================
--- trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/jclouds/JCloudsConnection.java	2009-06-29 11:31:56 UTC (rev 503)
+++ trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/jclouds/JCloudsConnection.java	2009-06-30 20:31:09 UTC (rev 504)
@@ -22,7 +22,7 @@
 
 /**
  * An JClouds implementation of {@link S3Connection}. This implementation uses the threadsafe {@link
- * S3HttpNioConnectionPoolClientModule} transport.
+ * HttpNioConnectionPoolClientModule} transport.
  *
  * @author Adrian Cole
  * @link http://code.google.com/p/jclouds
@@ -78,8 +78,7 @@
          // TODO proxy host/port
          Module loggingModule = org.infinispan.util.logging.LogFactory.IS_LOG4J_AVAILABLE ? new Log4JLoggingModule()
                : new JDKLoggingModule();
-         this.context = S3ContextFactory.createS3Context(properties,
-                                                         new HttpNioConnectionPoolClientModule(), loggingModule);
+         this.context = S3ContextFactory.createContext(config.getAwsAccessKey(),config.getAwsSecretKey()).withModules(new HttpNioConnectionPoolClientModule(), loggingModule).build();
          this.s3Service = context.getConnection();
          if (this.s3Service == null) {
             throw new S3ConnectionException("Could not connect");