Issue 440: split Eucalyptus Community Cloud (ecc-s3) into a provider, and moved walrus to be an api

README.txt

@@ -39,8 +39,9 @@ our compute api supports: aws-ec2, gogrid, cloudservers (rackspace), vcloud,
            to all of these providers
 
 our blobstore api supports: aws-s3, cloudfiles (rackspace), azurestorage, atmosonline,
-                            synaptic, peer1-storage, walrus, googlestorage, 
+                            synaptic, peer1-storage, s3 (generic), walrus(generic),
-                            scaleup-storage, transient (in-memory), filesystem (on-disk)
+                            googlestorage, scaleup-storage, ecc-s3, transient (in-mem),
+                            filesystem (on-disk)
  
   * note * the pom dependency org.jclouds/jclouds-allblobstore gives you access to
            to all of these providers

allblobstore/pom.xml

@@ -50,10 +50,15 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.provider</groupId>
+            <groupId>org.jclouds.api</groupId>
             <artifactId>walrus</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jclouds.provider</groupId>
+            <artifactId>ecc-s3</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>jclouds-azure</artifactId>

apis/pom.xml

@@ -40,5 +40,6 @@
        <module>sqs</module>
        <module>simpledb</module>
        <module>cloudwatch</module>
+       <module>walrus</module>
     </modules>
 </project>

apis/walrus/pom.xml

@@ -24,14 +24,14 @@
     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.provider</groupId>
+        <groupId>org.jclouds.api</groupId>
-        <artifactId>jclouds-providers-project</artifactId>
+        <artifactId>jclouds-apis-project</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>walrus</artifactId>
-    <name>jclouds Eucalyptus Walrus provider</name>
+    <name>jclouds Eucalyptus Walrus api</name>
-    <description>Simple Storage Service (S3) implementation targeted to Eucalyptus Walrus</description>
+    <description>Simple Storage Service (S3) implementation based on Eucalyptus Walrus</description>
 
     <properties>
         <test.initializer>org.jclouds.walrus.blobstore.WalrusTestInitializer</test.initializer>

apis/walrus/src/main/java/org/jclouds/walrus/WalrusPropertiesBuilder.java

@@ -20,8 +20,6 @@
 package org.jclouds.walrus;
 
 import static org.jclouds.Constants.PROPERTY_API_VERSION;
-import static org.jclouds.Constants.PROPERTY_ENDPOINT;
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
 import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_SERVICE_PATH;
 import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_VIRTUAL_HOST_BUCKETS;
 
@@ -38,10 +36,7 @@ public class WalrusPropertiesBuilder extends S3PropertiesBuilder {
    @Override
    protected Properties defaultProperties() {
       Properties properties = super.defaultProperties();
-      properties.setProperty(PROPERTY_REGIONS, "Walrus");
       properties.setProperty(PROPERTY_API_VERSION, "Walrus-1.6");
-      properties.setProperty(PROPERTY_ENDPOINT, "http://ecc.eucalyptus.com:8773/services/Walrus");
-      properties.setProperty(PROPERTY_ENDPOINT + ".Walrus", "http://ecc.eucalyptus.com:8773/services/Walrus");
       properties.setProperty(PROPERTY_S3_SERVICE_PATH, "/services/Walrus");
       properties.setProperty(PROPERTY_S3_VIRTUAL_HOST_BUCKETS, "false");
       return properties;

blobstore/src/main/clojure/org/jclouds/blobstore.clj

@@ -22,7 +22,7 @@
 
 Current supported services are:
    [transient, filesystem, s3, azureblob, atmos, cloudfiles, walrus,
-    googlestorage, synaptic, peer1-storage]
+    googlestorage, synaptic, peer1-storage, aws-s3, ecc-s3]
 
 Here's a quick example of how to viewresources in rackspace
 

core/src/main/resources/rest.properties

@@ -156,6 +156,9 @@ cloudfiles.propertiesbuilder=org.jclouds.rackspace.cloudfiles.CloudFilesProperti
 walrus.contextbuilder=org.jclouds.s3.S3ContextBuilder
 walrus.propertiesbuilder=org.jclouds.walrus.WalrusPropertiesBuilder
 
+ecc-s3.contextbuilder=org.jclouds.s3.S3ContextBuilder
+ecc-s3.propertiesbuilder=org.jclouds.ecc.ECCWalrusPropertiesBuilder
+
 googlestorage.contextbuilder=org.jclouds.s3.S3ContextBuilder
 googlestorage.propertiesbuilder=org.jclouds.googlestorage.GoogleStoragePropertiesBuilder
 

providers/ecc-s3/pom.xml

@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+
+    ====================================================================
+    Licensed 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.
+    ====================================================================
+
+-->
+
+<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.provider</groupId>
+        <artifactId>jclouds-providers-project</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>ecc-s3</artifactId>
+    <name>jclouds Eucalyptus Community Cloud provider</name>
+    <description>Walrus (S3) implementation targeted to the Eucalyptus Community Cloud</description>
+
+    <properties>
+        <test.initializer>org.jclouds.ecc.blobstore.ECCWalrusTestInitializer</test.initializer>
+        <test.ecc-s3.endpoint>http://ecc.eucalyptus.com:8773/services/Walrus</test.ecc-s3.endpoint>
+        <test.ecc-s3.apiversion>2006-03-01</test.ecc-s3.apiversion>
+        <test.ecc-s3.identity>${test.eucalyptus.identity}</test.ecc-s3.identity>
+        <test.ecc-s3.credential>${test.eucalyptus.credential}</test.ecc-s3.credential>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>walrus</artifactId>
+            <version>${project.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>s3</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>walrus</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds</groupId>
+            <artifactId>jclouds-core</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds</groupId>
+            <artifactId>jclouds-blobstore</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds</groupId>
+            <artifactId>jclouds-log4j</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.16</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>live</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>integration</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <systemProperties>
+                                        <property>
+                                            <name>test.ecc-s3.endpoint</name>
+                                            <value>${test.ecc-s3.endpoint}</value>
+                                        </property>
+                                        <property>
+                                            <name>test.ecc-s3.apiversion</name>
+                                            <value>${test.ecc-s3.apiversion}</value>
+                                        </property>
+                                        <property>
+                                            <name>test.ecc-s3.identity</name>
+                                            <value>${test.ecc-s3.identity}</value>
+                                        </property>
+                                        <property>
+                                            <name>test.ecc-s3.credential</name>
+                                            <value>${test.ecc-s3.credential}</value>
+                                        </property>
+                                        <property>
+                                            <name>test.initializer</name>
+                                            <value>${test.initializer}</value>
+                                        </property>
+                                        <property>
+                                            <name>jclouds.blobstore.httpstream.url</name>
+                                            <value>${jclouds.blobstore.httpstream.url}</value>
+                                        </property>
+                                        <property>
+                                            <name>jclouds.blobstore.httpstream.md5</name>
+                                            <value>${jclouds.blobstore.httpstream.md5}</value>
+                                        </property>
+                                    </systemProperties>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+
+</project>
+

providers/ecc-s3/src/main/java/org/jclouds/ecc/ECCWalrusPropertiesBuilder.java

@@ -0,0 +1,45 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ecc;
+
+import static org.jclouds.Constants.PROPERTY_ENDPOINT;
+
+import java.util.Properties;
+
+import org.jclouds.walrus.WalrusPropertiesBuilder;
+
+/**
+ * Builds properties used in ECCWalrus Clients
+ * 
+ * @author Adrian Cole
+ */
+public class ECCWalrusPropertiesBuilder extends WalrusPropertiesBuilder {
+   @Override
+   protected Properties defaultProperties() {
+      Properties properties = super.defaultProperties();
+      properties.setProperty(PROPERTY_ENDPOINT, "http://ecc.eucalyptus.com:8773/services/ECCWalrus");
+      return properties;
+   }
+
+   public ECCWalrusPropertiesBuilder(Properties properties) {
+      super(properties);
+   }
+
+}

providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusAsyncClientTestDisabled.java

@@ -0,0 +1,37 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ecc;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author Adrian Cole
+ */
+// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire
+@Test(enabled = false, groups = "unit", testName = "ECCWalrusAsyncClientTest")
+public class ECCWalrusAsyncClientTestDisabled extends org.jclouds.walrus.WalrusAsyncClientTestDisabled {
+
+   public ECCWalrusAsyncClientTestDisabled() {
+      this.provider = "ecc";
+      this.url = "commondatastorage.googleapis.com";
+   }
+
+   // TODO parameterize this test so that it can pass
+}

providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusClientLiveTest.java

@@ -0,0 +1,33 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ecc;
+
+import org.jclouds.walrus.WalrusClientLiveTest;
+import org.testng.annotations.Test;
+
+/**
+ * Tests behavior of {@code S3Client}
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "live", sequential = true, testName = "ECCWalrusClientLiveTest")
+public class ECCWalrusClientLiveTest extends WalrusClientLiveTest {
+
+}

providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobIntegrationLiveTest.java

@@ -0,0 +1,40 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ecc.blobstore;
+
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+
+import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Adrian Cole
+ */
+@Test(groups =  "live", testName = "ECCWalrusBlobIntegrationLiveTest")
+public class ECCWalrusBlobIntegrationLiveTest extends BaseBlobIntegrationTest {
+
+   @Override
+   @Test(expectedExceptions = IllegalArgumentException.class)
+   public void testPutObjectStream() throws InterruptedException, IOException, ExecutionException {
+      super.testPutObjectStream();
+   }
+
+}

providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobLiveTest.java

@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ecc.blobstore;
+
+import org.jclouds.blobstore.integration.internal.BaseBlobLiveTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Adrian Cole
+ */
+@Test(groups =  "live", testName = "ECCWalrusBlobLiveTest")
+public class ECCWalrusBlobLiveTest extends BaseBlobLiveTest {
+
+}

providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobMapIntegrationLiveTest.java

@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ecc.blobstore;
+
+import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Adrian Cole
+ */
+@Test(groups =  "live", testName = "ECCWalrusBlobMapIntegrationLiveTest")
+public class ECCWalrusBlobMapIntegrationLiveTest extends BaseBlobMapIntegrationTest {
+
+}

providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobSignerLiveTest.java

@@ -0,0 +1,32 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ecc.blobstore;
+
+import org.jclouds.blobstore.integration.internal.BaseBlobSignerLiveTest;
+import org.testng.annotations.Test;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups =  "live", testName = "ECCWalrusBlobSignerLiveTest")
+public class ECCWalrusBlobSignerLiveTest extends BaseBlobSignerLiveTest {
+
+}

providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerIntegrationLiveTest.java

@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ecc.blobstore;
+
+import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Adrian Cole
+ */
+@Test(groups =  "live", testName = "ECCWalrusContainerIntegrationLiveTest")
+public class ECCWalrusContainerIntegrationLiveTest extends BaseContainerIntegrationTest {
+
+}

providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerLiveTest.java

@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ecc.blobstore;
+
+import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Adrian Cole
+ */
+@Test(groups =  "live", testName = "ECCWalrusContainerLiveTest")
+public class ECCWalrusContainerLiveTest extends BaseContainerLiveTest {
+
+}

providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusInputStreamMapIntegrationLiveTest.java

@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ecc.blobstore;
+
+import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Adrian Cole
+ */
+@Test(groups =  "live", testName = "ECCWalrusInputStreamMapIntegrationLiveTest")
+public class ECCWalrusInputStreamMapIntegrationLiveTest extends BaseInputStreamMapIntegrationTest {
+
+}

providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusServiceIntegrationLiveTest.java

@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ecc.blobstore;
+
+import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Adrian Cole
+ */
+@Test(groups =  "live", testName = "ECCWalrusServiceIntegrationLiveTest")
+public class ECCWalrusServiceIntegrationLiveTest extends BaseServiceIntegrationTest {
+
+}

providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusTestInitializer.java

@@ -0,0 +1,51 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.ecc.blobstore;
+
+import java.io.IOException;
+
+import org.jclouds.blobstore.BlobStoreContext;
+import org.jclouds.blobstore.BlobStoreContextFactory;
+import org.jclouds.blobstore.integration.TransientBlobStoreTestInitializer;
+import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest;
+import org.jclouds.logging.log4j.config.Log4JLoggingModule;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Module;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+public class ECCWalrusTestInitializer extends TransientBlobStoreTestInitializer {
+
+   public ECCWalrusTestInitializer() {
+      provider = "ecc-s3";
+      BaseBlobStoreIntegrationTest.SANITY_CHECK_RETURNED_BUCKET_NAME = true;
+   }
+
+   @Override
+   protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion,
+            String app, String identity, String credential) throws IOException {
+      return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
+               new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential));
+   }
+
+}

providers/pom.xml

@@ -41,6 +41,6 @@
         <module>aws-s3</module>
         <module>googlestorage</module>
         <module>scaleup-storage</module>
-        <module>walrus</module>
+        <module>ecc-s3</module>
     </modules>
 </project>