diff --git a/allblobstore/pom.xml b/allblobstore/pom.xml index 711923c01e..4adce398a5 100644 --- a/allblobstore/pom.xml +++ b/allblobstore/pom.xml @@ -38,11 +38,6 @@ aws-s3 ${project.version} - - org.apache.jclouds.provider - cloudonestorage - ${project.version} - org.apache.jclouds.provider azureblob diff --git a/providers/cloudonestorage/README.txt b/providers/cloudonestorage/README.txt deleted file mode 100644 index b79f3497ad..0000000000 --- a/providers/cloudonestorage/README.txt +++ /dev/null @@ -1,8 +0,0 @@ -# -# The jclouds provider for Peer1's CloudOne Storage (http://www.peer1.com/hosting/cloudone-storage.php) service. -# -# Expects the jclouds atmos API to be present on your application's classpath. -# -# TODO: Implementation status. -# TODO: Supported features. -# TODO: Usage example. diff --git a/providers/cloudonestorage/pom.xml b/providers/cloudonestorage/pom.xml deleted file mode 100644 index 67435ebc3e..0000000000 --- a/providers/cloudonestorage/pom.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - 4.0.0 - - org.apache.jclouds - jclouds-project - 1.8.1-SNAPSHOT - ../../project/pom.xml - - org.apache.jclouds.provider - cloudonestorage - jclouds CloudOne Storage as a Service provider - Atmos implementation targeted to Peer1 CloudOne Storage as a Service - bundle - - - https://cloudonestorage.peer1.com - 1.3.0 - - FIXME_IDENTITY - FIXME_CREDENTIAL - - org.jclouds.cloudonestorage*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - org.apache.jclouds.api - atmos - ${project.version} - jar - - - org.apache.jclouds.api - atmos - ${project.version} - test-jar - test - - - org.apache.jclouds - jclouds-core - ${project.version} - test-jar - test - - - org.apache.jclouds - jclouds-blobstore - ${project.version} - test-jar - test - - - org.apache.jclouds.driver - jclouds-log4j - ${project.version} - test - - - log4j - log4j - test - - - - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - 1 - - ${test.cloudonestorage.endpoint} - ${test.cloudonestorage.api-version} - ${test.cloudonestorage.build-version} - ${test.cloudonestorage.identity} - ${test.cloudonestorage.credential} - ${jclouds.blobstore.httpstream.url} - ${jclouds.blobstore.httpstream.md5} - - - - - - - - - - - - diff --git a/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java b/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java deleted file mode 100644 index 5755afa48e..0000000000 --- a/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.cloudonestorage; - -import java.net.URI; -import java.util.Properties; - -import org.jclouds.atmos.AtmosApiMetadata; -import org.jclouds.providers.ProviderMetadata; -import org.jclouds.providers.internal.BaseProviderMetadata; - -/** - * Implementation of {@ link org.jclouds.types.ProviderMetadata} for PEER1's - * CloudOne Storage provider. - */ -public class CloudOneStorageProviderMetadata extends BaseProviderMetadata { - - public static Builder builder() { - return new Builder(); - } - - @Override - public Builder toBuilder() { - return builder().fromProviderMetadata(this); - } - - public CloudOneStorageProviderMetadata() { - super(builder()); - } - - public CloudOneStorageProviderMetadata(Builder builder) { - super(builder); - } - - public static Properties defaultProperties() { - Properties properties = new Properties(); - return properties; - } - - public static class Builder extends BaseProviderMetadata.Builder { - - protected Builder() { - id("cloudonestorage") - .name("PEER1 CloudOne Storage") - .apiMetadata(new AtmosApiMetadata()) - .homepage(URI.create("http://www.peer1.com/hosting/cloudone-storage.php")) - .console(URI.create("https://mypeer1.com/")) - .iso3166Codes("US-GA", "US-TX") - .endpoint("https://cloudonestorage.peer1.com") - .defaultProperties(CloudOneStorageProviderMetadata.defaultProperties()); - } - - @Override - public CloudOneStorageProviderMetadata build() { - return new CloudOneStorageProviderMetadata(this); - } - - @Override - public Builder fromProviderMetadata( - ProviderMetadata in) { - super.fromProviderMetadata(in); - return this; - } - } -} diff --git a/providers/cloudonestorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/cloudonestorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 1e01a982a5..0000000000 --- a/providers/cloudonestorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.cloudonestorage.CloudOneStorageProviderMetadata diff --git a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/CloudOneStorageAsyncClientTest.java b/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/CloudOneStorageAsyncClientTest.java deleted file mode 100644 index a9398b9380..0000000000 --- a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/CloudOneStorageAsyncClientTest.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.cloudonestorage; - -import org.testng.annotations.Test; - -// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire -@Test(groups = "unit", testName = "CloudOneStorageAsyncClientTest") -public class CloudOneStorageAsyncClientTest extends org.jclouds.atmos.AtmosAsyncClientTest { - - public CloudOneStorageAsyncClientTest() { - this.provider = "cloudonestorage"; - } - -} diff --git a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/CloudOneStorageClientLiveTest.java b/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/CloudOneStorageClientLiveTest.java deleted file mode 100644 index 23d69e2c6c..0000000000 --- a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/CloudOneStorageClientLiveTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.cloudonestorage; - -import org.jclouds.atmos.AtmosClientLiveTest; -import org.testng.annotations.Test; - -/** - * Tests behavior of {@code AtmosClient} - */ -@Test(groups = "live", sequential = true, testName = "CloudOneStorageClientLiveTest") -public class CloudOneStorageClientLiveTest extends AtmosClientLiveTest { - -} diff --git a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/CloudOneStorageProviderTest.java b/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/CloudOneStorageProviderTest.java deleted file mode 100644 index dc95103515..0000000000 --- a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/CloudOneStorageProviderTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.cloudonestorage; - -import org.jclouds.atmos.AtmosApiMetadata; -import org.jclouds.providers.internal.BaseProviderMetadataTest; -import org.testng.annotations.Test; - -/** - * The CloudOneStorageProviderTest tests the {@link CloudOneStorageProviderMetadata} class. - */ -@Test(groups = "unit", testName = "CloudOneStorageProviderTest") -public class CloudOneStorageProviderTest extends BaseProviderMetadataTest { - - public CloudOneStorageProviderTest() { - super(new CloudOneStorageProviderMetadata(), new AtmosApiMetadata()); - } - -} diff --git a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageBlobIntegrationLiveTest.java b/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageBlobIntegrationLiveTest.java deleted file mode 100644 index 4dbdf479d2..0000000000 --- a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageBlobIntegrationLiveTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.cloudonestorage.blobstore.integration; - -import org.jclouds.atmos.blobstore.integration.AtmosIntegrationLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", testName = "CloudOneStorageBlobIntegrationLiveTest") -public class CloudOneStorageBlobIntegrationLiveTest extends AtmosIntegrationLiveTest { - public CloudOneStorageBlobIntegrationLiveTest() { - provider = "cloudonestorage"; - } - -} diff --git a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageBlobLiveTest.java b/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageBlobLiveTest.java deleted file mode 100644 index ecb9592d2e..0000000000 --- a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageBlobLiveTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.cloudonestorage.blobstore.integration; - -import org.jclouds.atmos.blobstore.integration.AtmosLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", testName = "CloudOneStorageBlobLiveTest") -public class CloudOneStorageBlobLiveTest extends AtmosLiveTest { - public CloudOneStorageBlobLiveTest() { - provider = "cloudonestorage"; - } - -} diff --git a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageBlobSignerLiveTest.java b/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageBlobSignerLiveTest.java deleted file mode 100644 index 0249e73815..0000000000 --- a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageBlobSignerLiveTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.cloudonestorage.blobstore.integration; - -import org.jclouds.atmos.blobstore.integration.AtmosBlobSignerLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", testName = "CloudOneStorageBlobSignerLiveTest") -public class CloudOneStorageBlobSignerLiveTest extends AtmosBlobSignerLiveTest { - public CloudOneStorageBlobSignerLiveTest() { - provider = "cloudonestorage"; - } - -} diff --git a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageContainerIntegrationLiveTest.java b/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageContainerIntegrationLiveTest.java deleted file mode 100644 index 5adea57a36..0000000000 --- a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageContainerIntegrationLiveTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.cloudonestorage.blobstore.integration; - -import org.jclouds.atmos.blobstore.integration.AtmosContainerIntegrationLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", testName = "CloudOneStorageContainerIntegrationLiveTest") -public class CloudOneStorageContainerIntegrationLiveTest extends AtmosContainerIntegrationLiveTest { - public CloudOneStorageContainerIntegrationLiveTest() { - provider = "cloudonestorage"; - } - -} diff --git a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageContainerLiveTest.java b/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageContainerLiveTest.java deleted file mode 100644 index 200b117a46..0000000000 --- a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageContainerLiveTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.cloudonestorage.blobstore.integration; - -import org.jclouds.atmos.blobstore.integration.AtmosContainerLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", testName = "CloudOneStorageContainerLiveTest") -public class CloudOneStorageContainerLiveTest extends AtmosContainerLiveTest { - public CloudOneStorageContainerLiveTest() { - provider = "cloudonestorage"; - } - -} diff --git a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageServiceIntegrationLiveTest.java b/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageServiceIntegrationLiveTest.java deleted file mode 100644 index 8392a2d2bd..0000000000 --- a/providers/cloudonestorage/src/test/java/org/jclouds/cloudonestorage/blobstore/integration/CloudOneStorageServiceIntegrationLiveTest.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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.cloudonestorage.blobstore.integration; - -import java.util.Set; - -import org.jclouds.atmos.blobstore.integration.AtmosServiceIntegrationLiveTest; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableSet; - -@Test(groups = "live", testName = "CloudOneStorageServiceIntegrationLiveTest") -public class CloudOneStorageServiceIntegrationLiveTest extends AtmosServiceIntegrationLiveTest { - public CloudOneStorageServiceIntegrationLiveTest() { - provider = "cloudonestorage"; - } - - @Override - protected Set getIso3166Codes() { - return ImmutableSet. of("US-GA", "US-TX"); - } -} diff --git a/providers/pom.xml b/providers/pom.xml index 927eef222f..cf17040571 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -36,7 +36,6 @@ aws-ec2 aws-sqs aws-cloudwatch - cloudonestorage bluelock-vcloud-zone01 elastichosts-lon-p elastichosts-sat-p