[infinispan-commits] Infinispan SVN: r1384 - in trunk/cachestore/cloud: src/main/scala/org/infinispan/loaders/cloud and 1 other directories.

[infinispan-commits at lists.jboss.org]

Author: adriancole
Date: 2010-01-16 12:35:57 -0500 (Sat, 16 Jan 2010)
New Revision: 1384

Added:
   trunk/cachestore/cloud/README.txt
Modified:
   trunk/cachestore/cloud/pom.xml
   trunk/cachestore/cloud/src/main/scala/org/infinispan/loaders/cloud/CloudCacheStore.scala
   trunk/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreFunctionalIntegrationTest.java
Log:
updated to work with current jclouds cachestore

Added: trunk/cachestore/cloud/README.txt
===================================================================
--- trunk/cachestore/cloud/README.txt	                        (rev 0)
+++ trunk/cachestore/cloud/README.txt	2010-01-16 17:35:57 UTC (rev 1384)
@@ -0,0 +1,3 @@
+ mvn test -Dtest=CloudCacheStoreFunctionalIntegrationTest -Dinfinispan.jclouds.username=$S3_USER -Dinfinispan.jclouds.password=$S3_PWD -Dinfinispan.jclouds.service=s3
+ mvn test -Dtest=CloudCacheStoreFunctionalIntegrationTest -Dinfinispan.jclouds.username=$RACKSPACE_USER -Dinfinispan.jclouds.password=$RACKSPACE_PWD -Dinfinispan.jclouds.service=cloudfiles
+ mvn test -Dtest=CloudCacheStoreFunctionalIntegrationTest -Dinfinispan.jclouds.username=$AZURE_USER -Dinfinispan.jclouds.password=$AZURE_PWD -Dinfinispan.jclouds.service=azureblob

Modified: trunk/cachestore/cloud/pom.xml
===================================================================
--- trunk/cachestore/cloud/pom.xml	2010-01-16 16:09:34 UTC (rev 1383)
+++ trunk/cachestore/cloud/pom.xml	2010-01-16 17:35:57 UTC (rev 1384)
@@ -38,21 +38,11 @@
       </dependency>
       <dependency>
          <groupId>org.jclouds</groupId>
-         <artifactId>jclouds-joda</artifactId>
+         <artifactId>jclouds-enterprise</artifactId>
          <version>${version.jclouds}</version>
       </dependency>
       <dependency>
          <groupId>org.jclouds</groupId>
-         <artifactId>jclouds-bouncycastle</artifactId>
-         <version>${version.jclouds}</version>
-      </dependency>
-      <dependency>
-         <groupId>org.jclouds</groupId>
-         <artifactId>jclouds-httpnio</artifactId>
-         <version>${version.jclouds}</version>
-      </dependency>
-      <dependency>
-         <groupId>org.jclouds</groupId>
          <artifactId>jclouds-log4j</artifactId>
          <version>${version.jclouds}</version>
       </dependency>
@@ -98,7 +88,6 @@
 
    <build>
       <sourceDirectory>src/main/scala</sourceDirectory>
-      <testSourceDirectory>src/test/scala</testSourceDirectory>
 
       <plugins>
          <plugin>

Modified: trunk/cachestore/cloud/src/main/scala/org/infinispan/loaders/cloud/CloudCacheStore.scala
===================================================================
--- trunk/cachestore/cloud/src/main/scala/org/infinispan/loaders/cloud/CloudCacheStore.scala	2010-01-16 16:09:34 UTC (rev 1383)
+++ trunk/cachestore/cloud/src/main/scala/org/infinispan/loaders/cloud/CloudCacheStore.scala	2010-01-16 17:35:57 UTC (rev 1384)
@@ -18,7 +18,10 @@
 import org.infinispan.loaders.{LockSupportCacheStoreConfig, CacheLoaderConfig, CacheLoaderException}
 import org.jclouds.blobstore._
 import org.scala_tools.javautils.Imports._
-import org.jclouds.concurrent.config.ExecutorServiceModule
+import org.jclouds.enterprise.config.EnterpriseConfigurationModule;
+import org.jclouds.logging.log4j.config.Log4JLoggingModule;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Module;
 
 /**
  * The CloudCacheStore implementation that utilizes <a href="http://code.google.com/p/jclouds">JClouds</a> to communicate
@@ -71,7 +74,8 @@
       if (cfg.password == null) throw new ConfigurationException("Password must be set")
       if (cfg.bucketPrefix == null) throw new ConfigurationException("CloudBucket must be set")
       containerName = getThisContainerName
-      ctx = new BlobStoreContextFactory().createContext(cfg.cloudService, cfg.identity, cfg.password).asInstanceOf[BlobStoreContext[Any, Any]]
+      // add an executor as a constructor param to EnterpriseConfigurationModule, pass property overrides instead of Properties()
+      ctx = new BlobStoreContextFactory().createContext(cfg.cloudService, cfg.identity, cfg.password, ImmutableSet.of(new EnterpriseConfigurationModule(), new Log4JLoggingModule()), new Properties()).asInstanceOf[BlobStoreContext[Any, Any]]
       val bs = ctx.getBlobStore
       // the "location" is not currently used.
       if (!bs.containerExists(containerName)) bs.createContainerInLocation(null, containerName)
@@ -272,4 +276,4 @@
    def this(m: String) = this (m, null)
 
    def this(c: Throwable) = this ("", c)
-}
\ No newline at end of file
+}

Modified: trunk/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreFunctionalIntegrationTest.java
===================================================================
--- trunk/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreFunctionalIntegrationTest.java	2010-01-16 16:09:34 UTC (rev 1383)
+++ trunk/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreFunctionalIntegrationTest.java	2010-01-16 17:35:57 UTC (rev 1384)
@@ -58,7 +58,8 @@
          accessKey = "dummy";
          secretKey = "dummy";
       }
-      csBucket = (System.getProperty("user.name") + "." + this.getClass().getSimpleName()).toLowerCase();
+      csBucket = (System.getProperty("user.name") + "." + this.getClass().getSimpleName()).toLowerCase().replace('.', '-'); // azure limitation on no periods
+      csBucket = csBucket.length() > 32 ? csBucket.substring(0, 32): csBucket;//azure limitation on length
       System.out.printf("accessKey: %1$s, bucket: %2$s%n", accessKey, csBucket);
    }