diff --git a/README.txt b/README.txt index 3bf442c97b..cc220c25dc 100644 --- a/README.txt +++ b/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, - scaleup-storage, transient (in-memory), filesystem (on-disk) + synaptic, peer1-storage, s3 (generic), walrus(generic), + 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 diff --git a/allblobstore/pom.xml b/allblobstore/pom.xml index 4579112b14..a587728f03 100644 --- a/allblobstore/pom.xml +++ b/allblobstore/pom.xml @@ -50,10 +50,15 @@ ${project.version} - org.jclouds.provider + org.jclouds.api walrus ${project.version} + + org.jclouds.provider + ecc-s3 + ${project.version} + ${project.groupId} jclouds-azure diff --git a/apis/pom.xml b/apis/pom.xml index 74d70e6736..5de311a586 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -40,5 +40,6 @@ sqs simpledb cloudwatch + walrus diff --git a/providers/walrus/pom.xml b/apis/walrus/pom.xml similarity index 95% rename from providers/walrus/pom.xml rename to apis/walrus/pom.xml index 7fdd9518ae..10a5f9c32d 100644 --- a/providers/walrus/pom.xml +++ b/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" > 4.0.0 - org.jclouds.provider - jclouds-providers-project + org.jclouds.api + jclouds-apis-project 1.0-SNAPSHOT ../pom.xml walrus - jclouds Eucalyptus Walrus provider - Simple Storage Service (S3) implementation targeted to Eucalyptus Walrus + jclouds Eucalyptus Walrus api + Simple Storage Service (S3) implementation based on Eucalyptus Walrus org.jclouds.walrus.blobstore.WalrusTestInitializer diff --git a/providers/walrus/src/main/java/org/jclouds/walrus/WalrusPropertiesBuilder.java b/apis/walrus/src/main/java/org/jclouds/walrus/WalrusPropertiesBuilder.java similarity index 80% rename from providers/walrus/src/main/java/org/jclouds/walrus/WalrusPropertiesBuilder.java rename to apis/walrus/src/main/java/org/jclouds/walrus/WalrusPropertiesBuilder.java index 8df6f856a2..2b2c4c095a 100644 --- a/providers/walrus/src/main/java/org/jclouds/walrus/WalrusPropertiesBuilder.java +++ b/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; diff --git a/providers/walrus/src/test/java/org/jclouds/walrus/WalrusAsyncClientTestDisabled.java b/apis/walrus/src/test/java/org/jclouds/walrus/WalrusAsyncClientTestDisabled.java similarity index 100% rename from providers/walrus/src/test/java/org/jclouds/walrus/WalrusAsyncClientTestDisabled.java rename to apis/walrus/src/test/java/org/jclouds/walrus/WalrusAsyncClientTestDisabled.java diff --git a/providers/walrus/src/test/java/org/jclouds/walrus/WalrusClientLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/WalrusClientLiveTest.java similarity index 100% rename from providers/walrus/src/test/java/org/jclouds/walrus/WalrusClientLiveTest.java rename to apis/walrus/src/test/java/org/jclouds/walrus/WalrusClientLiveTest.java diff --git a/providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobIntegrationLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobIntegrationLiveTest.java similarity index 100% rename from providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobIntegrationLiveTest.java rename to apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobIntegrationLiveTest.java diff --git a/providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobLiveTest.java similarity index 100% rename from providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobLiveTest.java rename to apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobLiveTest.java diff --git a/providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobMapIntegrationLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobMapIntegrationLiveTest.java similarity index 100% rename from providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobMapIntegrationLiveTest.java rename to apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobMapIntegrationLiveTest.java diff --git a/providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobSignerLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobSignerLiveTest.java similarity index 100% rename from providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobSignerLiveTest.java rename to apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobSignerLiveTest.java diff --git a/providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerIntegrationLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerIntegrationLiveTest.java similarity index 100% rename from providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerIntegrationLiveTest.java rename to apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerIntegrationLiveTest.java diff --git a/providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerLiveTest.java similarity index 100% rename from providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerLiveTest.java rename to apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerLiveTest.java diff --git a/providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusInputStreamMapIntegrationLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusInputStreamMapIntegrationLiveTest.java similarity index 100% rename from providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusInputStreamMapIntegrationLiveTest.java rename to apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusInputStreamMapIntegrationLiveTest.java diff --git a/providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusServiceIntegrationLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusServiceIntegrationLiveTest.java similarity index 100% rename from providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusServiceIntegrationLiveTest.java rename to apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusServiceIntegrationLiveTest.java diff --git a/providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusTestInitializer.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusTestInitializer.java similarity index 100% rename from providers/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusTestInitializer.java rename to apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusTestInitializer.java diff --git a/blobstore/src/main/clojure/org/jclouds/blobstore.clj b/blobstore/src/main/clojure/org/jclouds/blobstore.clj index 3081e91ace..c9ec4ae62e 100644 --- a/blobstore/src/main/clojure/org/jclouds/blobstore.clj +++ b/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 diff --git a/core/src/main/resources/rest.properties b/core/src/main/resources/rest.properties index dcaca7b00a..688a92d401 100644 --- a/core/src/main/resources/rest.properties +++ b/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 diff --git a/providers/ecc-s3/pom.xml b/providers/ecc-s3/pom.xml new file mode 100644 index 0000000000..d65e2b1687 --- /dev/null +++ b/providers/ecc-s3/pom.xml @@ -0,0 +1,150 @@ + + + + + 4.0.0 + + org.jclouds.provider + jclouds-providers-project + 1.0-SNAPSHOT + ../pom.xml + + ecc-s3 + jclouds Eucalyptus Community Cloud provider + Walrus (S3) implementation targeted to the Eucalyptus Community Cloud + + + org.jclouds.ecc.blobstore.ECCWalrusTestInitializer + http://ecc.eucalyptus.com:8773/services/Walrus + 2006-03-01 + ${test.eucalyptus.identity} + ${test.eucalyptus.credential} + + + + + org.jclouds.api + walrus + ${project.version} + jar + + + org.jclouds.api + s3 + ${project.version} + test-jar + test + + + org.jclouds.api + walrus + ${project.version} + test-jar + test + + + org.jclouds + jclouds-core + ${project.version} + test-jar + test + + + org.jclouds + jclouds-blobstore + ${project.version} + test-jar + test + + + org.jclouds + jclouds-log4j + ${project.version} + test + + + log4j + log4j + 1.2.16 + test + + + + + + live + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration + integration-test + + test + + + + + test.ecc-s3.endpoint + ${test.ecc-s3.endpoint} + + + test.ecc-s3.apiversion + ${test.ecc-s3.apiversion} + + + test.ecc-s3.identity + ${test.ecc-s3.identity} + + + test.ecc-s3.credential + ${test.ecc-s3.credential} + + + test.initializer + ${test.initializer} + + + jclouds.blobstore.httpstream.url + ${jclouds.blobstore.httpstream.url} + + + jclouds.blobstore.httpstream.md5 + ${jclouds.blobstore.httpstream.md5} + + + + + + + + + + + + + + diff --git a/providers/ecc-s3/src/main/java/org/jclouds/ecc/ECCWalrusPropertiesBuilder.java b/providers/ecc-s3/src/main/java/org/jclouds/ecc/ECCWalrusPropertiesBuilder.java new file mode 100644 index 0000000000..49f1162c63 --- /dev/null +++ b/providers/ecc-s3/src/main/java/org/jclouds/ecc/ECCWalrusPropertiesBuilder.java @@ -0,0 +1,45 @@ +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * 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); + } + +} diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusAsyncClientTestDisabled.java b/providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusAsyncClientTestDisabled.java new file mode 100644 index 0000000000..cb9236cdae --- /dev/null +++ b/providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusAsyncClientTestDisabled.java @@ -0,0 +1,37 @@ +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * 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 +} diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusClientLiveTest.java b/providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusClientLiveTest.java new file mode 100644 index 0000000000..4acbd5d257 --- /dev/null +++ b/providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusClientLiveTest.java @@ -0,0 +1,33 @@ +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * 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 { + +} diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobIntegrationLiveTest.java b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobIntegrationLiveTest.java new file mode 100644 index 0000000000..f2890a1f05 --- /dev/null +++ b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobIntegrationLiveTest.java @@ -0,0 +1,40 @@ +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * 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(); + } + +} diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobLiveTest.java b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobLiveTest.java new file mode 100644 index 0000000000..63d83c0be8 --- /dev/null +++ b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobLiveTest.java @@ -0,0 +1,31 @@ +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * 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 { + +} diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobMapIntegrationLiveTest.java b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobMapIntegrationLiveTest.java new file mode 100644 index 0000000000..797c6027a5 --- /dev/null +++ b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobMapIntegrationLiveTest.java @@ -0,0 +1,31 @@ +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * 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 { + +} diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobSignerLiveTest.java b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobSignerLiveTest.java new file mode 100644 index 0000000000..a6f7fcc5c3 --- /dev/null +++ b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobSignerLiveTest.java @@ -0,0 +1,32 @@ +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * 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 { + +} diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerIntegrationLiveTest.java b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerIntegrationLiveTest.java new file mode 100644 index 0000000000..2f8e3747f3 --- /dev/null +++ b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerIntegrationLiveTest.java @@ -0,0 +1,31 @@ +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * 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 { + +} diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerLiveTest.java b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerLiveTest.java new file mode 100644 index 0000000000..45ff14c32f --- /dev/null +++ b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerLiveTest.java @@ -0,0 +1,31 @@ +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * 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 { + +} diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusInputStreamMapIntegrationLiveTest.java b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusInputStreamMapIntegrationLiveTest.java new file mode 100644 index 0000000000..f718fee518 --- /dev/null +++ b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusInputStreamMapIntegrationLiveTest.java @@ -0,0 +1,31 @@ +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * 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 { + +} diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusServiceIntegrationLiveTest.java b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusServiceIntegrationLiveTest.java new file mode 100644 index 0000000000..fee54268fe --- /dev/null +++ b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusServiceIntegrationLiveTest.java @@ -0,0 +1,31 @@ +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * 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 { + +} diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusTestInitializer.java b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusTestInitializer.java new file mode 100644 index 0000000000..d38d09d12e --- /dev/null +++ b/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusTestInitializer.java @@ -0,0 +1,51 @@ +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * 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)); + } + +} diff --git a/providers/pom.xml b/providers/pom.xml index d7b1c60342..0611b2faaa 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -41,6 +41,6 @@ aws-s3 googlestorage scaleup-storage - walrus + ecc-s3