From 69ba260738032e04e538a5feeae65cf5a8d275f2 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sat, 29 Dec 2012 10:48:25 -0800 Subject: [PATCH] issue #1107: remove walrus and related providers --- allblobstore/pom.xml | 10 -- apis/pom.xml | 1 - apis/walrus/README.txt | 27 ---- apis/walrus/pom.xml | 123 ---------------- .../org/jclouds/walrus/WalrusApiMetadata.java | 89 ------------ .../services/org.jclouds.apis.ApiMetadata | 1 - .../jclouds/walrus/WalrusApiMetadataTest.java | 34 ----- .../jclouds/walrus/WalrusClientLiveTest.java | 54 ------- .../WalrusBlobIntegrationLiveTest.java | 63 -------- .../walrus/blobstore/WalrusBlobLiveTest.java | 34 ----- .../WalrusBlobMapIntegrationLiveTest.java | 34 ----- .../blobstore/WalrusBlobSignerLiveTest.java | 35 ----- .../WalrusContainerIntegrationLiveTest.java | 34 ----- .../blobstore/WalrusContainerLiveTest.java | 34 ----- ...lrusInputStreamMapIntegrationLiveTest.java | 34 ----- .../WalrusServiceIntegrationLiveTest.java | 34 ----- .../eucalyptus-partnercloud-s3/README.txt | 27 ---- providers/eucalyptus-partnercloud-s3/pom.xml | 135 ------------------ ...alyptusPartnerCloudS3ProviderMetadata.java | 93 ------------ .../org.jclouds.providers.ProviderMetadata | 1 - .../EucalyptusPartnerCloudS3ProviderTest.java | 37 ----- ...yptusPartnerCloudWalrusClientLiveTest.java | 34 ----- ...nerCloudWalrusBlobIntegrationLiveTest.java | 33 ----- ...alyptusPartnerCloudWalrusBlobLiveTest.java | 33 ----- ...CloudWalrusBlobMapIntegrationLiveTest.java | 33 ----- ...sPartnerCloudWalrusBlobSignerLiveTest.java | 34 ----- ...oudWalrusContainerIntegrationLiveTest.java | 33 ----- ...usPartnerCloudWalrusContainerLiveTest.java | 33 ----- ...lrusInputStreamMapIntegrationLiveTest.java | 34 ----- ...CloudWalrusServiceIntegrationLiveTest.java | 43 ------ providers/pom.xml | 1 - 31 files changed, 1245 deletions(-) delete mode 100644 apis/walrus/README.txt delete mode 100644 apis/walrus/pom.xml delete mode 100644 apis/walrus/src/main/java/org/jclouds/walrus/WalrusApiMetadata.java delete mode 100644 apis/walrus/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata delete mode 100644 apis/walrus/src/test/java/org/jclouds/walrus/WalrusApiMetadataTest.java delete mode 100644 apis/walrus/src/test/java/org/jclouds/walrus/WalrusClientLiveTest.java delete mode 100644 apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobIntegrationLiveTest.java delete mode 100644 apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobLiveTest.java delete mode 100644 apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobMapIntegrationLiveTest.java delete mode 100644 apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobSignerLiveTest.java delete mode 100644 apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerIntegrationLiveTest.java delete mode 100644 apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerLiveTest.java delete mode 100644 apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusInputStreamMapIntegrationLiveTest.java delete mode 100644 apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusServiceIntegrationLiveTest.java delete mode 100644 providers/eucalyptus-partnercloud-s3/README.txt delete mode 100644 providers/eucalyptus-partnercloud-s3/pom.xml delete mode 100644 providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java delete mode 100644 providers/eucalyptus-partnercloud-s3/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata delete mode 100644 providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderTest.java delete mode 100644 providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/EucalyptusPartnerCloudWalrusClientLiveTest.java delete mode 100644 providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest.java delete mode 100644 providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobLiveTest.java delete mode 100644 providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest.java delete mode 100644 providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobSignerLiveTest.java delete mode 100644 providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest.java delete mode 100644 providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusContainerLiveTest.java delete mode 100644 providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest.java delete mode 100644 providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest.java diff --git a/allblobstore/pom.xml b/allblobstore/pom.xml index d0965c84df..5737d617d0 100644 --- a/allblobstore/pom.xml +++ b/allblobstore/pom.xml @@ -55,16 +55,6 @@ cloudonestorage ${project.version} - - org.jclouds.api - walrus - ${project.version} - - - org.jclouds.provider - eucalyptus-partnercloud-s3 - ${project.version} - org.jclouds.provider azureblob diff --git a/apis/pom.xml b/apis/pom.xml index 863fff09fb..080a87a586 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -41,7 +41,6 @@ ec2 sqs deltacloud - walrus eucalyptus vcloud elasticstack diff --git a/apis/walrus/README.txt b/apis/walrus/README.txt deleted file mode 100644 index 64326e5b04..0000000000 --- a/apis/walrus/README.txt +++ /dev/null @@ -1,27 +0,0 @@ -==== - Licensed to jclouds, Inc. (jclouds) under one or more - contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. jclouds 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. -==== - -# -# The jclouds API for Walrus, Eucalyptus Systems' S3 flavour (http://www.eucalyptus.com/). -# -# Expects the jclouds S3 API to be present on your application's classpath. -# -# TODO: Implementation status. -# TODO: Supported features. -# TODO: Usage example. \ No newline at end of file diff --git a/apis/walrus/pom.xml b/apis/walrus/pom.xml deleted file mode 100644 index b70695b011..0000000000 --- a/apis/walrus/pom.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - 4.0.0 - - org.jclouds - jclouds-project - 1.6.0-SNAPSHOT - ../../project/pom.xml - - org.jclouds.api - walrus - jclouds Eucalyptus Walrus api - Simple Storage Service (S3) implementation based on Eucalyptus Walrus - bundle - - - http://ecc.eucalyptus.com:8773/services/Walrus - 2006-03-01 - - ${test.eucalyptus.identity} - ${test.eucalyptus.credential} - - org.jclouds.walrus*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - org.jclouds.api - s3 - ${project.version} - jar - - - org.jclouds.api - s3 - ${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.driver - jclouds-log4j - ${project.version} - test - - - log4j - log4j - test - - - - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - ${jclouds.blobstore.httpstream.url} - ${jclouds.blobstore.httpstream.md5} - ${test.walrus.endpoint} - ${test.walrus.api-version} - ${test.walrus.build-version} - ${test.walrus.identity} - ${test.walrus.credential} - - - - - - - - - - - - diff --git a/apis/walrus/src/main/java/org/jclouds/walrus/WalrusApiMetadata.java b/apis/walrus/src/main/java/org/jclouds/walrus/WalrusApiMetadata.java deleted file mode 100644 index fc994c3b9e..0000000000 --- a/apis/walrus/src/main/java/org/jclouds/walrus/WalrusApiMetadata.java +++ /dev/null @@ -1,89 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.walrus; - -import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_SERVICE_PATH; -import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_VIRTUAL_HOST_BUCKETS; - -import java.util.Properties; - -import org.jclouds.apis.ApiMetadata; -import org.jclouds.s3.S3ApiMetadata; -import org.jclouds.s3.S3AsyncClient; -import org.jclouds.s3.S3Client; -import org.jclouds.s3.blobstore.config.S3BlobStoreContextModule; -import org.jclouds.s3.config.S3RestClientModule; - -import com.google.common.collect.ImmutableSet; -import com.google.inject.Module; - -/** - * Implementation of {@link ApiMetadata} for the Walrus S3 API - * - * @author Adrian Cole - */ -public class WalrusApiMetadata extends S3ApiMetadata { - - private static Builder builder() { - return new Builder(); - } - - @Override - public Builder toBuilder() { - return builder().fromApiMetadata(this); - } - - public WalrusApiMetadata() { - this(builder()); - } - - protected WalrusApiMetadata(Builder builder) { - super(builder); - } - - public static Properties defaultProperties() { - Properties properties = S3ApiMetadata.defaultProperties(); - properties.setProperty(PROPERTY_S3_SERVICE_PATH, "/services/Walrus"); - properties.setProperty(PROPERTY_S3_VIRTUAL_HOST_BUCKETS, "false"); - return properties; - } - - public static class Builder extends S3ApiMetadata.Builder { - protected Builder(){ - super(S3Client.class, S3AsyncClient.class); - id("walrus") - .name("Walrus (S3 clone) API") - .version("Walrus-1.6") - .defaultProperties(WalrusApiMetadata.defaultProperties()) - .defaultModules(ImmutableSet.>of(S3RestClientModule.class, S3BlobStoreContextModule.class)); - } - - @Override - public WalrusApiMetadata build() { - return new WalrusApiMetadata(this); - } - - @Override - public Builder fromApiMetadata(ApiMetadata in) { - super.fromApiMetadata(in); - return this; - } - } - -} diff --git a/apis/walrus/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/walrus/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 615ba3fec5..0000000000 --- a/apis/walrus/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.walrus.WalrusApiMetadata \ No newline at end of file diff --git a/apis/walrus/src/test/java/org/jclouds/walrus/WalrusApiMetadataTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/WalrusApiMetadataTest.java deleted file mode 100644 index abc4963b0a..0000000000 --- a/apis/walrus/src/test/java/org/jclouds/walrus/WalrusApiMetadataTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.walrus; - -import org.jclouds.blobstore.internal.BaseBlobStoreApiMetadataTest; -import org.testng.annotations.Test; - -/** - * - * @author Adrian Cole - */ -@Test(groups = "unit", testName = "WalrusApiMetadataTest") -public class WalrusApiMetadataTest extends BaseBlobStoreApiMetadataTest { - - public WalrusApiMetadataTest() { - super(new WalrusApiMetadata()); - } -} diff --git a/apis/walrus/src/test/java/org/jclouds/walrus/WalrusClientLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/WalrusClientLiveTest.java deleted file mode 100644 index f939eeca1f..0000000000 --- a/apis/walrus/src/test/java/org/jclouds/walrus/WalrusClientLiveTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.walrus; - -import static org.testng.Assert.assertEquals; - -import java.net.URL; - -import org.jclouds.s3.S3ClientLiveTest; -import org.jclouds.s3.domain.S3Object; -import org.testng.annotations.Test; - -/** - * Tests behavior of {@code S3Client} - * - * @author Adrian Cole - */ -@Test(groups = "live", sequential = true, testName = "WalrusClientLiveTest") -public class WalrusClientLiveTest extends S3ClientLiveTest { - // path based, not virtual host - @Override - protected URL getObjectURL(String containerName, String key) throws Exception { - URL url = new URL(String.format(endpoint + "/services/Walrus/%s/%s", containerName, key)); - return url; - } - - // no support for content encoding - @Override - protected void assertContentEncoding(S3Object newObject, String string) { - assertEquals(newObject.getMetadata().getContentMetadata().getContentEncoding(), null); - } - - // no support for cache control - @Override - protected void assertCacheControl(S3Object newObject, String string) { - assertEquals(newObject.getMetadata().getCacheControl(), null); - } -} diff --git a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobIntegrationLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobIntegrationLiveTest.java deleted file mode 100644 index e6b26491e2..0000000000 --- a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobIntegrationLiveTest.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.walrus.blobstore; - -import java.io.IOException; - -import org.jclouds.blobstore.domain.Blob; -import org.jclouds.s3.blobstore.integration.S3BlobIntegrationLiveTest; -import org.testng.annotations.Test; - -/** - * @author Adrian Cole - */ -@Test(groups = "live", testName = "WalrusBlobIntegrationLiveTest") -public class WalrusBlobIntegrationLiveTest extends S3BlobIntegrationLiveTest { - - public WalrusBlobIntegrationLiveTest() { - provider = "walrus"; - } - - // no support for content encoding - @Override - protected void checkContentEncoding(Blob blob, String contentEncoding) { - assert blob.getPayload().getContentMetadata().getContentEncoding() == null; - assert blob.getMetadata().getContentMetadata().getContentEncoding() == null; - } - - // no support for content language - @Override - protected void checkContentLanguage(Blob blob, String contentLanguage) { - assert blob.getPayload().getContentMetadata().getContentLanguage() == null; - assert blob.getMetadata().getContentMetadata().getContentLanguage() == null; - } - - // double range not supported - @Test(groups = { "integration", "live" }) - @Override - public void testGetTwoRanges() throws InterruptedException, IOException { - - } - - // range not supported - @Test(groups = { "integration", "live" }) - @Override - public void testGetRange() throws InterruptedException, IOException { - } -} diff --git a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobLiveTest.java deleted file mode 100644 index 509f47bf0d..0000000000 --- a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobLiveTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.walrus.blobstore; - -import org.jclouds.s3.blobstore.integration.S3BlobLiveTest; -import org.testng.annotations.Test; - -/** - * @author Adrian Cole - */ -@Test(groups = "live", testName = "WalrusBlobLiveTest") -public class WalrusBlobLiveTest extends S3BlobLiveTest { - - public WalrusBlobLiveTest() { - provider = "walrus"; - } - -} diff --git a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobMapIntegrationLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobMapIntegrationLiveTest.java deleted file mode 100644 index c9b2fbd35d..0000000000 --- a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobMapIntegrationLiveTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.walrus.blobstore; - -import org.jclouds.s3.blobstore.integration.S3BlobMapIntegrationLiveTest; -import org.testng.annotations.Test; - -/** - * @author Adrian Cole - */ -@Test(groups = "live", testName = "WalrusBlobMapIntegrationLiveTest") -public class WalrusBlobMapIntegrationLiveTest extends S3BlobMapIntegrationLiveTest { - - public WalrusBlobMapIntegrationLiveTest() { - provider = "walrus"; - } - -} diff --git a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobSignerLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobSignerLiveTest.java deleted file mode 100644 index 0254aef9dd..0000000000 --- a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusBlobSignerLiveTest.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.walrus.blobstore; - -import org.jclouds.s3.blobstore.integration.S3BlobSignerLiveTest; -import org.testng.annotations.Test; - -/** - * - * @author Adrian Cole - */ -@Test(groups = "live", testName = "WalrusBlobSignerLiveTest") -public class WalrusBlobSignerLiveTest extends S3BlobSignerLiveTest { - - public WalrusBlobSignerLiveTest() { - provider = "walrus"; - } - -} diff --git a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerIntegrationLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerIntegrationLiveTest.java deleted file mode 100644 index 145e9d30ff..0000000000 --- a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerIntegrationLiveTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.walrus.blobstore; - -import org.jclouds.s3.blobstore.integration.S3ContainerIntegrationLiveTest; -import org.testng.annotations.Test; - -/** - * @author Adrian Cole - */ -@Test(groups = "live", testName = "WalrusContainerIntegrationLiveTest") -public class WalrusContainerIntegrationLiveTest extends S3ContainerIntegrationLiveTest { - - public WalrusContainerIntegrationLiveTest() { - provider = "walrus"; - } - -} diff --git a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerLiveTest.java deleted file mode 100644 index cca820a115..0000000000 --- a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusContainerLiveTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.walrus.blobstore; - -import org.jclouds.s3.blobstore.integration.S3ContainerLiveTest; -import org.testng.annotations.Test; - -/** - * @author Adrian Cole - */ -@Test(groups = "live", testName = "WalrusContainerLiveTest") -public class WalrusContainerLiveTest extends S3ContainerLiveTest { - - public WalrusContainerLiveTest() { - provider = "walrus"; - } - -} diff --git a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusInputStreamMapIntegrationLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusInputStreamMapIntegrationLiveTest.java deleted file mode 100644 index 6e447ac4ad..0000000000 --- a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusInputStreamMapIntegrationLiveTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.walrus.blobstore; - -import org.jclouds.s3.blobstore.integration.S3InputStreamMapIntegrationLiveTest; -import org.testng.annotations.Test; - -/** - * @author Adrian Cole - */ -@Test(groups = "live", testName = "WalrusInputStreamMapIntegrationLiveTest") -public class WalrusInputStreamMapIntegrationLiveTest extends S3InputStreamMapIntegrationLiveTest { - - public WalrusInputStreamMapIntegrationLiveTest() { - provider = "walrus"; - } - -} diff --git a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusServiceIntegrationLiveTest.java b/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusServiceIntegrationLiveTest.java deleted file mode 100644 index b502fd6e6e..0000000000 --- a/apis/walrus/src/test/java/org/jclouds/walrus/blobstore/WalrusServiceIntegrationLiveTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.walrus.blobstore; - -import org.jclouds.s3.blobstore.integration.S3ServiceIntegrationLiveTest; -import org.testng.annotations.Test; - -/** - * @author Adrian Cole - */ -@Test(groups = "live", testName = "WalrusServiceIntegrationLiveTest") -public class WalrusServiceIntegrationLiveTest extends S3ServiceIntegrationLiveTest { - - public WalrusServiceIntegrationLiveTest() { - provider = "walrus"; - } - -} diff --git a/providers/eucalyptus-partnercloud-s3/README.txt b/providers/eucalyptus-partnercloud-s3/README.txt deleted file mode 100644 index 984ec2d5dc..0000000000 --- a/providers/eucalyptus-partnercloud-s3/README.txt +++ /dev/null @@ -1,27 +0,0 @@ -==== - Licensed to jclouds, Inc. (jclouds) under one or more - contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. jclouds 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. -==== - -# -# The jclouds provider for Eucalyptus Partner Cloud's Walrus (http://www.eucalyptus.com/resources/AmazonAWS) service. -# -# Expects the jclouds walrus API to be present on your application's classpath. -# -# TODO: Implementation status. -# TODO: Supported features. -# TODO: Usage example. \ No newline at end of file diff --git a/providers/eucalyptus-partnercloud-s3/pom.xml b/providers/eucalyptus-partnercloud-s3/pom.xml deleted file mode 100644 index 0d0fd565df..0000000000 --- a/providers/eucalyptus-partnercloud-s3/pom.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - 4.0.0 - - org.jclouds - jclouds-project - 1.6.0-SNAPSHOT - ../../project/pom.xml - - org.jclouds.provider - eucalyptus-partnercloud-s3 - jclouds Eucalyptus Partner Cloud provider - Walrus (S3) implementation targeted to the Eucalyptus Partner Cloud - bundle - - - http://walrus.partner.eucalyptus.com:8773/services/Walrus - 2006-03-01 - - FIXME_IDENTITY - FIXME_CREDENTIAL - 15 - - org.jclouds.epc*;version="${project.version}" - - org.jclouds*;version="${project.version}", - * - - - - - - 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.driver - jclouds-log4j - ${project.version} - test - - - log4j - log4j - test - - - - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - 1 - - ${test.eucalyptus-partnercloud-s3.endpoint} - ${test.eucalyptus-partnercloud-s3.api-version} - ${test.eucalyptus-partnercloud-s3.build-version} - ${test.eucalyptus-partnercloud-s3.identity} - ${test.eucalyptus-partnercloud-s3.credential} - ${jclouds.blobstore.httpstream.url} - ${jclouds.blobstore.httpstream.md5} - ${test.blobstore.container-count} - - - - - - - - - - - diff --git a/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java deleted file mode 100644 index ec1c2c6090..0000000000 --- a/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java +++ /dev/null @@ -1,93 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.epc; - -import static org.jclouds.Constants.PROPERTY_ISO3166_CODES; -import static org.jclouds.location.reference.LocationConstants.ENDPOINT; -import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; -import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION; -import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; - -import java.net.URI; -import java.util.Properties; - -import org.jclouds.providers.ProviderMetadata; -import org.jclouds.providers.internal.BaseProviderMetadata; -import org.jclouds.walrus.WalrusApiMetadata; - -/** - * Implementation of {@link org.jclouds.providers.ProviderMetadata} for Eucalyptus Partner Cloud S3. - * - * @author Adrian Cole - */ -public class EucalyptusPartnerCloudS3ProviderMetadata extends BaseProviderMetadata { - - public static Builder builder() { - return new Builder(); - } - - @Override - public Builder toBuilder() { - return builder().fromProviderMetadata(this); - } - - public EucalyptusPartnerCloudS3ProviderMetadata() { - super(builder()); - } - - public EucalyptusPartnerCloudS3ProviderMetadata(Builder builder) { - super(builder); - } - - public static Properties defaultProperties() { - Properties properties = new Properties(); - properties.setProperty(PROPERTY_REGIONS, "walrus"); - properties.setProperty(PROPERTY_ISO3166_CODES, "US-CA"); - properties.setProperty(PROPERTY_REGION + ".walrus." + ISO3166_CODES, "US-CA"); - properties.setProperty(PROPERTY_REGION + "." + "walrus" + "." + ENDPOINT, "http://walrus.partner.eucalyptus.com:8773/services/Walrus"); - return properties; - } - - public static class Builder extends BaseProviderMetadata.Builder { - - protected Builder(){ - id("eucalyptus-partnercloud-s3") - .name("Eucalyptus Partner Cloud (S3)") - .apiMetadata(new WalrusApiMetadata()) - .homepage(URI.create("http://www.eucalyptus.com/partners")) - .console(URI.create("https://walrus.partner.eucalyptus.com")) - .linkedServices("eucalyptus-partnercloud-ec2", "eucalyptus-partnercloud-s3") - .iso3166Codes("US-CA") - .endpoint("http://walrus.partner.eucalyptus.com:8773/services/Walrus") - .defaultProperties(EucalyptusPartnerCloudS3ProviderMetadata.defaultProperties()); - } - - @Override - public EucalyptusPartnerCloudS3ProviderMetadata build() { - return new EucalyptusPartnerCloudS3ProviderMetadata(this); - } - - @Override - public Builder fromProviderMetadata( - ProviderMetadata in) { - super.fromProviderMetadata(in); - return this; - } - } -} diff --git a/providers/eucalyptus-partnercloud-s3/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/eucalyptus-partnercloud-s3/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 55e706a690..0000000000 --- a/providers/eucalyptus-partnercloud-s3/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.epc.EucalyptusPartnerCloudS3ProviderMetadata diff --git a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderTest.java deleted file mode 100644 index 8f0e75988e..0000000000 --- a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.epc; - -import org.jclouds.providers.internal.BaseProviderMetadataTest; -import org.jclouds.walrus.WalrusApiMetadata; -import org.testng.annotations.Test; - -/** - * The EucalyptusPartnerCloudS3ProviderTest tests the {@link EucalyptusPartnerCloudS3ProviderMetadata} class. - * - * @author Jeremy Whitlock - */ -@Test(groups = "unit", testName = "EucalyptusPartnerCloudS3ProviderTest") -public class EucalyptusPartnerCloudS3ProviderTest extends BaseProviderMetadataTest { - - public EucalyptusPartnerCloudS3ProviderTest() { - super(new EucalyptusPartnerCloudS3ProviderMetadata(), new WalrusApiMetadata()); - } - -} diff --git a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/EucalyptusPartnerCloudWalrusClientLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/EucalyptusPartnerCloudWalrusClientLiveTest.java deleted file mode 100644 index 442e4a9a46..0000000000 --- a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/EucalyptusPartnerCloudWalrusClientLiveTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.epc; - -import org.jclouds.walrus.WalrusClientLiveTest; -import org.testng.annotations.Test; - -/** - * Tests behavior of {@code S3Client} - * - * @author Adrian Cole - */ -@Test(groups = "live", singleThreaded = true, testName = "EucalyptusPartnerCloudWalrusClientLiveTest") -public class EucalyptusPartnerCloudWalrusClientLiveTest extends WalrusClientLiveTest { - public EucalyptusPartnerCloudWalrusClientLiveTest() { - provider = "eucalyptus-partnercloud-s3"; - } -} diff --git a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest.java deleted file mode 100644 index 7f502e279e..0000000000 --- a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.epc.blobstore; - -import org.jclouds.walrus.blobstore.WalrusBlobIntegrationLiveTest; -import org.testng.annotations.Test; - -/** - * @author Adrian Cole - */ -@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest") -public class EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest extends WalrusBlobIntegrationLiveTest { - - public EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest() { - provider = "eucalyptus-partnercloud-s3"; - } -} diff --git a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobLiveTest.java deleted file mode 100644 index aa3660d613..0000000000 --- a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobLiveTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.epc.blobstore; - -import org.jclouds.walrus.blobstore.WalrusBlobLiveTest; -import org.testng.annotations.Test; - -/** - * @author Adrian Cole - */ -@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusBlobLiveTest") -public class EucalyptusPartnerCloudWalrusBlobLiveTest extends WalrusBlobLiveTest { - - public EucalyptusPartnerCloudWalrusBlobLiveTest() { - provider = "eucalyptus-partnercloud-s3"; - } -} diff --git a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest.java deleted file mode 100644 index 5ad504c3ef..0000000000 --- a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.epc.blobstore; - -import org.jclouds.walrus.blobstore.WalrusBlobMapIntegrationLiveTest; -import org.testng.annotations.Test; - -/** - * @author Adrian Cole - */ -@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest") -public class EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest extends WalrusBlobMapIntegrationLiveTest { - - public EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest() { - provider = "eucalyptus-partnercloud-s3"; - } -} diff --git a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobSignerLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobSignerLiveTest.java deleted file mode 100644 index 4e239593a7..0000000000 --- a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusBlobSignerLiveTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.epc.blobstore; - -import org.jclouds.walrus.blobstore.WalrusBlobSignerLiveTest; -import org.testng.annotations.Test; - -/** - * - * @author Adrian Cole - */ -@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusBlobSignerLiveTest") -public class EucalyptusPartnerCloudWalrusBlobSignerLiveTest extends WalrusBlobSignerLiveTest { - - public EucalyptusPartnerCloudWalrusBlobSignerLiveTest() { - provider = "eucalyptus-partnercloud-s3"; - } -} diff --git a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest.java deleted file mode 100644 index 8e42392236..0000000000 --- a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.epc.blobstore; - -import org.jclouds.walrus.blobstore.WalrusContainerIntegrationLiveTest; -import org.testng.annotations.Test; - -/** - * @author Adrian Cole - */ -@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest") -public class EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest extends WalrusContainerIntegrationLiveTest { - - public EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest() { - provider = "eucalyptus-partnercloud-s3"; - } -} diff --git a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusContainerLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusContainerLiveTest.java deleted file mode 100644 index 32e13bfc34..0000000000 --- a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusContainerLiveTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.epc.blobstore; - -import org.jclouds.walrus.blobstore.WalrusContainerLiveTest; -import org.testng.annotations.Test; - -/** - * @author Adrian Cole - */ -@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusContainerLiveTest") -public class EucalyptusPartnerCloudWalrusContainerLiveTest extends WalrusContainerLiveTest { - - public EucalyptusPartnerCloudWalrusContainerLiveTest() { - provider = "eucalyptus-partnercloud-s3"; - } -} diff --git a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest.java deleted file mode 100644 index f2b060cf28..0000000000 --- a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.epc.blobstore; - -import org.jclouds.walrus.blobstore.WalrusInputStreamMapIntegrationLiveTest; -import org.testng.annotations.Test; - -/** - * @author Adrian Cole - */ -@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest") -public class EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest extends - WalrusInputStreamMapIntegrationLiveTest { - - public EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest() { - provider = "eucalyptus-partnercloud-s3"; - } -} diff --git a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest.java deleted file mode 100644 index 37ec64a88a..0000000000 --- a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds 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.epc.blobstore; - -import java.util.Set; - -import org.jclouds.walrus.blobstore.WalrusServiceIntegrationLiveTest; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableSet; - -/** - * @author Adrian Cole - */ -@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest") -public class EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest extends WalrusServiceIntegrationLiveTest { - - public EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest() { - provider = "eucalyptus-partnercloud-s3"; - } - - @Override - protected Set getIso3166Codes() { - return ImmutableSet. of("US-CA"); - } - -} diff --git a/providers/pom.xml b/providers/pom.xml index feee92aa78..3dca166c28 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -44,7 +44,6 @@ synaptic-storage ninefold-storage cloudonestorage - eucalyptus-partnercloud-s3 eucalyptus-partnercloud-ec2 bluelock-vcloud-zone01 stratogen-vcloud-mycloud