diff --git a/README.txt b/README.txt index 1bbe809949..e0ab489aef 100644 --- a/README.txt +++ b/README.txt @@ -33,7 +33,7 @@ our compute api supports: aws-ec2, gogrid, cloudservers (generic), cloudservers- cloudservers-uk, vcloud (generic), ec2 (generic), trmk-ecloud, trmk-vcloudexpress, eucalyptus (generic), cloudsigma, elasticstack(generic), bluelock-vclouddirector, - slicehost, ecc-ec2, elastichosts-lon-p (Peer 1), + slicehost, eucalyptus-partnercloud-ec2, elastichosts-lon-p (Peer 1), elastichosts-sat-p (Peer 1), elastichosts-lon-b (BlueSquare), openhosting-east1, serverlove-z1-man, skalicloud-sdg-my, vcloudexpress (generic), stub (in-memory) @@ -44,8 +44,8 @@ our compute api supports: aws-ec2, gogrid, cloudservers (generic), cloudservers- our blobstore api supports: aws-s3, cloudfiles (generic), cloudfiles-us, cloudfiles-uk, azureblob, atmos (generic), synaptic-storage, cloudonestorage, s3 (generic), walrus(generic), googlestorage, - scaleup-storage, ecc-s3, swift (generic), transient (in-mem), - filesystem (on-disk) + scaleup-storage, eucalyptus-partnercloud-s3, swift (generic), + 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 4a84625999..c1b0902beb 100644 --- a/allblobstore/pom.xml +++ b/allblobstore/pom.xml @@ -66,7 +66,7 @@ org.jclouds.provider - ecc-s3 + eucalyptus-partnercloud-s3 ${project.version} diff --git a/allcompute/pom.xml b/allcompute/pom.xml index 8c3cf9c037..fd684e9974 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -31,7 +31,7 @@ org.jclouds.provider - ecc-ec2 + eucalyptus-partnercloud-ec2 ${project.version} diff --git a/blobstore/src/main/clojure/org/jclouds/blobstore.clj b/blobstore/src/main/clojure/org/jclouds/blobstore.clj index 54e95c7820..a69676aea0 100644 --- a/blobstore/src/main/clojure/org/jclouds/blobstore.clj +++ b/blobstore/src/main/clojure/org/jclouds/blobstore.clj @@ -22,8 +22,8 @@ Current supported services are: [transient, filesystem, s3, azureblob, atmos, cloudfiles, walrus, - googlestorage, synaptic, peer1-storage, aws-s3, ecc-s3, cloudfiles-us, - cloudfiles-uki, swift] + googlestorage, synaptic, peer1-storage, aws-s3, eucalyptus-partnercloud-s3, + cloudfiles-us, cloudfiles-uk, swift] Here's a quick example of how to viewresources in rackspace diff --git a/compute/src/main/clojure/org/jclouds/compute.clj b/compute/src/main/clojure/org/jclouds/compute.clj index 1ff9f11304..8f44a02efa 100644 --- a/compute/src/main/clojure/org/jclouds/compute.clj +++ b/compute/src/main/clojure/org/jclouds/compute.clj @@ -21,7 +21,8 @@ "A clojure binding to the jclouds ComputeService. Current supported providers are: - [ec2, aws-ec2, ecc-ec2, cloudservers, cloudservers-uk, cloudservers-us, + [ec2, aws-ec2, eucualyptus-partnercloud-ec2, cloudservers, + cloudservers-uk, cloudservers-us, trmk-ecloud, trmk-vcloudexpress, vcloud, bluelock, eucalyptus, slicehost, elastichosts-lon-p, elastichosts-sat-p, elastichosts, openhosting-east1, serverlove-z1-man, skalicloud-sdg-my, diff --git a/core/src/main/resources/rest.properties b/core/src/main/resources/rest.properties index 0fe02923d6..18dec59a4d 100644 --- a/core/src/main/resources/rest.properties +++ b/core/src/main/resources/rest.properties @@ -92,8 +92,8 @@ vcloudexpress.propertiesbuilder=org.jclouds.vcloud.VCloudExpressPropertiesBuilde eucalyptus.contextbuilder=org.jclouds.ec2.EC2ContextBuilder eucalyptus.propertiesbuilder=org.jclouds.eucalyptus.EucalyptusPropertiesBuilder -ecc-ec2.contextbuilder=org.jclouds.ec2.EC2ContextBuilder -ecc-ec2.propertiesbuilder=org.jclouds.ecc.ECCEucalyptusPropertiesBuilder +eucalyptus-partnercloud-ec2.contextbuilder=org.jclouds.ec2.EC2ContextBuilder +eucalyptus-partnercloud-ec2.propertiesbuilder=org.jclouds.epc.EucalyptusPartnerCloudEucalyptusPropertiesBuilder nova-ec2.contextbuilder=org.jclouds.ec2.EC2ContextBuilder nova-ec2.propertiesbuilder=org.jclouds.nova.ec2.NovaEC2PropertiesBuilder @@ -174,8 +174,8 @@ cloudfiles-uk.propertiesbuilder=org.jclouds.rackspace.cloudfiles.CloudFilesUKPro 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 +eucalyptus-partnercloud-s3.contextbuilder=org.jclouds.s3.S3ContextBuilder +eucalyptus-partnercloud-s3.propertiesbuilder=org.jclouds.ecc.EucalyptusPartnerCloudWalrusPropertiesBuilder googlestorage.contextbuilder=org.jclouds.s3.S3ContextBuilder googlestorage.propertiesbuilder=org.jclouds.googlestorage.GoogleStoragePropertiesBuilder diff --git a/providers/ecc-ec2/pom.xml b/providers/eucalyptus-partnercloud-ec2/pom.xml similarity index 76% rename from providers/ecc-ec2/pom.xml rename to providers/eucalyptus-partnercloud-ec2/pom.xml index 46c38e4748..ea41d65ef9 100644 --- a/providers/ecc-ec2/pom.xml +++ b/providers/eucalyptus-partnercloud-ec2/pom.xml @@ -30,15 +30,15 @@ ../../project/pom.xml org.jclouds.provider - ecc-ec2 - jclouds Eucalyptus Community Cloud EC2 provider - Eucalyptus (EC2) implementation targeted to the Eucalyptus Community Cloud + eucalyptus-partnercloud-ec2 + jclouds Eucalyptus Partner Cloud EC2 provider + Eucalyptus (EC2) implementation targeted to the Eucalyptus Partner Cloud - http://ecc.eucalyptus.com:8773/services/Eucalyptus - 2010-06-15 - FIXME_IDENTITY - FIXME_CREDENTIAL + http://partnercloud.eucalyptus.com:8773/services/Eucalyptus + 2010-06-15 + FIXME_IDENTITY + FIXME_CREDENTIAL @@ -118,20 +118,20 @@ - test.ecc-ec2.endpoint - ${test.ecc-ec2.endpoint} + test.eucalyptus-partnercloud-ec2.endpoint + ${test.eucalyptus-partnercloud-ec2.endpoint} - test.ecc-ec2.apiversion - ${test.ecc-ec2.apiversion} + test.eucalyptus-partnercloud-ec2.apiversion + ${test.eucalyptus-partnercloud-ec2.apiversion} - test.ecc-ec2.identity - ${test.ecc-ec2.identity} + test.eucalyptus-partnercloud-ec2.identity + ${test.eucalyptus-partnercloud-ec2.identity} - test.ecc-ec2.credential - ${test.ecc-ec2.credential} + test.eucalyptus-partnercloud-ec2.credential + ${test.eucalyptus-partnercloud-ec2.credential} diff --git a/providers/ecc-ec2/src/main/java/org/jclouds/ecc/ECCEucalyptusPropertiesBuilder.java b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudEucalyptusPropertiesBuilder.java similarity index 74% rename from providers/ecc-ec2/src/main/java/org/jclouds/ecc/ECCEucalyptusPropertiesBuilder.java rename to providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudEucalyptusPropertiesBuilder.java index 67c99ceedf..7d5a4bea0b 100644 --- a/providers/ecc-ec2/src/main/java/org/jclouds/ecc/ECCEucalyptusPropertiesBuilder.java +++ b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudEucalyptusPropertiesBuilder.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc; +package org.jclouds.epc; import static org.jclouds.Constants.PROPERTY_ENDPOINT; @@ -26,19 +26,19 @@ import java.util.Properties; import org.jclouds.eucalyptus.EucalyptusPropertiesBuilder; /** - * Builds properties used in ECCEucalyptus Clients + * Builds properties used in EucalyptusPartnerCloudEucalyptus Clients * * @author Adrian Cole */ -public class ECCEucalyptusPropertiesBuilder extends EucalyptusPropertiesBuilder { +public class EucalyptusPartnerCloudEucalyptusPropertiesBuilder extends EucalyptusPropertiesBuilder { @Override protected Properties defaultProperties() { Properties properties = super.defaultProperties(); - properties.setProperty(PROPERTY_ENDPOINT, "http://173.205.188.130:8773/services/Eucalyptus"); + properties.setProperty(PROPERTY_ENDPOINT, "http://partnercloud.eucalyptus.com:8773/services/Eucalyptus"); return properties; } - public ECCEucalyptusPropertiesBuilder(Properties properties) { + public EucalyptusPartnerCloudEucalyptusPropertiesBuilder(Properties properties) { super(properties); } diff --git a/providers/ecc-ec2/src/test/java/org/jclouds/ecc/compute/ECCEucalyptusComputeServiceLiveTest.java b/providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/eucalyptuspartnercloud/compute/EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest.java similarity index 83% rename from providers/ecc-ec2/src/test/java/org/jclouds/ecc/compute/ECCEucalyptusComputeServiceLiveTest.java rename to providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/eucalyptuspartnercloud/compute/EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest.java index 6cd261e59e..ac2adc6b76 100644 --- a/providers/ecc-ec2/src/test/java/org/jclouds/ecc/compute/ECCEucalyptusComputeServiceLiveTest.java +++ b/providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/eucalyptuspartnercloud/compute/EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc.compute; +package org.jclouds.epc.compute; import static org.jclouds.compute.util.ComputeServiceUtils.getCores; import static org.testng.Assert.assertEquals; @@ -31,11 +31,11 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = "live", sequential = true, testName = "ECCEucalyptusComputeServiceLiveTest") -public class ECCEucalyptusComputeServiceLiveTest extends EC2ComputeServiceLiveTest { +@Test(groups = "live", sequential = true, testName = "EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest") +public class EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest extends EC2ComputeServiceLiveTest { - public ECCEucalyptusComputeServiceLiveTest() { - provider = "ecc-ec2"; + public EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest() { + provider = "eucalyptus-partnercloud-ec2"; // security groups must be <30 characters tag = "eu"; } diff --git a/providers/ecc-ec2/src/test/java/org/jclouds/ecc/compute/ECCEucalyptusTemplateBuilderLiveTest.java b/providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/eucalyptuspartnercloud/compute/EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest.java similarity index 90% rename from providers/ecc-ec2/src/test/java/org/jclouds/ecc/compute/ECCEucalyptusTemplateBuilderLiveTest.java rename to providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/eucalyptuspartnercloud/compute/EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest.java index 8937b77e5d..be3ba7f266 100644 --- a/providers/ecc-ec2/src/test/java/org/jclouds/ecc/compute/ECCEucalyptusTemplateBuilderLiveTest.java +++ b/providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/eucalyptuspartnercloud/compute/EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc.compute; +package org.jclouds.epc.compute; import static org.jclouds.compute.util.ComputeServiceUtils.getCores; import static org.testng.Assert.assertEquals; @@ -37,10 +37,10 @@ import com.google.common.base.Predicate; * @author Adrian Cole */ @Test(groups = "live") -public class ECCEucalyptusTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest { +public class EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest { - public ECCEucalyptusTemplateBuilderLiveTest() { - provider = "ecc-ec2"; + public EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest() { + provider = "eucalyptus-partnercloud-ec2"; } @Override diff --git a/providers/ecc-s3/pom.xml b/providers/eucalyptus-partnercloud-s3/pom.xml similarity index 77% rename from providers/ecc-s3/pom.xml rename to providers/eucalyptus-partnercloud-s3/pom.xml index ce4aba4d8d..51dceb4970 100644 --- a/providers/ecc-s3/pom.xml +++ b/providers/eucalyptus-partnercloud-s3/pom.xml @@ -30,16 +30,16 @@ ../../project/pom.xml org.jclouds.provider - ecc-s3 - jclouds Eucalyptus Community Cloud provider - Walrus (S3) implementation targeted to the Eucalyptus Community Cloud + eucalyptus-partnercloud-s3 + jclouds Eucalyptus Partner Cloud provider + Walrus (S3) implementation targeted to the Eucalyptus Partner Cloud - org.jclouds.ecc.blobstore.ECCWalrusTestInitializer - http://ecc.eucalyptus.com:8773/services/Walrus - 2006-03-01 - ${test.eucalyptus.identity} - ${test.eucalyptus.credential} + org.jclouds.epc.blobstore.EucalyptusPartnerCloudWalrusTestInitializer + http://partnercloud.eucalyptus.com:8773/services/Walrus + 2006-03-01 + FIXME_IDENTITY + FIXME_CREDENTIAL @@ -109,20 +109,20 @@ - test.ecc-s3.endpoint - ${test.ecc-s3.endpoint} + test.eucalyptus-partnercloud-s3.endpoint + ${test.eucalyptus-partnercloud-s3.endpoint} - test.ecc-s3.apiversion - ${test.ecc-s3.apiversion} + test.eucalyptus-partnercloud-s3.apiversion + ${test.eucalyptus-partnercloud-s3.apiversion} - test.ecc-s3.identity - ${test.ecc-s3.identity} + test.eucalyptus-partnercloud-s3.identity + ${test.eucalyptus-partnercloud-s3.identity} - test.ecc-s3.credential - ${test.ecc-s3.credential} + test.eucalyptus-partnercloud-s3.credential + ${test.eucalyptus-partnercloud-s3.credential} test.initializer diff --git a/providers/ecc-s3/src/main/java/org/jclouds/ecc/ECCWalrusPropertiesBuilder.java b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudWalrusPropertiesBuilder.java similarity index 75% rename from providers/ecc-s3/src/main/java/org/jclouds/ecc/ECCWalrusPropertiesBuilder.java rename to providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudWalrusPropertiesBuilder.java index 4e75c1262e..e1dfd9c441 100644 --- a/providers/ecc-s3/src/main/java/org/jclouds/ecc/ECCWalrusPropertiesBuilder.java +++ b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudWalrusPropertiesBuilder.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc; +package org.jclouds.epc; import static org.jclouds.Constants.PROPERTY_ENDPOINT; @@ -26,19 +26,19 @@ import java.util.Properties; import org.jclouds.walrus.WalrusPropertiesBuilder; /** - * Builds properties used in ECCWalrus Clients + * Builds properties used in EucalyptusPartnerCloudWalrus Clients * * @author Adrian Cole */ -public class ECCWalrusPropertiesBuilder extends WalrusPropertiesBuilder { +public class EucalyptusPartnerCloudWalrusPropertiesBuilder extends WalrusPropertiesBuilder { @Override protected Properties defaultProperties() { Properties properties = super.defaultProperties(); - properties.setProperty(PROPERTY_ENDPOINT, "http://ecc.eucalyptus.com:8773/services/Walrus"); + properties.setProperty(PROPERTY_ENDPOINT, "http://partnercloud.eucalyptus.com:8773/services/Walrus"); return properties; } - public ECCWalrusPropertiesBuilder(Properties properties) { + public EucalyptusPartnerCloudWalrusPropertiesBuilder(Properties properties) { super(properties); } diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusAsyncClientTestDisabled.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudWalrusAsyncClientTestDisabled.java similarity index 77% rename from providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusAsyncClientTestDisabled.java rename to providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudWalrusAsyncClientTestDisabled.java index cb9236cdae..83b90ae564 100644 --- a/providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusAsyncClientTestDisabled.java +++ b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudWalrusAsyncClientTestDisabled.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc; +package org.jclouds.epc; import org.testng.annotations.Test; @@ -25,10 +25,10 @@ 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 { +@Test(enabled = false, groups = "unit", testName = "EucalyptusPartnerCloudWalrusAsyncClientTest") +public class EucalyptusPartnerCloudWalrusAsyncClientTestDisabled extends org.jclouds.walrus.WalrusAsyncClientTestDisabled { - public ECCWalrusAsyncClientTestDisabled() { + public EucalyptusPartnerCloudWalrusAsyncClientTestDisabled() { this.provider = "ecc"; this.url = "commondatastorage.googleapis.com"; } diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusClientLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudWalrusClientLiveTest.java similarity index 81% rename from providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusClientLiveTest.java rename to providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudWalrusClientLiveTest.java index 4acbd5d257..ef19782c80 100644 --- a/providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusClientLiveTest.java +++ b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudWalrusClientLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc; +package org.jclouds.epc; import org.jclouds.walrus.WalrusClientLiveTest; import org.testng.annotations.Test; @@ -27,7 +27,7 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = "live", sequential = true, testName = "ECCWalrusClientLiveTest") -public class ECCWalrusClientLiveTest extends WalrusClientLiveTest { +@Test(groups = "live", sequential = true, testName = "EucalyptusPartnerCloudWalrusClientLiveTest") +public class EucalyptusPartnerCloudWalrusClientLiveTest extends WalrusClientLiveTest { } diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobIntegrationLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest.java similarity index 84% rename from providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobIntegrationLiveTest.java rename to providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest.java index f2890a1f05..98b0339182 100644 --- a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobIntegrationLiveTest.java +++ b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc.blobstore; +package org.jclouds.epc.blobstore; import java.io.IOException; import java.util.concurrent.ExecutionException; @@ -28,8 +28,8 @@ import org.testng.annotations.Test; /** * @author Adrian Cole */ -@Test(groups = "live", testName = "ECCWalrusBlobIntegrationLiveTest") -public class ECCWalrusBlobIntegrationLiveTest extends BaseBlobIntegrationTest { +@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest") +public class EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest extends BaseBlobIntegrationTest { @Override @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobLiveTest.java similarity index 82% rename from providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobLiveTest.java rename to providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobLiveTest.java index 63d83c0be8..434fef8c85 100644 --- a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobLiveTest.java +++ b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc.blobstore; +package org.jclouds.epc.blobstore; import org.jclouds.blobstore.integration.internal.BaseBlobLiveTest; import org.testng.annotations.Test; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; /** * @author Adrian Cole */ -@Test(groups = "live", testName = "ECCWalrusBlobLiveTest") -public class ECCWalrusBlobLiveTest extends BaseBlobLiveTest { +@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusBlobLiveTest") +public class EucalyptusPartnerCloudWalrusBlobLiveTest extends BaseBlobLiveTest { } diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobMapIntegrationLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest.java similarity index 79% rename from providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobMapIntegrationLiveTest.java rename to providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest.java index 797c6027a5..b63cffb2be 100644 --- a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobMapIntegrationLiveTest.java +++ b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc.blobstore; +package org.jclouds.epc.blobstore; import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest; import org.testng.annotations.Test; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; /** * @author Adrian Cole */ -@Test(groups = "live", testName = "ECCWalrusBlobMapIntegrationLiveTest") -public class ECCWalrusBlobMapIntegrationLiveTest extends BaseBlobMapIntegrationTest { +@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest") +public class EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest extends BaseBlobMapIntegrationTest { } diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobSignerLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobSignerLiveTest.java similarity index 81% rename from providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobSignerLiveTest.java rename to providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobSignerLiveTest.java index a6f7fcc5c3..043f81c66c 100644 --- a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobSignerLiveTest.java +++ b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobSignerLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc.blobstore; +package org.jclouds.epc.blobstore; import org.jclouds.blobstore.integration.internal.BaseBlobSignerLiveTest; import org.testng.annotations.Test; @@ -26,7 +26,7 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = "live", testName = "ECCWalrusBlobSignerLiveTest") -public class ECCWalrusBlobSignerLiveTest extends BaseBlobSignerLiveTest { +@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusBlobSignerLiveTest") +public class EucalyptusPartnerCloudWalrusBlobSignerLiveTest extends BaseBlobSignerLiveTest { } diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerIntegrationLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest.java similarity index 79% rename from providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerIntegrationLiveTest.java rename to providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest.java index 2f8e3747f3..1313a798ca 100644 --- a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerIntegrationLiveTest.java +++ b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc.blobstore; +package org.jclouds.epc.blobstore; import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest; import org.testng.annotations.Test; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; /** * @author Adrian Cole */ -@Test(groups = "live", testName = "ECCWalrusContainerIntegrationLiveTest") -public class ECCWalrusContainerIntegrationLiveTest extends BaseContainerIntegrationTest { +@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest") +public class EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest extends BaseContainerIntegrationTest { } diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusContainerLiveTest.java similarity index 81% rename from providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerLiveTest.java rename to providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusContainerLiveTest.java index 45ff14c32f..0f7294b518 100644 --- a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerLiveTest.java +++ b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusContainerLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc.blobstore; +package org.jclouds.epc.blobstore; import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest; import org.testng.annotations.Test; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; /** * @author Adrian Cole */ -@Test(groups = "live", testName = "ECCWalrusContainerLiveTest") -public class ECCWalrusContainerLiveTest extends BaseContainerLiveTest { +@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusContainerLiveTest") +public class EucalyptusPartnerCloudWalrusContainerLiveTest extends BaseContainerLiveTest { } diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusInputStreamMapIntegrationLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest.java similarity index 78% rename from providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusInputStreamMapIntegrationLiveTest.java rename to providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest.java index f718fee518..a6ab5cde59 100644 --- a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusInputStreamMapIntegrationLiveTest.java +++ b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc.blobstore; +package org.jclouds.epc.blobstore; import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest; import org.testng.annotations.Test; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; /** * @author Adrian Cole */ -@Test(groups = "live", testName = "ECCWalrusInputStreamMapIntegrationLiveTest") -public class ECCWalrusInputStreamMapIntegrationLiveTest extends BaseInputStreamMapIntegrationTest { +@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest") +public class EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest extends BaseInputStreamMapIntegrationTest { } diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusServiceIntegrationLiveTest.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest.java similarity index 79% rename from providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusServiceIntegrationLiveTest.java rename to providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest.java index fee54268fe..828ff5c844 100644 --- a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusServiceIntegrationLiveTest.java +++ b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc.blobstore; +package org.jclouds.epc.blobstore; import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest; import org.testng.annotations.Test; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; /** * @author Adrian Cole */ -@Test(groups = "live", testName = "ECCWalrusServiceIntegrationLiveTest") -public class ECCWalrusServiceIntegrationLiveTest extends BaseServiceIntegrationTest { +@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest") +public class EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest extends BaseServiceIntegrationTest { } diff --git a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusTestInitializer.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusTestInitializer.java similarity index 90% rename from providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusTestInitializer.java rename to providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusTestInitializer.java index d38d09d12e..e8cb39e441 100644 --- a/providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusTestInitializer.java +++ b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusTestInitializer.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.ecc.blobstore; +package org.jclouds.epc.blobstore; import java.io.IOException; @@ -34,9 +34,9 @@ import com.google.inject.Module; * * @author Adrian Cole */ -public class ECCWalrusTestInitializer extends TransientBlobStoreTestInitializer { +public class EucalyptusPartnerCloudWalrusTestInitializer extends TransientBlobStoreTestInitializer { - public ECCWalrusTestInitializer() { + public EucalyptusPartnerCloudWalrusTestInitializer() { provider = "ecc-s3"; BaseBlobStoreIntegrationTest.SANITY_CHECK_RETURNED_BUCKET_NAME = true; } diff --git a/providers/pom.xml b/providers/pom.xml index 9a5a9b1cb5..b71af8b0d8 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -44,8 +44,8 @@ scaleup-storage synaptic-storage cloudonestorage - ecc-s3 - ecc-ec2 + eucalyptus-partnercloud-s3 + eucalyptus-partnercloud-ec2 cloudservers-us cloudservers-uk cloudfiles-us