From 42137677da51bb7dbfc2ce20bf395815a8cd0ff4 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Thu, 5 Jan 2012 13:09:35 -0800 Subject: [PATCH] Issue 801:fix inconsistency in test property test.provider.apiversion set in pom.xml -> api-version --- apis/atmos/pom.xml | 4 +- .../integration/AtmosTestInitializer.java | 4 +- apis/cloudfiles/pom.xml | 4 +- apis/cloudloadbalancers/pom.xml | 4 +- .../BaseCloudLoadBalancersClientLiveTest.java | 8 +- apis/cloudservers/pom.xml | 4 +- apis/cloudsigma/pom.xml | 4 +- .../cloudsigma/CloudSigmaClientLiveTest.java | 8 +- apis/cloudstack/pom.xml | 4 +- .../features/OfferingClientLiveTest.java | 2 +- apis/cloudwatch/pom.xml | 4 +- .../cloudwatch/CloudWatchClientLiveTest.java | 8 +- apis/deltacloud/pom.xml | 4 +- .../ReadOnlyDeltacloudClientLiveTest.java | 8 +- apis/ec2/pom.xml | 4 +- ...icationArchitecturesEC2ClientLiveTest.java | 8 +- .../jclouds/ec2/EBSBootEC2ClientLiveTest.java | 8 +- .../compute/TestCanRecreateGroupLiveTest.java | 8 +- ...ailabilityZoneAndRegionClientLiveTest.java | 8 +- .../ElasticBlockStoreClientLiveTest.java | 8 +- .../ElasticIPAddressClientLiveTest.java | 8 +- .../ec2/services/InstanceClientLiveTest.java | 8 +- .../ec2/services/KeyPairClientLiveTest.java | 8 +- .../services/SecurityGroupClientLiveTest.java | 8 +- .../ec2/services/WindowsClientLiveTest.java | 8 +- apis/elasticstack/pom.xml | 4 +- .../ElasticStackClientLiveTest.java | 8 +- apis/eucalyptus/pom.xml | 4 +- .../FilesystemTestInitializer.java | 10 +-- apis/nova/pom.xml | 4 +- .../openstack/nova/NovaAsyncClientTest.java | 74 +++++++++---------- apis/s3/pom.xml | 4 +- .../integration/S3TestInitializer.java | 4 +- apis/swift/pom.xml | 4 +- .../integration/SwiftTestInitializer.java | 4 +- apis/vcloud/pom.xml | 4 +- apis/walrus/pom.xml | 4 +- .../resources/archetype-resources/pom.xml | 4 +- .../java/__providerName__ClientLiveTest.java | 2 +- .../TransientBlobStoreTestInitializer.java | 4 +- .../internal/BaseTestInitializer.java | 16 ++-- .../VAppTemplatesInOrgsLiveTest.java | 8 +- .../compute/BaseVersionedServiceLiveTest.java | 8 +- .../org/jclouds/rest/RestContextFactory.java | 4 +- core/src/main/resources/rest.properties | 6 +- .../jclouds/rest/RestContextFactoryTest.java | 14 ++-- .../BaseLoadBalancerServiceLiveTest.java | 4 +- providers/aws-cloudwatch/pom.xml | 6 +- providers/aws-ec2/pom.xml | 4 +- .../aws/ec2/services/AMIClientLiveTest.java | 8 +- .../ec2/services/AWSAMIClientLiveTest.java | 8 +- .../services/AWSInstanceClientLiveTest.java | 8 +- .../services/AWSKeyPairClientLiveTest.java | 8 +- .../services/MonitoringClientLiveTest.java | 8 +- .../PlacementGroupClientLiveTest.java | 8 +- .../services/SpotInstanceClientLiveTest.java | 8 +- .../aws/ec2/services/TagClientLiveTest.java | 8 +- providers/aws-s3/pom.xml | 4 +- .../integration/AWSS3TestInitializer.java | 4 +- providers/azureblob/pom.xml | 4 +- .../azureblob/AzureBlobClientLiveTest.java | 8 +- .../integration/AzureBlobTestInitializer.java | 4 +- providers/bluelock-vcloud-zone01/pom.xml | 4 +- providers/cloudfiles-uk/pom.xml | 4 +- providers/cloudfiles-us/pom.xml | 4 +- providers/cloudloadbalancers-uk/pom.xml | 4 +- providers/cloudloadbalancers-us/pom.xml | 4 +- providers/cloudonestorage/pom.xml | 4 +- providers/cloudservers-uk/pom.xml | 4 +- providers/cloudservers-us/pom.xml | 4 +- providers/cloudsigma-lvs/pom.xml | 4 +- providers/cloudsigma-zrh/pom.xml | 4 +- providers/elastichosts-lax-p/pom.xml | 4 +- providers/elastichosts-lon-b/pom.xml | 4 +- providers/elastichosts-lon-p/pom.xml | 4 +- providers/elastichosts-sat-p/pom.xml | 4 +- providers/elastichosts-tor-p/pom.xml | 4 +- providers/eucalyptus-partnercloud-ec2/pom.xml | 4 +- providers/eucalyptus-partnercloud-s3/pom.xml | 4 +- providers/go2cloud-jhb1/pom.xml | 4 +- providers/gogrid/pom.xml | 4 +- .../gogrid/GoGridLiveTestDisabled.java | 8 +- .../services/BaseGoGridClientLiveTest.java | 8 +- .../greenhousedata-element-vcloud/pom.xml | 4 +- providers/hpcloud-objectstorage-lvs/pom.xml | 6 +- providers/ninefold-compute/pom.xml | 4 +- providers/ninefold-storage/pom.xml | 4 +- providers/openhosting-east1/pom.xml | 4 +- providers/rimuhosting/pom.xml | 4 +- .../miro/RimuHostingClientLiveTest.java | 8 +- providers/savvis-symphonyvpdc/pom.xml | 4 +- .../vpdc/features/BaseVPDCClientLiveTest.java | 8 +- providers/serverlove-z1-man/pom.xml | 4 +- providers/skalicloud-sdg-my/pom.xml | 4 +- providers/slicehost/pom.xml | 4 +- .../slicehost/SlicehostClientLiveTest.java | 8 +- providers/softlayer/pom.xml | 4 +- .../compute/SoftLayerExperimentLiveTest.java | 6 +- providers/stratogen-vcloud-mycloud/pom.xml | 4 +- providers/synaptic-storage/pom.xml | 4 +- providers/trmk-ecloud/pom.xml | 4 +- providers/trmk-vcloudexpress/pom.xml | 4 +- .../InternetServiceLiveTest.java | 8 +- sandbox-apis/elb/pom.xml | 8 +- .../org/jclouds/elb/ELBClientLiveTest.java | 8 +- sandbox-apis/libvirt/pom.xml | 4 +- .../compute/LibvirtExperimentLiveTest.java | 6 +- sandbox-apis/nirvanix/pom.xml | 4 +- sandbox-apis/openstack-nova/pom.xml | 4 +- .../nova/v1_1/NovaPropertiesBuilder.java | 4 +- sandbox-apis/pcs/pom.xml | 4 +- .../jclouds/mezeo/pcs/PCSClientLiveTest.java | 8 +- sandbox-apis/scality-rs2/pom.xml | 4 +- sandbox-apis/simpledb/pom.xml | 4 +- .../simpledb/SimpleDBClientLiveTest.java | 8 +- sandbox-apis/sqs/pom.xml | 4 +- .../org/jclouds/sqs/SQSClientLiveTest.java | 8 +- sandbox-apis/virtualbox/pom.xml | 6 +- .../BaseVirtualBoxClientLiveTest.java | 6 +- sandbox-providers/aws-elb/pom.xml | 8 +- sandbox-providers/aws-simpledb/pom.xml | 4 +- sandbox-providers/azurequeue/pom.xml | 4 +- .../azurequeue/AzureQueueClientLiveTest.java | 8 +- sandbox-providers/boxdotnet/pom.xml | 4 +- sandbox-providers/dunkel-vcd/pom.xml | 4 +- sandbox-providers/glesys/pom.xml | 4 +- sandbox-providers/googlestorage/pom.xml | 4 +- sandbox-providers/hosteurope-storage/pom.xml | 4 +- sandbox-providers/ibm-smartcloud/pom.xml | 4 +- .../BaseIBMSmartCloudClientLiveTest.java | 8 +- sandbox-providers/scaleup-storage/pom.xml | 4 +- sandbox-providers/tiscali-storage/pom.xml | 4 +- sandbox-providers/twitter/pom.xml | 4 +- .../twitter/TwitterClientLiveTest.java | 8 +- .../virtacore-vcloudexpress/pom.xml | 4 +- skeletons/standalone-compute/pom.xml | 4 +- ...nagerComputeServiceContextBuilderTest.java | 2 +- .../ServerManagerComputeServiceLiveTest.java | 2 +- .../ServerManagerExperimentLiveTest.java | 8 +- 139 files changed, 414 insertions(+), 414 deletions(-) diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml index 7b18e5e732..39b35a7b0d 100644 --- a/apis/atmos/pom.xml +++ b/apis/atmos/pom.xml @@ -36,7 +36,7 @@ org.jclouds.atmos.blobstore.integration.AtmosStorageTestInitializer https://accesspoint.atmos.com - 1.3.0 + 1.3.0 FIXME FIXME @@ -95,7 +95,7 @@ ${jclouds.blobstore.httpstream.url} ${jclouds.blobstore.httpstream.md5} ${test.atmos.endpoint} - ${test.atmos.apiversion} + ${test.atmos.api-version} ${test.atmos.identity} ${test.atmos.credential} diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosTestInitializer.java b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosTestInitializer.java index f77aec3323..8714a61fe8 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosTestInitializer.java +++ b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosTestInitializer.java @@ -38,10 +38,10 @@ public class AtmosTestInitializer extends TransientBlobStoreTestInitializer { } @Override - protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion, + protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, String app, String identity, String credential) throws IOException { return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule, - new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential)); + new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); } } diff --git a/apis/cloudfiles/pom.xml b/apis/cloudfiles/pom.xml index cc1fac20d9..fb89a2e315 100644 --- a/apis/cloudfiles/pom.xml +++ b/apis/cloudfiles/pom.xml @@ -36,7 +36,7 @@ org.jclouds.cloudfiles.blobstore.integration.CloudFilesTestInitializer https://auth.api.rackspacecloud.com - 1.0 + 1.0 ${test.rackspace.identity} ${test.rackspace.credential} @@ -110,7 +110,7 @@ ${jclouds.blobstore.httpstream.url} ${jclouds.blobstore.httpstream.md5} ${test.cloudfiles.endpoint} - ${test.cloudfiles.apiversion} + ${test.cloudfiles.api-version} ${test.cloudfiles.identity} ${test.cloudfiles.credential} diff --git a/apis/cloudloadbalancers/pom.xml b/apis/cloudloadbalancers/pom.xml index 744e6ac8ae..695cff8f1c 100644 --- a/apis/cloudloadbalancers/pom.xml +++ b/apis/cloudloadbalancers/pom.xml @@ -35,7 +35,7 @@ https://auth.api.rackspacecloud.com - 1.0 + 1.0 ${test.rackspace.identity} ${test.rackspace.credential} @@ -96,7 +96,7 @@ ${test.cloudloadbalancers.endpoint} - ${test.cloudloadbalancers.apiversion} + ${test.cloudloadbalancers.api-version} ${test.cloudloadbalancers.identity} ${test.cloudloadbalancers.credential} diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/BaseCloudLoadBalancersClientLiveTest.java b/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/BaseCloudLoadBalancersClientLiveTest.java index a673f24bbd..8b773d59ab 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/BaseCloudLoadBalancersClientLiveTest.java +++ b/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/BaseCloudLoadBalancersClientLiveTest.java @@ -57,7 +57,7 @@ public class BaseCloudLoadBalancersClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected Predicate socketTester; protected RetryablePredicate loadBalancerActive; protected RetryablePredicate loadBalancerDeleted; @@ -70,7 +70,7 @@ public class BaseCloudLoadBalancersClientLiveTest { credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential must be set. ex. secretKey"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -81,8 +81,8 @@ public class BaseCloudLoadBalancersClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/cloudservers/pom.xml b/apis/cloudservers/pom.xml index 4e769921b5..9fa8134f41 100644 --- a/apis/cloudservers/pom.xml +++ b/apis/cloudservers/pom.xml @@ -36,7 +36,7 @@ https://auth.api.rackspacecloud.com - 1.0 + 1.0 ${test.rackspace.identity} ${test.rackspace.credential} @@ -108,7 +108,7 @@ ${test.cloudstack.endpoint} - ${test.cloudstack.apiversion} + ${test.cloudstack.api-version} ${test.cloudstack.identity} ${test.cloudstack.credential} ${test.cloudstack.image-id} diff --git a/apis/cloudsigma/pom.xml b/apis/cloudsigma/pom.xml index 66a68ee424..669d9de61f 100644 --- a/apis/cloudsigma/pom.xml +++ b/apis/cloudsigma/pom.xml @@ -35,7 +35,7 @@ https://api.cloudsigma.com - 1.0 + 1.0 FIXME FIXME @@ -94,7 +94,7 @@ ${test.cloudsigma.endpoint} - ${test.cloudsigma.apiversion} + ${test.cloudsigma.api-version} ${test.cloudsigma.identity} ${test.cloudsigma.credential} ${test.cloudsigma.image-id} diff --git a/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java b/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java index 9d0cd928eb..9b94fabd1d 100644 --- a/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java +++ b/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java @@ -87,14 +87,14 @@ public class CloudSigmaClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected Predicate driveNotClaimed; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -106,8 +106,8 @@ public class CloudSigmaClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/cloudstack/pom.xml b/apis/cloudstack/pom.xml index 07938303ae..d5dc5d69ce 100644 --- a/apis/cloudstack/pom.xml +++ b/apis/cloudstack/pom.xml @@ -49,7 +49,7 @@ http://localhost:8080/client/api - 2.2.12 + 2.2.12 FIXME_apiKey FIXME_secretKey @@ -116,7 +116,7 @@ 2 ${test.cloudstack.endpoint} - ${test.cloudstack.apiversion} + ${test.cloudstack.api-version} ${test.cloudstack.identity} ${test.cloudstack.credential} ${test.cloudstack.image-id} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingClientLiveTest.java index ffec261d42..eb4ec13f05 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingClientLiveTest.java @@ -64,7 +64,7 @@ public class OfferingClientLiveTest extends BaseCloudStackClientLiveTest { } catch (NoSuchElementException e) { // This bug is present both in 2.2.8 and 2.2.12 - assertTrue("2.2.8".equals(apiversion) || "2.2.12".equals(apiversion)); + assertTrue("2.2.8".equals(apiVersion) || "2.2.12".equals(apiVersion)); } } } diff --git a/apis/cloudwatch/pom.xml b/apis/cloudwatch/pom.xml index bf0b2aa582..d3d11f7a1e 100644 --- a/apis/cloudwatch/pom.xml +++ b/apis/cloudwatch/pom.xml @@ -35,7 +35,7 @@ https://monitoring.us-east-1.amazonaws.com - 2009-05-15 + 2009-05-15 ${test.aws.identity} ${test.aws.credential} @@ -86,7 +86,7 @@ ${test.cloudwatch.endpoint} - ${test.cloudwatch.apiversion} + ${test.cloudwatch.api-version} ${test.cloudwatch.identity} ${test.cloudwatch.credential} diff --git a/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java b/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java index 5b277633d4..9b930ee950 100644 --- a/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java +++ b/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java @@ -54,14 +54,14 @@ public class CloudWatchClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint", null); - apiversion = System.getProperty("test." + provider + ".apiversion", null); + apiVersion = System.getProperty("test." + provider + ".api-version", null); } protected Properties setupProperties() { @@ -72,8 +72,8 @@ public class CloudWatchClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/deltacloud/pom.xml b/apis/deltacloud/pom.xml index 22f18bb3c1..e959bbb8eb 100644 --- a/apis/deltacloud/pom.xml +++ b/apis/deltacloud/pom.xml @@ -49,7 +49,7 @@ http://localhost:3001/api - 0.3.0 + 0.3.0 mockuser mockpassword @@ -107,7 +107,7 @@ ${test.deltacloud.endpoint} - ${test.deltacloud.apiversion} + ${test.deltacloud.api-version} ${test.deltacloud.identity} ${test.deltacloud.credential} ${test.deltacloud.image-id} diff --git a/apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java index 30061ef8a5..b71ecef502 100644 --- a/apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java +++ b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java @@ -69,7 +69,7 @@ public class ReadOnlyDeltacloudClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected Predicate socketTester; protected ImmutableMap> stateChanges; @@ -77,7 +77,7 @@ public class ReadOnlyDeltacloudClientLiveTest { identity = System.getProperty("test." + provider + ".identity", "mockuser"); credential = System.getProperty("test." + provider + ".credential", "mockpassword"); endpoint = System.getProperty("test." + provider + ".endpoint", "http://localhost:3001/api"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -89,8 +89,8 @@ public class ReadOnlyDeltacloudClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml index 308adc5edc..b109122482 100644 --- a/apis/ec2/pom.xml +++ b/apis/ec2/pom.xml @@ -35,7 +35,7 @@ https://ec2.us-east-1.amazonaws.com - 2010-06-15 + 2010-06-15 ${test.aws.identity} ${test.aws.credential} @@ -102,7 +102,7 @@ ${test.ec2.endpoint} - ${test.ec2.apiversion} + ${test.ec2.api-version} ${test.ec2.identity} ${test.ec2.credential} ${test.ec2.image-id} diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java index 8243cf2a25..d1d7764993 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java @@ -99,15 +99,15 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint"); - apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider - + ".apiversion"); + apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider + + ".api-version"); } protected Properties setupProperties() { @@ -117,7 +117,7 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest { overrides.setProperty(provider + ".identity", identity); overrides.setProperty(provider + ".credential", credential); overrides.setProperty(provider + ".endpoint", endpoint); - overrides.setProperty(provider + ".apiversion", apiversion); + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ClientLiveTest.java index 7d27d65a21..424bb81abf 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ClientLiveTest.java @@ -128,15 +128,15 @@ public class EBSBootEC2ClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint"); - apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider - + ".apiversion"); + apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider + + ".api-version"); } protected Properties setupProperties() { @@ -146,7 +146,7 @@ public class EBSBootEC2ClientLiveTest { overrides.setProperty(provider + ".identity", identity); overrides.setProperty(provider + ".credential", credential); overrides.setProperty(provider + ".endpoint", endpoint); - overrides.setProperty(provider + ".apiversion", apiversion); + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/TestCanRecreateGroupLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/TestCanRecreateGroupLiveTest.java index c6e6eeae59..ea244cfd7a 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/TestCanRecreateGroupLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/TestCanRecreateGroupLiveTest.java @@ -52,14 +52,14 @@ public class TestCanRecreateGroupLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; @BeforeClass protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -71,8 +71,8 @@ public class TestCanRecreateGroupLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java index 329a678981..4e6161b02c 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java @@ -63,14 +63,14 @@ public class AvailabilityZoneAndRegionClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; @BeforeClass protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -82,8 +82,8 @@ public class AvailabilityZoneAndRegionClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/services/ElasticBlockStoreClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/services/ElasticBlockStoreClientLiveTest.java index 79bc671bb1..c5e47a3b1a 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/services/ElasticBlockStoreClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/services/ElasticBlockStoreClientLiveTest.java @@ -67,14 +67,14 @@ public class ElasticBlockStoreClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; @BeforeClass protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -86,8 +86,8 @@ public class ElasticBlockStoreClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/services/ElasticIPAddressClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/services/ElasticIPAddressClientLiveTest.java index 43919840d5..093e1a5ed7 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/services/ElasticIPAddressClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/services/ElasticIPAddressClientLiveTest.java @@ -57,15 +57,15 @@ public class ElasticIPAddressClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint"); - apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider - + ".apiversion"); + apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider + + ".api-version"); } protected Properties setupProperties() { @@ -75,7 +75,7 @@ public class ElasticIPAddressClientLiveTest { overrides.setProperty(provider + ".identity", identity); overrides.setProperty(provider + ".credential", credential); overrides.setProperty(provider + ".endpoint", endpoint); - overrides.setProperty(provider + ".apiversion", apiversion); + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/services/InstanceClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/services/InstanceClientLiveTest.java index 4cb404455d..b4ba539c7a 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/services/InstanceClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/services/InstanceClientLiveTest.java @@ -56,15 +56,15 @@ public class InstanceClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint"); - apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider - + ".apiversion"); + apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider + + ".api-version"); } protected Properties setupProperties() { @@ -74,7 +74,7 @@ public class InstanceClientLiveTest { overrides.setProperty(provider + ".identity", identity); overrides.setProperty(provider + ".credential", credential); overrides.setProperty(provider + ".endpoint", endpoint); - overrides.setProperty(provider + ".apiversion", apiversion); + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/services/KeyPairClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/services/KeyPairClientLiveTest.java index 3107404eb6..fde95f7428 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/services/KeyPairClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/services/KeyPairClientLiveTest.java @@ -58,15 +58,15 @@ public class KeyPairClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint"); - apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider - + ".apiversion"); + apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider + + ".api-version"); } protected Properties setupProperties() { @@ -76,7 +76,7 @@ public class KeyPairClientLiveTest { overrides.setProperty(provider + ".identity", identity); overrides.setProperty(provider + ".credential", credential); overrides.setProperty(provider + ".endpoint", endpoint); - overrides.setProperty(provider + ".apiversion", apiversion); + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupClientLiveTest.java index 937271004c..1ee7e34ded 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupClientLiveTest.java @@ -65,14 +65,14 @@ public class SecurityGroupClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -83,8 +83,8 @@ public class SecurityGroupClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/services/WindowsClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/services/WindowsClientLiveTest.java index 67ec2831ea..d1dba37c0b 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/services/WindowsClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/services/WindowsClientLiveTest.java @@ -52,15 +52,15 @@ public class WindowsClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint"); - apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider - + ".apiversion"); + apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider + + ".api-version"); } protected Properties setupProperties() { @@ -70,7 +70,7 @@ public class WindowsClientLiveTest { overrides.setProperty(provider + ".identity", identity); overrides.setProperty(provider + ".credential", credential); overrides.setProperty(provider + ".endpoint", endpoint); - overrides.setProperty(provider + ".apiversion", apiversion); + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/elasticstack/pom.xml b/apis/elasticstack/pom.xml index 03ac365535..e2c3472fa3 100644 --- a/apis/elasticstack/pom.xml +++ b/apis/elasticstack/pom.xml @@ -49,7 +49,7 @@ https://api.lon-p.elastichosts.com - 1.0 + 1.0 FIXME FIXME @@ -107,7 +107,7 @@ ${test.elasticstack.endpoint} - ${test.elasticstack.apiversion} + ${test.elasticstack.api-version} ${test.elasticstack.identity} ${test.elasticstack.credential} ${test.elasticstack.image-id} diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackClientLiveTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackClientLiveTest.java index d7bc885e9f..8a18e54be9 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackClientLiveTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackClientLiveTest.java @@ -86,14 +86,14 @@ public class ElasticStackClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected Predicate driveNotClaimed; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -105,8 +105,8 @@ public class ElasticStackClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/apis/eucalyptus/pom.xml b/apis/eucalyptus/pom.xml index 78e6ff1317..b23e47e2d0 100644 --- a/apis/eucalyptus/pom.xml +++ b/apis/eucalyptus/pom.xml @@ -35,7 +35,7 @@ http://ecc.eucalyptus.com:8773/services/Eucalyptus - 2010-06-15 + 2010-06-15 FIXME_IDENTITY FIXME_CREDENTIAL @@ -102,7 +102,7 @@ ${test.eucalyptus.endpoint} - ${test.eucalyptus.apiversion} + ${test.eucalyptus.api-version} ${test.eucalyptus.identity} ${test.eucalyptus.credential} ${test.eucalyptus.image-id} diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java index 95227305f2..8547f47a78 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java @@ -44,17 +44,17 @@ public class FilesystemTestInitializer extends TransientBlobStoreTestInitializer } @Override - protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion, + protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, String app, String identity, String credential) throws IOException { return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule, - new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential)); + new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); } @Override - protected Properties setupProperties(String endpoint, String apiversion, String identity, String credential) { - Properties props = super.setupProperties(endpoint, apiversion, identity, credential); + protected Properties setupProperties(String endpoint, String apiVersion, String identity, String credential) { + Properties props = super.setupProperties(endpoint, apiVersion, identity, credential); props.setProperty(FilesystemConstants.PROPERTY_BASEDIR, TestUtils.TARGET_BASE_DIR); return props; } -} \ No newline at end of file +} diff --git a/apis/nova/pom.xml b/apis/nova/pom.xml index a59b919d39..8c4be91288 100644 --- a/apis/nova/pom.xml +++ b/apis/nova/pom.xml @@ -35,7 +35,7 @@ http://localhost:8773/services/Cloud - 1.1 + 1.1 FIXME_IDENTITY FIXME_CREDENTIALS @@ -115,7 +115,7 @@ ${test.nova.endpoint} - ${test.nova.apiversion} + ${test.nova.api-version} ${test.nova.identity} ${test.nova.credential} ${test.nova.image-id} diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/NovaAsyncClientTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/NovaAsyncClientTest.java index f9526464be..47d84448c1 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/NovaAsyncClientTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/NovaAsyncClientTest.java @@ -78,7 +78,7 @@ public class NovaAsyncClientTest extends RestClientTest { createServerOptionsVarargsClass); HttpRequest request = processor.createRequest(method, "ralphie", 2, 1); - assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers?format=json HTTP/1.1"); + assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, "{\"server\":{\"name\":\"ralphie\",\"imageRef\":\"2\",\"flavorRef\":\"1\"}}", "application/json", false); @@ -98,7 +98,7 @@ public class NovaAsyncClientTest extends RestClientTest { HttpRequest request = processor .createRequest(method, "ralphie", 2, 1, withFile("/etc/jclouds", "foo".getBytes())); - assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers?format=json HTTP/1.1"); + assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals( request, @@ -120,7 +120,7 @@ public class NovaAsyncClientTest extends RestClientTest { HttpRequest request = processor.createRequest(method, "ralphie", 2, 1, withMetadata(ImmutableMap.of("foo", "bar"))); - assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers?format=json HTTP/1.1"); + assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, "{\"server\":{\"name\":\"ralphie\",\"imageRef\":\"2\",\"flavorRef\":\"1\",\"metadata\":{\"foo\":\"bar\"}}}", @@ -138,7 +138,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("deleteImage", int.class); HttpRequest request = processor.createRequest(method, 2); - assertRequestLineEquals(request, "DELETE http://endpoint/vapiversion/images/2 HTTP/1.1"); + assertRequestLineEquals(request, "DELETE http://endpoint/vapi-version/images/2 HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: */*\n"); assertPayloadEquals(request, null, null, false); @@ -153,7 +153,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("listServers", listOptionsVarargsClass); HttpRequest request = processor.createRequest(method); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -171,7 +171,7 @@ public class NovaAsyncClientTest extends RestClientTest { HttpRequest request = processor.createRequest(method, changesSince(now).maxResults(1).startAt(2)); assertRequestLineEquals(request, - "GET http://endpoint/vapiversion/servers?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1"); + "GET http://endpoint/vapi-version/servers?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -186,7 +186,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("listServers", listOptionsVarargsClass); HttpRequest request = processor.createRequest(method, withDetails()); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/detail?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/detail?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -201,7 +201,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("getServer", int.class); HttpRequest request = processor.createRequest(method, 2); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/2?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/2?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -216,7 +216,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("getServer", String.class); HttpRequest request = processor.createRequest(method, "dfdcd0a6-0a2f-11e1-8505-2837371c69ae"); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/dfdcd0a6-0a2f-11e1-8505-2837371c69ae?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/dfdcd0a6-0a2f-11e1-8505-2837371c69ae?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -231,7 +231,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("listFlavors", listOptionsVarargsClass); HttpRequest request = processor.createRequest(method); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/flavors?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/flavors?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -247,7 +247,7 @@ public class NovaAsyncClientTest extends RestClientTest { HttpRequest request = processor.createRequest(method, changesSince(now).maxResults(1).startAt(2)); assertRequestLineEquals(request, - "GET http://endpoint/vapiversion/flavors?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1"); + "GET http://endpoint/vapi-version/flavors?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -262,7 +262,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("listFlavors", listOptionsVarargsClass); HttpRequest request = processor.createRequest(method, withDetails()); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/flavors/detail?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/flavors/detail?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -278,7 +278,7 @@ public class NovaAsyncClientTest extends RestClientTest { HttpRequest request = processor.createRequest(method, withDetails().changesSince(now).maxResults(1).startAt(2)); assertRequestLineEquals(request, - "GET http://endpoint/vapiversion/flavors/detail?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1"); + "GET http://endpoint/vapi-version/flavors/detail?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -293,7 +293,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("getFlavor", int.class); HttpRequest request = processor.createRequest(method, 2); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/flavors/2?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/flavors/2?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -308,7 +308,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("getFlavor", String.class); HttpRequest request = processor.createRequest(method, "209904b6-0a30-11e1-a0f0-2837371c69ae"); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/flavors/209904b6-0a30-11e1-a0f0-2837371c69ae?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/flavors/209904b6-0a30-11e1-a0f0-2837371c69ae?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -323,7 +323,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("listImages", listOptionsVarargsClass); HttpRequest request = processor.createRequest(method); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/images?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/images?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -338,7 +338,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("listImages", listOptionsVarargsClass); HttpRequest request = processor.createRequest(method, withDetails()); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/images/detail?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/images/detail?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -354,7 +354,7 @@ public class NovaAsyncClientTest extends RestClientTest { HttpRequest request = processor.createRequest(method, changesSince(now).maxResults(1).startAt(2)); assertRequestLineEquals(request, - "GET http://endpoint/vapiversion/images?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1"); + "GET http://endpoint/vapi-version/images?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -370,7 +370,7 @@ public class NovaAsyncClientTest extends RestClientTest { HttpRequest request = processor.createRequest(method, withDetails().changesSince(now).maxResults(1).startAt(2)); assertRequestLineEquals(request, - "GET http://endpoint/vapiversion/images/detail?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1"); + "GET http://endpoint/vapi-version/images/detail?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -385,7 +385,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("getImage", int.class); HttpRequest request = processor.createRequest(method, 2); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/images/2?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/images/2?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -400,7 +400,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("getImage", int.class); HttpRequest request = processor.createRequest(method, "3bd52d90-0a30-11e1-83f5-2837371c69ae"); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/images/3bd52d90-0a30-11e1-83f5-2837371c69ae?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/images/3bd52d90-0a30-11e1-83f5-2837371c69ae?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -415,7 +415,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("deleteServer", int.class); HttpRequest request = processor.createRequest(method, 2); - assertRequestLineEquals(request, "DELETE http://endpoint/vapiversion/servers/2 HTTP/1.1"); + assertRequestLineEquals(request, "DELETE http://endpoint/vapi-version/servers/2 HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: */*\n"); assertPayloadEquals(request, null, null, false); @@ -430,7 +430,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("deleteServer", String.class); HttpRequest request = processor.createRequest(method, "db8a1ac6-0a35-11e1-a42f-2837371c69ae"); - assertRequestLineEquals(request, "DELETE http://endpoint/vapiversion/servers/db8a1ac6-0a35-11e1-a42f-2837371c69ae HTTP/1.1"); + assertRequestLineEquals(request, "DELETE http://endpoint/vapi-version/servers/db8a1ac6-0a35-11e1-a42f-2837371c69ae HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: */*\n"); assertPayloadEquals(request, null, null, false); @@ -445,7 +445,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("changeAdminPass", int.class, String.class); HttpRequest request = processor.createRequest(method, 2, "foo"); - assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action HTTP/1.1"); + assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: */*\n"); assertPayloadEquals(request, "{\"changePassword\":{\"adminPass\":\"foo\"}}", MediaType.APPLICATION_JSON, false); @@ -461,7 +461,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("renameServer", int.class, String.class); HttpRequest request = processor.createRequest(method, 2, "foo"); - assertRequestLineEquals(request, "PUT http://endpoint/vapiversion/servers/2 HTTP/1.1"); + assertRequestLineEquals(request, "PUT http://endpoint/vapi-version/servers/2 HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: */*\n"); assertPayloadEquals(request, "{\"server\":{\"name\":\"foo\"}}", MediaType.APPLICATION_JSON, false); @@ -477,7 +477,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("getAddresses", int.class); HttpRequest request = processor.createRequest(method, 2); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/2/ips?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/2/ips?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -492,7 +492,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("listPublicAddresses", int.class); HttpRequest request = processor.createRequest(method, 2); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/2/ips/public?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/2/ips/public?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -508,7 +508,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("listPrivateAddresses", int.class); HttpRequest request = processor.createRequest(method, 2); - assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/2/ips/private?format=json HTTP/1.1"); + assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/2/ips/private?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, null, null, false); @@ -524,7 +524,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("createImageFromServer", String.class, int.class); HttpRequest request = processor.createRequest(method, "ralphie", 2); - assertRequestLineEquals(request, "POST http://endpoint/vapiversion/images?format=json HTTP/1.1"); + assertRequestLineEquals(request, "POST http://endpoint/vapi-version/images?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: application/json\n"); assertPayloadEquals(request, "{\"image\":{\"serverId\":2,\"name\":\"ralphie\"}}", MediaType.APPLICATION_JSON, false); @@ -546,7 +546,7 @@ public class NovaAsyncClientTest extends RestClientTest { rebuildServerOptionsVarargsClass); HttpRequest request = processor.createRequest(method, 3); - assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/3/action?format=json HTTP/1.1"); + assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/3/action?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: */*\n"); assertPayloadEquals(request, "{\"rebuild\":{}}", MediaType.APPLICATION_JSON, false); @@ -563,7 +563,7 @@ public class NovaAsyncClientTest extends RestClientTest { rebuildServerOptionsVarargsClass); HttpRequest request = processor.createRequest(method, 3, withImage("2")); - assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/3/action?format=json HTTP/1.1"); + assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/3/action?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: */*\n"); assertPayloadEquals(request, "{\"rebuild\":{\"imageRef\":\"2\"}}", MediaType.APPLICATION_JSON, false); @@ -579,7 +579,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("rebootServer", int.class, RebootType.class); HttpRequest request = processor.createRequest(method, 2, RebootType.HARD); - assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action?format=json HTTP/1.1"); + assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: */*\n"); assertPayloadEquals(request, "{\"reboot\":{\"type\":\"HARD\"}}", MediaType.APPLICATION_JSON, false); @@ -595,7 +595,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("resizeServer", int.class, int.class); HttpRequest request = processor.createRequest(method, 2, 3); - assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action?format=json HTTP/1.1"); + assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: */*\n"); assertPayloadEquals(request, "{\"resize\":{\"flavorId\":3}}", MediaType.APPLICATION_JSON, false); @@ -611,7 +611,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("confirmResizeServer", int.class); HttpRequest request = processor.createRequest(method, 2); - assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action?format=json HTTP/1.1"); + assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: */*\n"); assertPayloadEquals(request, "{\"confirmResize\":null}", MediaType.APPLICATION_JSON, false); @@ -626,7 +626,7 @@ public class NovaAsyncClientTest extends RestClientTest { Method method = NovaAsyncClient.class.getMethod("revertResizeServer", int.class); HttpRequest request = processor.createRequest(method, 2); - assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action?format=json HTTP/1.1"); + assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action?format=json HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Accept: */*\n"); assertPayloadEquals(request, "{\"revertResize\":null}", MediaType.APPLICATION_JSON, false); @@ -665,7 +665,7 @@ public class NovaAsyncClientTest extends RestClientTest { @Override protected URI provideServerUrl(AuthenticationResponse response) { - return URI.create("http://endpoint/vapiversion"); + return URI.create("http://endpoint/vapi-version"); } } @@ -680,7 +680,7 @@ public class NovaAsyncClientTest extends RestClientTest { @Override protected Properties getProperties() { Properties overrides = new Properties(); - overrides.setProperty(PROPERTY_API_VERSION, "apiversion"); + overrides.setProperty(PROPERTY_API_VERSION, "api-version"); overrides.setProperty(provider + ".endpoint", "http://endpoint"); overrides.setProperty(provider + ".contextbuilder", NovaContextBuilder.class.getName()); return overrides; diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml index 59af2a82e7..002d13e03e 100644 --- a/apis/s3/pom.xml +++ b/apis/s3/pom.xml @@ -36,7 +36,7 @@ org.jclouds.s3.blobstore.integration.S3TestInitializer https://s3.amazonaws.com - 2006-03-01 + 2006-03-01 ${test.aws.identity} ${test.aws.credential} @@ -108,7 +108,7 @@ ${jclouds.blobstore.httpstream.url} ${jclouds.blobstore.httpstream.md5} ${test.s3.endpoint} - ${test.s3.apiversion} + ${test.s3.api-version} ${test.s3.identity} ${test.s3.credential} diff --git a/apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3TestInitializer.java b/apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3TestInitializer.java index 54a0660407..d7d3cb706b 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3TestInitializer.java +++ b/apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3TestInitializer.java @@ -41,10 +41,10 @@ public class S3TestInitializer extends TransientBlobStoreTestInitializer { } @Override - protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion, + protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, String app, String identity, String credential) throws IOException { return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule, - new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential)); + new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); } } diff --git a/apis/swift/pom.xml b/apis/swift/pom.xml index 3290e70923..9c7fcb2a84 100644 --- a/apis/swift/pom.xml +++ b/apis/swift/pom.xml @@ -36,7 +36,7 @@ org.jclouds.openstack.swift.blobstore.integration.SwiftTestInitializer http://localhost:11000 - 1.0 + 1.0 test:tester testing @@ -108,7 +108,7 @@ ${jclouds.blobstore.httpstream.url} ${jclouds.blobstore.httpstream.md5} ${test.swift.endpoint} - ${test.swift.apiversion} + ${test.swift.api-version} ${test.swift.identity} ${test.swift.credential} diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftTestInitializer.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftTestInitializer.java index 56b17836c3..59753eae26 100644 --- a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftTestInitializer.java +++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftTestInitializer.java @@ -39,10 +39,10 @@ public class SwiftTestInitializer extends TransientBlobStoreTestInitializer { } @Override - protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion, + protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, String app, String identity, String credential) throws IOException { return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule, - new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential)); + new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); } } diff --git a/apis/vcloud/pom.xml b/apis/vcloud/pom.xml index f7cfef97cc..55daeae8fa 100644 --- a/apis/vcloud/pom.xml +++ b/apis/vcloud/pom.xml @@ -35,7 +35,7 @@ FIXME - 1.0 + 1.0 FIXME FIXME @@ -105,7 +105,7 @@ ${test.vcloud.endpoint} - ${test.vcloud.apiversion} + ${test.vcloud.api-version} ${test.vcloud.identity} ${test.vcloud.credential} ${test.vcloud.image-id} diff --git a/apis/walrus/pom.xml b/apis/walrus/pom.xml index 5080196232..40b10b971a 100644 --- a/apis/walrus/pom.xml +++ b/apis/walrus/pom.xml @@ -36,7 +36,7 @@ org.jclouds.walrus.blobstore.WalrusTestInitializer http://ecc.eucalyptus.com:8773/services/Walrus - 2006-03-01 + 2006-03-01 ${test.eucalyptus.identity} ${test.eucalyptus.credential} @@ -104,7 +104,7 @@ ${jclouds.blobstore.httpstream.url} ${jclouds.blobstore.httpstream.md5} ${test.walrus.endpoint} - ${test.walrus.apiversion} + ${test.walrus.api-version} ${test.walrus.identity} ${test.walrus.credential} diff --git a/archetypes/rest-client-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/rest-client-archetype/src/main/resources/archetype-resources/pom.xml index ea9669377d..d0ceb2a7ad 100644 --- a/archetypes/rest-client-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/rest-client-archetype/src/main/resources/archetype-resources/pom.xml @@ -58,7 +58,7 @@ $symbol_dollar = '$' ) ${providerIdentity} ${providerCredential} - ${providerApiVersion} + ${providerApiVersion} ${providerEndpoint} @@ -107,7 +107,7 @@ $symbol_dollar = '$' ) \$\{test.${lcaseProviderName}.identity\} \$\{test.${lcaseProviderName}.credential\} \$\{test.${lcaseProviderName}.endpoint\} - \$\{test.${lcaseProviderName}.apiversion\} + \$\{test.${lcaseProviderName}.api-version\} diff --git a/archetypes/rest-client-archetype/src/main/resources/archetype-resources/src/test/java/__providerName__ClientLiveTest.java b/archetypes/rest-client-archetype/src/main/resources/archetype-resources/src/test/java/__providerName__ClientLiveTest.java index 3938b3ac7e..df5b05472c 100644 --- a/archetypes/rest-client-archetype/src/main/resources/archetype-resources/src/test/java/__providerName__ClientLiveTest.java +++ b/archetypes/rest-client-archetype/src/main/resources/archetype-resources/src/test/java/__providerName__ClientLiveTest.java @@ -55,7 +55,7 @@ public class ${providerName}ClientLiveTest { identity = checkNotNull(System.getProperty("test.${lcaseProviderName}.identity"), "test.${lcaseProviderName}.identity"); credential = checkNotNull(System.getProperty("test.${lcaseProviderName}.credential"), "test.${lcaseProviderName}.credential"); endpoint = checkNotNull(System.getProperty("test.${lcaseProviderName}.endpoint"), "test.${lcaseProviderName}.endpoint"); - apiVersion = checkNotNull(System.getProperty("test.${lcaseProviderName}.apiversion"), "test.${lcaseProviderName}.apiversion"); + apiVersion = checkNotNull(System.getProperty("test.${lcaseProviderName}.api-version"), "test.${lcaseProviderName}.api-version"); } @BeforeGroups(groups = { "live" }) diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobStoreTestInitializer.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobStoreTestInitializer.java index 10095cb1e6..63cdf5748f 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobStoreTestInitializer.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobStoreTestInitializer.java @@ -32,10 +32,10 @@ import com.google.inject.Module; public class TransientBlobStoreTestInitializer extends BaseTestInitializer { @Override - protected BlobStoreContext createLiveContext(Module configurationModule, String url, String apiversion, String app, + protected BlobStoreContext createLiveContext(Module configurationModule, String url, String apiVersion, String app, String identity, String key) throws IOException { return createStubContext(); } -} \ No newline at end of file +} diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java index 02c8031819..1082d5d8a8 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java @@ -37,7 +37,7 @@ public abstract class BaseTestInitializer { String app = System.getProperty("test.app"); String identity = System.getProperty("test." + provider + ".identity"); String credential = System.getProperty("test." + provider + ".credential"); - String apiversion = System.getProperty("test." + provider + ".apiversion"); + String apiVersion = System.getProperty("test." + provider + ".api-version"); if (endpoint != null) testContext.setAttribute("test." + provider + ".endpoint", endpoint); if (app != null) @@ -47,15 +47,15 @@ public abstract class BaseTestInitializer { if (credential != null) testContext.setAttribute("test." + provider + ".credential", credential); if (credential != null) - testContext.setAttribute("test." + provider + ".apiversion", apiversion); + testContext.setAttribute("test." + provider + ".api-version", apiVersion); if (identity != null) { - return createLiveContext(configurationModule, endpoint, apiversion, app, identity, credential); + return createLiveContext(configurationModule, endpoint, apiVersion, app, identity, credential); } else { return createStubContext(); } } - protected Properties setupProperties(String endpoint, String apiversion, String identity, String credential) { + protected Properties setupProperties(String endpoint, String apiVersion, String identity, String credential) { Properties overrides = new Properties(); overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true"); overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true"); @@ -65,8 +65,8 @@ public abstract class BaseTestInitializer { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } @@ -74,6 +74,6 @@ public abstract class BaseTestInitializer { return new BlobStoreContextFactory().createContext("transient", "foo", "bar"); } - protected abstract BlobStoreContext createLiveContext(Module configurationModule, String url, String apiversion, + protected abstract BlobStoreContext createLiveContext(Module configurationModule, String url, String apiVersion, String app, String identity, String key) throws IOException; -} \ No newline at end of file +} diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/suppliers/VAppTemplatesInOrgsLiveTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/suppliers/VAppTemplatesInOrgsLiveTest.java index 9f75e175d8..d089aaa5ce 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/suppliers/VAppTemplatesInOrgsLiveTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/suppliers/VAppTemplatesInOrgsLiveTest.java @@ -59,15 +59,15 @@ public class VAppTemplatesInOrgsLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint"); - apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider - + ".apiversion"); + apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider + + ".api-version"); } protected Properties setupProperties() { @@ -77,7 +77,7 @@ public class VAppTemplatesInOrgsLiveTest { overrides.setProperty(provider + ".identity", identity); overrides.setProperty(provider + ".credential", credential); overrides.setProperty(provider + ".endpoint", endpoint); - overrides.setProperty(provider + ".apiversion", apiversion); + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/compute/src/test/java/org/jclouds/compute/BaseVersionedServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/BaseVersionedServiceLiveTest.java index a01c05394c..31d256cd91 100644 --- a/compute/src/test/java/org/jclouds/compute/BaseVersionedServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/BaseVersionedServiceLiveTest.java @@ -43,7 +43,7 @@ public abstract class BaseVersionedServiceLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected String imageId; protected String loginUser; protected String authenticateSudo; @@ -70,8 +70,8 @@ public abstract class BaseVersionedServiceLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); if (imageId != null) overrides.setProperty(provider + ".image-id", imageId); if (loginUser != null) @@ -87,7 +87,7 @@ public abstract class BaseVersionedServiceLiveTest { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); imageId = System.getProperty("test." + provider + ".image-id"); loginUser = System.getProperty("test." + provider + ".image.login-user"); authenticateSudo = System.getProperty("test." + provider + ".image.authenticate-sudo"); diff --git a/core/src/main/java/org/jclouds/rest/RestContextFactory.java b/core/src/main/java/org/jclouds/rest/RestContextFactory.java index bc8824433d..49efd3f825 100644 --- a/core/src/main/java/org/jclouds/rest/RestContextFactory.java +++ b/core/src/main/java/org/jclouds/rest/RestContextFactory.java @@ -241,7 +241,7 @@ public class RestContextFactory { Properties props = new Properties(); props.setProperty(contextSpec.provider + ".endpoint", contextSpec.endpoint); - props.setProperty(contextSpec.provider + ".apiversion", contextSpec.apiVersion); + props.setProperty(contextSpec.provider + ".api-version", contextSpec.apiVersion); props.setProperty(contextSpec.provider + "." + LocationConstants.ISO3166_CODES, contextSpec.iso3166Codes); props.setProperty(contextSpec.provider + ".identity", contextSpec.identity); if (contextSpec.credential != null) @@ -289,7 +289,7 @@ public class RestContextFactory { String endpoint = props.getProperty(providerName + "." + LocationConstants.ENDPOINT, null); String iso3166Codes = props.getProperty(providerName + "." + LocationConstants.ISO3166_CODES, null); - String apiVersion = props.getProperty(providerName + ".apiversion", null); + String apiVersion = props.getProperty(providerName + ".api-version", null); identity = props.getProperty(providerName + ".identity", props.getProperty("jclouds.identity", identity)); credential = loadCredentialOrDefault(props, providerName + ".credential", loadCredentialOrDefault(props, "jclouds.credential", credential)); diff --git a/core/src/main/resources/rest.properties b/core/src/main/resources/rest.properties index 854c6c5b07..9120345508 100644 --- a/core/src/main/resources/rest.properties +++ b/core/src/main/resources/rest.properties @@ -4,7 +4,7 @@ byon.propertiesbuilder=org.jclouds.byon.BYONPropertiesBuilder azurequeue.contextbuilder=org.jclouds.azure.storage.AzureStorageContextBuilder azurequeue.sync=org.jclouds.azurequeue.AzureQueueClient azurequeue.async=org.jclouds.azurequeue.AzureQueueAsyncClient -azurequeue.apiversion=2009-09-19 +azurequeue.api-version=2009-09-19 azurequeue.propertiesbuilder=org.jclouds.azure.storage.AzureStoragePropertiesBuilder azurequeue.endpoint=https://{identity}.queue.core.windows.net @@ -100,7 +100,7 @@ deltacloud.contextbuilder=org.jclouds.deltacloud.DeltacloudContextBuilder elasticstack.propertiesbuilder=org.jclouds.elasticstack.ElasticStackPropertiesBuilder elasticstack.contextbuilder=org.jclouds.elasticstack.ElasticStackContextBuilder -elasticstack.apiversion=1.0 +elasticstack.api-version=1.0 elastichosts-lon-p.propertiesbuilder=org.jclouds.elastichosts.ElasticHostsPeer1LondonPropertiesBuilder elastichosts-lon-p.contextbuilder=org.jclouds.elasticstack.ElasticStackContextBuilder @@ -153,7 +153,7 @@ stub.contextbuilder=org.jclouds.compute.stub.StubComputeServiceContextBuilder atmos.contextbuilder=org.jclouds.atmos.AtmosContextBuilder atmos.endpoint=https://accesspoint.atmosonline.com -atmos.apiversion=1.3.0 +atmos.api-version=1.3.0 synaptic-storage.contextbuilder=org.jclouds.atmos.AtmosContextBuilder synaptic-storage.propertiesbuilder=org.jclouds.synaptic.storage.SynapticStoragePropertiesBuilder diff --git a/core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java b/core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java index 0a1c31fbda..b53dff86a9 100644 --- a/core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java +++ b/core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java @@ -66,7 +66,7 @@ public class RestContextFactoryTest { Properties props = RestContextFactory.toProperties(contextSpec); assertEquals(props.getProperty("test.endpoint"), "http://localhost"); - assertEquals(props.getProperty("test.apiversion"), "1"); + assertEquals(props.getProperty("test.api-version"), "1"); assertEquals(props.getProperty("test.identity"), "dummy"); assertEquals(props.getProperty("test.iso3166-codes"), "US-CA"); assertEquals(props.getProperty("test.credential"), null); @@ -86,7 +86,7 @@ public class RestContextFactoryTest { Properties props = RestContextFactory.toProperties(contextSpec); assertEquals(props.getProperty("test.endpoint"), "http://localhost"); - assertEquals(props.getProperty("test.apiversion"), "1"); + assertEquals(props.getProperty("test.api-version"), "1"); assertEquals(props.getProperty("test.identity"), "dummy"); assertEquals(props.getProperty("test.credential"), "credential"); assertEquals(props.getProperty("test.sync"), IntegrationTestClient.class.getName()); @@ -107,7 +107,7 @@ public class RestContextFactoryTest { Properties props = RestContextFactory.toProperties(contextSpec); assertEquals(props.getProperty("test.endpoint"), "http://localhost"); - assertEquals(props.getProperty("test.apiversion"), "1"); + assertEquals(props.getProperty("test.api-version"), "1"); assertEquals(props.getProperty("test.identity"), "dummy"); assertEquals(props.getProperty("test.credential"), null); assertEquals(props.getProperty("test.sync"), null); @@ -128,7 +128,7 @@ public class RestContextFactoryTest { Properties props = RestContextFactory.toProperties(contextSpec); assertEquals(props.getProperty("test.endpoint"), "http://localhost"); - assertEquals(props.getProperty("test.apiversion"), "1"); + assertEquals(props.getProperty("test.api-version"), "1"); assertEquals(props.getProperty("test.identity"), "dummy"); assertEquals(props.getProperty("test.credential"), null); assertEquals(props.getProperty("test.sync"), null); @@ -149,7 +149,7 @@ public class RestContextFactoryTest { Properties props = RestContextFactory.toProperties(contextSpec); assertEquals(props.getProperty("test.endpoint"), "http://localhost"); - assertEquals(props.getProperty("test.apiversion"), "1"); + assertEquals(props.getProperty("test.api-version"), "1"); assertEquals(props.getProperty("test.identity"), "dummy"); assertEquals(props.getProperty("test.credential"), null); assertEquals(props.getProperty("test.sync"), null); @@ -165,7 +165,7 @@ public class RestContextFactoryTest { public void testBuilderPropertiesJCloudsScope() { Properties props = new Properties(); props.setProperty("test.endpoint", "http://localhost"); - props.setProperty("test.apiversion", "1"); + props.setProperty("test.api-version", "1"); props.setProperty("test.iso3166-codes", "US"); props.setProperty("jclouds.identity", "foo"); props.setProperty("jclouds.credential", "bar"); @@ -200,7 +200,7 @@ public class RestContextFactoryTest { Files.write("bar", file, Charsets.UTF_8); Properties props = new Properties(); props.setProperty("test.endpoint", "http://localhost"); - props.setProperty("test.apiversion", "1"); + props.setProperty("test.api-version", "1"); props.setProperty("test.iso3166-codes", "US"); props.setProperty("test.identity", "foo"); props.setProperty("test.credential.file", file.getAbsolutePath()); diff --git a/loadbalancer/src/test/java/org/jclouds/loadbalancer/BaseLoadBalancerServiceLiveTest.java b/loadbalancer/src/test/java/org/jclouds/loadbalancer/BaseLoadBalancerServiceLiveTest.java index c797dfac46..64e4bd8fce 100644 --- a/loadbalancer/src/test/java/org/jclouds/loadbalancer/BaseLoadBalancerServiceLiveTest.java +++ b/loadbalancer/src/test/java/org/jclouds/loadbalancer/BaseLoadBalancerServiceLiveTest.java @@ -85,7 +85,7 @@ public abstract class BaseLoadBalancerServiceLiveTest extends BaseVersionedServi + ".compute.identity"); computeCredential = System.getProperty("test." + provider + ".compute.credential"); computeEndpoint = System.getProperty("test." + provider + ".compute.endpoint"); - computeApiversion = System.getProperty("test." + provider + ".compute.apiversion"); + computeApiversion = System.getProperty("test." + provider + ".compute.api-version"); } protected Properties setupComputeProperties() { @@ -98,7 +98,7 @@ public abstract class BaseLoadBalancerServiceLiveTest extends BaseVersionedServi if (computeEndpoint != null) overrides.setProperty(computeProvider + ".endpoint", computeEndpoint); if (computeApiversion != null) - overrides.setProperty(computeProvider + ".apiversion", computeApiversion); + overrides.setProperty(computeProvider + ".api-version", computeApiversion); return overrides; } diff --git a/providers/aws-cloudwatch/pom.xml b/providers/aws-cloudwatch/pom.xml index 013a1b7a7e..012eec8e14 100644 --- a/providers/aws-cloudwatch/pom.xml +++ b/providers/aws-cloudwatch/pom.xml @@ -35,7 +35,7 @@ https://monitoring.us-east-1.amazonaws.com - 2009-05-15 + 2009-05-15 ${test.aws.identity} ${test.aws.credential} @@ -87,12 +87,12 @@ ${test.aws-cloudwatch.endpoint} - ${test.aws-cloudwatch.apiversion} + ${test.aws-cloudwatch.api-version} ${test.aws-cloudwatch.identity} ${test.aws-cloudwatch.credential} ${test.aws-cloudwatch.compute.provider} ${test.aws-cloudwatch.compute.endpoint} - ${test.aws-cloudwatch.compute.apiversion} + ${test.aws-cloudwatch.compute.api-version} ${test.aws-cloudwatch.compute.identity} ${test.aws-cloudwatch.compute.credential} diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml index 61d6067f62..ae0e500268 100644 --- a/providers/aws-ec2/pom.xml +++ b/providers/aws-ec2/pom.xml @@ -35,7 +35,7 @@ https://ec2.us-east-1.amazonaws.com - 2011-05-15 + 2011-05-15 ${test.aws.identity} ${test.aws.credential} @@ -113,7 +113,7 @@ ${test.aws-ec2.endpoint} - ${test.aws-ec2.apiversion} + ${test.aws-ec2.api-version} ${test.aws-ec2.identity} ${test.aws-ec2.credential} ${test.aws-ec2.image-id} diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java index c62cff6c80..3a2aca9c7e 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java @@ -73,14 +73,14 @@ public class AMIClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; @BeforeClass protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -92,8 +92,8 @@ public class AMIClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSAMIClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSAMIClientLiveTest.java index a46e6b9bad..5fd59c2820 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSAMIClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSAMIClientLiveTest.java @@ -70,14 +70,14 @@ public class AWSAMIClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; @BeforeClass protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -89,8 +89,8 @@ public class AWSAMIClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSInstanceClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSInstanceClientLiveTest.java index 6f59c9e870..bf540c5b46 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSInstanceClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSInstanceClientLiveTest.java @@ -54,14 +54,14 @@ public class AWSInstanceClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -72,8 +72,8 @@ public class AWSInstanceClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSKeyPairClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSKeyPairClientLiveTest.java index fb6bb41ce5..b387ca093b 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSKeyPairClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSKeyPairClientLiveTest.java @@ -75,7 +75,7 @@ public class AWSKeyPairClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; private ComputeServiceContext computeContext; protected void setupCredentials() { @@ -83,7 +83,7 @@ public class AWSKeyPairClientLiveTest { credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint", null); - apiversion = System.getProperty("test." + provider + ".apiversion", null); + apiVersion = System.getProperty("test." + provider + ".api-version", null); } protected Properties setupProperties() { @@ -94,8 +94,8 @@ public class AWSKeyPairClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/MonitoringClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/MonitoringClientLiveTest.java index b729c0994c..72e25dd0ec 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/MonitoringClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/MonitoringClientLiveTest.java @@ -52,15 +52,15 @@ public class MonitoringClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint"); - apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider - + ".apiversion"); + apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider + + ".api-version"); } protected Properties setupProperties() { @@ -70,7 +70,7 @@ public class MonitoringClientLiveTest { overrides.setProperty(provider + ".identity", identity); overrides.setProperty(provider + ".credential", credential); overrides.setProperty(provider + ".endpoint", endpoint); - overrides.setProperty(provider + ".apiversion", apiversion); + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/PlacementGroupClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/PlacementGroupClientLiveTest.java index e4ff0a2dbf..055594c3fb 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/PlacementGroupClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/PlacementGroupClientLiveTest.java @@ -79,14 +79,14 @@ public class PlacementGroupClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; @BeforeClass protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -98,8 +98,8 @@ public class PlacementGroupClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/SpotInstanceClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/SpotInstanceClientLiveTest.java index fc06e1707b..5605e8055f 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/SpotInstanceClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/SpotInstanceClientLiveTest.java @@ -74,7 +74,7 @@ public class SpotInstanceClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; private AWSRunningInstance instance; private long start; @@ -83,7 +83,7 @@ public class SpotInstanceClientLiveTest { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -95,8 +95,8 @@ public class SpotInstanceClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/TagClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/TagClientLiveTest.java index 88239d4e3c..62be06727a 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/TagClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/TagClientLiveTest.java @@ -64,7 +64,7 @@ public class TagClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected String testGroup; private ComputeServiceContext computeContext; @@ -72,7 +72,7 @@ public class TagClientLiveTest { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint", null); - apiversion = System.getProperty("test." + provider + ".apiversion", null); + apiVersion = System.getProperty("test." + provider + ".api-version", null); } protected Properties setupProperties() { @@ -83,8 +83,8 @@ public class TagClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/providers/aws-s3/pom.xml b/providers/aws-s3/pom.xml index a33248714a..f2e70c1ecf 100644 --- a/providers/aws-s3/pom.xml +++ b/providers/aws-s3/pom.xml @@ -36,7 +36,7 @@ org.jclouds.aws.s3.blobstore.integration.AWSS3TestInitializer https://s3.amazonaws.com - 2006-03-01 + 2006-03-01 ${test.aws.identity} ${test.aws.credential} 25 @@ -123,7 +123,7 @@ ${test.aws-s3.endpoint} - ${test.aws-s3.apiversion} + ${test.aws-s3.api-version} ${test.aws-s3.identity} ${test.aws-s3.credential} ${test.initializer} diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3TestInitializer.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3TestInitializer.java index 37d13a8232..1ad51029e1 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3TestInitializer.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3TestInitializer.java @@ -42,10 +42,10 @@ public class AWSS3TestInitializer extends TransientBlobStoreTestInitializer { } @Override - protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion, + protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, String app, String identity, String credential) throws IOException { return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule, - new Log4JLoggingModule(), new EnterpriseConfigurationModule()), setupProperties(endpoint, apiversion, + new Log4JLoggingModule(), new EnterpriseConfigurationModule()), setupProperties(endpoint, apiVersion, identity, credential)); } diff --git a/providers/azureblob/pom.xml b/providers/azureblob/pom.xml index f7d398f617..fefd90f134 100644 --- a/providers/azureblob/pom.xml +++ b/providers/azureblob/pom.xml @@ -36,7 +36,7 @@ org.jclouds.azureblob.blobstore.integration.AzureBlobTestInitializer https://{identity}.blob.core.windows.net - 2009-09-19 + 2009-09-19 ${test.azure.identity} ${test.azure.credential} @@ -94,7 +94,7 @@ ${test.azureblob.endpoint} - ${test.azureblob.apiversion} + ${test.azureblob.api-version} ${test.azureblob.identity} ${test.azureblob.credential} ${test.initializer} diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java index 118739bdcc..bd05f45a24 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java @@ -77,13 +77,13 @@ public class AzureBlobClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -95,8 +95,8 @@ public class AzureBlobClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobTestInitializer.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobTestInitializer.java index 51b817ca83..4eb4bfa3c7 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobTestInitializer.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobTestInitializer.java @@ -39,10 +39,10 @@ public class AzureBlobTestInitializer extends TransientBlobStoreTestInitializer } @Override - protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion, + protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, String app, String identity, String credential) throws IOException { return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule, - new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential)); + new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); } } diff --git a/providers/bluelock-vcloud-zone01/pom.xml b/providers/bluelock-vcloud-zone01/pom.xml index a71d30af90..c4903d4f05 100644 --- a/providers/bluelock-vcloud-zone01/pom.xml +++ b/providers/bluelock-vcloud-zone01/pom.xml @@ -35,7 +35,7 @@ https://zone01.bluelock.com/api - 1.0 + 1.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -102,7 +102,7 @@ ${test.bluelock-vcloud-zone01.endpoint} - ${test.bluelock-vcloud-zone01.apiversion} + ${test.bluelock-vcloud-zone01.api-version} ${test.bluelock-vcloud-zone01.identity} ${test.bluelock-vcloud-zone01.credential} ${test.bluelock-vcloud-zone01.image-id} diff --git a/providers/cloudfiles-uk/pom.xml b/providers/cloudfiles-uk/pom.xml index 866ed52c5a..a7eebb00b1 100644 --- a/providers/cloudfiles-uk/pom.xml +++ b/providers/cloudfiles-uk/pom.xml @@ -36,7 +36,7 @@ org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUKTestInitializer https://lon.auth.api.rackspacecloud.com - 1.0 + 1.0 ${test.rackspace-uk.identity} ${test.rackspace-uk.credential} @@ -109,7 +109,7 @@ 1 ${test.cloudfiles-uk.endpoint} - ${test.cloudfiles-uk.apiversion} + ${test.cloudfiles-uk.api-version} ${test.cloudfiles-uk.identity} ${test.cloudfiles-uk.credential} ${test.initializer} diff --git a/providers/cloudfiles-us/pom.xml b/providers/cloudfiles-us/pom.xml index 5a1ee419f8..cc4461aa3c 100644 --- a/providers/cloudfiles-us/pom.xml +++ b/providers/cloudfiles-us/pom.xml @@ -36,7 +36,7 @@ org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUSTestInitializer https://auth.api.rackspacecloud.com - 1.0 + 1.0 ${test.rackspace-us.identity} ${test.rackspace-us.credential} @@ -109,7 +109,7 @@ 1 ${test.cloudfiles-us.endpoint} - ${test.cloudfiles-us.apiversion} + ${test.cloudfiles-us.api-version} ${test.cloudfiles-us.identity} ${test.cloudfiles-us.credential} ${test.initializer} diff --git a/providers/cloudloadbalancers-uk/pom.xml b/providers/cloudloadbalancers-uk/pom.xml index cff5c9ef72..5ac5863bae 100644 --- a/providers/cloudloadbalancers-uk/pom.xml +++ b/providers/cloudloadbalancers-uk/pom.xml @@ -35,7 +35,7 @@ https://lon.auth.api.rackspacecloud.com - 1.0 + 1.0 ${test.rackspace-uk.identity} ${test.rackspace-uk.credential} @@ -109,7 +109,7 @@ ${test.cloudloadbalancers-uk.endpoint} - ${test.cloudloadbalancers-uk.apiversion} + ${test.cloudloadbalancers-uk.api-version} ${test.cloudloadbalancers-uk.identity} ${test.cloudloadbalancers-uk.credential} diff --git a/providers/cloudloadbalancers-us/pom.xml b/providers/cloudloadbalancers-us/pom.xml index efc0c4aae9..20d3413c81 100644 --- a/providers/cloudloadbalancers-us/pom.xml +++ b/providers/cloudloadbalancers-us/pom.xml @@ -35,7 +35,7 @@ https://auth.api.rackspacecloud.com - 1.0 + 1.0 ${test.rackspace-us.identity} ${test.rackspace-us.credential} @@ -109,7 +109,7 @@ ${test.cloudloadbalancers-us.endpoint} - ${test.cloudloadbalancers-us.apiversion} + ${test.cloudloadbalancers-us.api-version} ${test.cloudloadbalancers-us.identity} ${test.cloudloadbalancers-us.credential} diff --git a/providers/cloudonestorage/pom.xml b/providers/cloudonestorage/pom.xml index 4c4399828f..31c259e120 100644 --- a/providers/cloudonestorage/pom.xml +++ b/providers/cloudonestorage/pom.xml @@ -36,7 +36,7 @@ org.jclouds.cloudonestorage.blobstore.integration.CloudOneStorageTestInitializer https://cloudonestorage.peer1.com - 1.3.0 + 1.3.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -102,7 +102,7 @@ 1 ${test.cloudonestorage.endpoint} - ${test.cloudonestorage.apiversion} + ${test.cloudonestorage.api-version} ${test.cloudonestorage.identity} ${test.cloudonestorage.credential} ${test.initializer} diff --git a/providers/cloudservers-uk/pom.xml b/providers/cloudservers-uk/pom.xml index 22ead7c37c..e793413c07 100644 --- a/providers/cloudservers-uk/pom.xml +++ b/providers/cloudservers-uk/pom.xml @@ -35,7 +35,7 @@ https://lon.auth.api.rackspacecloud.com - 1.0 + 1.0 ${test.rackspace-uk.identity} ${test.rackspace-uk.credential} @@ -107,7 +107,7 @@ ${test.cloudservers-uk.endpoint} - ${test.cloudservers-uk.apiversion} + ${test.cloudservers-uk.api-version} ${test.cloudservers-uk.identity} ${test.cloudservers-uk.credential} ${test.cloudservers-uk.image-id} diff --git a/providers/cloudservers-us/pom.xml b/providers/cloudservers-us/pom.xml index 6c9e4d2881..613a3c81bd 100644 --- a/providers/cloudservers-us/pom.xml +++ b/providers/cloudservers-us/pom.xml @@ -35,7 +35,7 @@ https://auth.api.rackspacecloud.com - 1.0 + 1.0 ${test.rackspace-us.identity} ${test.rackspace-us.credential} @@ -108,7 +108,7 @@ 1 ${test.cloudservers-us.endpoint} - ${test.cloudservers-us.apiversion} + ${test.cloudservers-us.api-version} ${test.cloudservers-us.identity} ${test.cloudservers-us.credential} ${test.cloudservers-us.image-id} diff --git a/providers/cloudsigma-lvs/pom.xml b/providers/cloudsigma-lvs/pom.xml index 492fe13433..d5b8737c71 100644 --- a/providers/cloudsigma-lvs/pom.xml +++ b/providers/cloudsigma-lvs/pom.xml @@ -35,7 +35,7 @@ https://api.lvs.cloudsigma.com - 1.0 + 1.0 FIXME FIXME @@ -102,7 +102,7 @@ ${test.cloudsigma-lvs.endpoint} - ${test.cloudsigma-lvs.apiversion} + ${test.cloudsigma-lvs.api-version} ${test.cloudsigma-lvs.identity} ${test.cloudsigma-lvs.credential} ${test.cloudsigma-lvs.image-id} diff --git a/providers/cloudsigma-zrh/pom.xml b/providers/cloudsigma-zrh/pom.xml index 0358a03522..508295a7db 100644 --- a/providers/cloudsigma-zrh/pom.xml +++ b/providers/cloudsigma-zrh/pom.xml @@ -35,7 +35,7 @@ https://api.zrh.cloudsigma.com - 1.0 + 1.0 FIXME FIXME @@ -102,7 +102,7 @@ ${test.cloudsigma-zrh.endpoint} - ${test.cloudsigma-zrh.apiversion} + ${test.cloudsigma-zrh.api-version} ${test.cloudsigma-zrh.identity} ${test.cloudsigma-zrh.credential} ${test.cloudsigma-zrh.image-id} diff --git a/providers/elastichosts-lax-p/pom.xml b/providers/elastichosts-lax-p/pom.xml index 96ebd24ae2..50743009f1 100644 --- a/providers/elastichosts-lax-p/pom.xml +++ b/providers/elastichosts-lax-p/pom.xml @@ -35,7 +35,7 @@ https://api.lax-p.elastichosts.com - 2.0 + 2.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -100,7 +100,7 @@ ${test.elastichosts-lax-p.endpoint} - ${test.elastichosts-lax-p.apiversion} + ${test.elastichosts-lax-p.api-version} ${test.elastichosts-lax-p.identity} ${test.elastichosts-lax-p.credential} ${test.elastichosts-lax-p.image-id} diff --git a/providers/elastichosts-lon-b/pom.xml b/providers/elastichosts-lon-b/pom.xml index 12256340a5..7f8d3ec1b1 100644 --- a/providers/elastichosts-lon-b/pom.xml +++ b/providers/elastichosts-lon-b/pom.xml @@ -35,7 +35,7 @@ https://api.lon-b.elastichosts.com - 2.0 + 2.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -100,7 +100,7 @@ ${test.elastichosts-lon-b.endpoint} - ${test.elastichosts-lon-b.apiversion} + ${test.elastichosts-lon-b.api-version} ${test.elastichosts-lon-b.identity} ${test.elastichosts-lon-b.credential} ${test.elastichosts-lon-b.image-id} diff --git a/providers/elastichosts-lon-p/pom.xml b/providers/elastichosts-lon-p/pom.xml index dd88a8ce49..46a1ad3e02 100644 --- a/providers/elastichosts-lon-p/pom.xml +++ b/providers/elastichosts-lon-p/pom.xml @@ -35,7 +35,7 @@ https://api.lon-p.elastichosts.com - 2.0 + 2.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -100,7 +100,7 @@ ${test.elastichosts-lon-p.endpoint} - ${test.elastichosts-lon-p.apiversion} + ${test.elastichosts-lon-p.api-version} ${test.elastichosts-lon-p.identity} ${test.elastichosts-lon-p.credential} ${test.elastichosts-lon-p.image-id} diff --git a/providers/elastichosts-sat-p/pom.xml b/providers/elastichosts-sat-p/pom.xml index e31160b374..3fa3b40ce7 100644 --- a/providers/elastichosts-sat-p/pom.xml +++ b/providers/elastichosts-sat-p/pom.xml @@ -35,7 +35,7 @@ https://api.sat-p.elastichosts.com - 2.0 + 2.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -100,7 +100,7 @@ ${test.elastichosts-sat-p.endpoint} - ${test.elastichosts-sat-p.apiversion} + ${test.elastichosts-sat-p.api-version} ${test.elastichosts-sat-p.identity} ${test.elastichosts-sat-p.credential} ${test.elastichosts-sat-p.image-id} diff --git a/providers/elastichosts-tor-p/pom.xml b/providers/elastichosts-tor-p/pom.xml index d36af77420..b04915b810 100644 --- a/providers/elastichosts-tor-p/pom.xml +++ b/providers/elastichosts-tor-p/pom.xml @@ -35,7 +35,7 @@ https://api.tor-p.elastichosts.com - 2.0 + 2.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -100,7 +100,7 @@ ${test.elastichosts-tor-p.endpoint} - ${test.elastichosts-tor-p.apiversion} + ${test.elastichosts-tor-p.api-version} ${test.elastichosts-tor-p.identity} ${test.elastichosts-tor-p.credential} ${test.elastichosts-tor-p.image-id} diff --git a/providers/eucalyptus-partnercloud-ec2/pom.xml b/providers/eucalyptus-partnercloud-ec2/pom.xml index 828a86b212..508a9f8473 100644 --- a/providers/eucalyptus-partnercloud-ec2/pom.xml +++ b/providers/eucalyptus-partnercloud-ec2/pom.xml @@ -35,7 +35,7 @@ http://partnercloud.eucalyptus.com:8773/services/Eucalyptus - 2010-06-15 + 2010-06-15 FIXME_IDENTITY FIXME_CREDENTIAL @@ -115,7 +115,7 @@ 1 ${test.eucalyptus-partnercloud-ec2.endpoint} - ${test.eucalyptus-partnercloud-ec2.apiversion} + ${test.eucalyptus-partnercloud-ec2.api-version} ${test.eucalyptus-partnercloud-ec2.identity} ${test.eucalyptus-partnercloud-ec2.credential} ${test.eucalyptus-partnercloud-ec2.image-id} diff --git a/providers/eucalyptus-partnercloud-s3/pom.xml b/providers/eucalyptus-partnercloud-s3/pom.xml index 2aba40bcac..bd3ed13691 100644 --- a/providers/eucalyptus-partnercloud-s3/pom.xml +++ b/providers/eucalyptus-partnercloud-s3/pom.xml @@ -36,7 +36,7 @@ org.jclouds.epc.blobstore.EucalyptusPartnerCloudWalrusTestInitializer http://partnercloud.eucalyptus.com:8773/services/Walrus - 2006-03-01 + 2006-03-01 FIXME_IDENTITY FIXME_CREDENTIAL 15 @@ -110,7 +110,7 @@ 1 ${test.eucalyptus-partnercloud-s3.endpoint} - ${test.eucalyptus-partnercloud-s3.apiversion} + ${test.eucalyptus-partnercloud-s3.api-version} ${test.eucalyptus-partnercloud-s3.identity} ${test.eucalyptus-partnercloud-s3.credential} ${test.initializer} diff --git a/providers/go2cloud-jhb1/pom.xml b/providers/go2cloud-jhb1/pom.xml index b16ce6f49c..eb5d14663c 100644 --- a/providers/go2cloud-jhb1/pom.xml +++ b/providers/go2cloud-jhb1/pom.xml @@ -35,7 +35,7 @@ http://api.jhb1.go2cloud.co.za - 2.0 + 2.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -100,7 +100,7 @@ ${test.go2cloud-jhb1.endpoint} - ${test.go2cloud-jhb1.apiversion} + ${test.go2cloud-jhb1.api-version} ${test.go2cloud-jhb1.identity} ${test.go2cloud-jhb1.credential} ${test.go2cloud-jhb1.image-id} diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml index f6c986a180..794cd4ccb4 100644 --- a/providers/gogrid/pom.xml +++ b/providers/gogrid/pom.xml @@ -35,7 +35,7 @@ https://api.gogrid.com/api - 1.5 + 1.5 FIXME FIXME @@ -93,7 +93,7 @@ 1 ${test.gogrid.endpoint} - ${test.gogrid.apiversion} + ${test.gogrid.api-version} ${test.gogrid.identity} ${test.gogrid.credential} ${test.gogrid.image-id} diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java index eca8e81480..24f6418ef8 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java @@ -100,14 +100,14 @@ public class GoGridLiveTestDisabled { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -118,8 +118,8 @@ public class GoGridLiveTestDisabled { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/services/BaseGoGridClientLiveTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/services/BaseGoGridClientLiveTest.java index 3a7c7c9684..9898dc5273 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/services/BaseGoGridClientLiveTest.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/services/BaseGoGridClientLiveTest.java @@ -49,7 +49,7 @@ public class BaseGoGridClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected ComputeServiceContext context; protected String prefix = System.getProperty("user.name"); @@ -58,7 +58,7 @@ public class BaseGoGridClientLiveTest { credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -67,8 +67,8 @@ public class BaseGoGridClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/providers/greenhousedata-element-vcloud/pom.xml b/providers/greenhousedata-element-vcloud/pom.xml index 03937a2ec6..b76a0aba8e 100644 --- a/providers/greenhousedata-element-vcloud/pom.xml +++ b/providers/greenhousedata-element-vcloud/pom.xml @@ -35,7 +35,7 @@ https://mycloud.greenhousedata.com/api - 1.0 + 1.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -100,7 +100,7 @@ ${test.greenhousedata-element-vcloud.endpoint} - ${test.greenhousedata-element-vcloud.apiversion} + ${test.greenhousedata-element-vcloud.api-version} ${test.greenhousedata-element-vcloud.identity} ${test.greenhousedata-element-vcloud.credential} ${test.greenhousedata-element-vcloud.image-id} diff --git a/providers/hpcloud-objectstorage-lvs/pom.xml b/providers/hpcloud-objectstorage-lvs/pom.xml index be4778e4ee..d5b1e9d50f 100644 --- a/providers/hpcloud-objectstorage-lvs/pom.xml +++ b/providers/hpcloud-objectstorage-lvs/pom.xml @@ -36,7 +36,7 @@ org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration.HPCloudObjectStorageLasVegasTestInitializer https://region-a.geo-1.objects.hpcloudsvc.com/auth - 1.0 + 1.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -111,8 +111,8 @@ ${test.hpcloud-objectstorage-lvs.endpoint} - test.hpcloud-objectstorage-lvs.apiversion - ${test.hpcloud-objectstorage-lvs.apiversion} + test.hpcloud-objectstorage-lvs.api-version + ${test.hpcloud-objectstorage-lvs.api-version} test.hpcloud-objectstorage-lvs.identity diff --git a/providers/ninefold-compute/pom.xml b/providers/ninefold-compute/pom.xml index 6ed69b9571..6fdf31a23d 100644 --- a/providers/ninefold-compute/pom.xml +++ b/providers/ninefold-compute/pom.xml @@ -35,7 +35,7 @@ https://api.ninefold.com/compute/v1.0/ - 2.2.12 + 2.2.12 FIXME_IDENTITY FIXME_CREDENTIAL 1215 @@ -103,7 +103,7 @@ 1 ${test.ninefold-compute.endpoint} - ${test.ninefold-compute.apiversion} + ${test.ninefold-compute.api-version} ${test.ninefold-compute.identity} ${test.ninefold-compute.credential} ${test.ninefold-compute.image-id} diff --git a/providers/ninefold-storage/pom.xml b/providers/ninefold-storage/pom.xml index f6e462398e..1e7e9f80bb 100644 --- a/providers/ninefold-storage/pom.xml +++ b/providers/ninefold-storage/pom.xml @@ -36,7 +36,7 @@ org.jclouds.ninefold.storage.blobstore.integration.NinefoldStorageTestInitializer http://onlinestorage.ninefold.com - 1.4.0 + 1.4.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -101,7 +101,7 @@ ${test.ninefold-storage.endpoint} - ${test.ninefold-storage.apiversion} + ${test.ninefold-storage.api-version} ${test.ninefold-storage.identity} ${test.ninefold-storage.credential} ${test.initializer} diff --git a/providers/openhosting-east1/pom.xml b/providers/openhosting-east1/pom.xml index 89e4e394f3..2091caa175 100644 --- a/providers/openhosting-east1/pom.xml +++ b/providers/openhosting-east1/pom.xml @@ -35,7 +35,7 @@ https://api.east1.openhosting.com - 2.0 + 2.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -100,7 +100,7 @@ ${test.openhosting-east1.endpoint} - ${test.openhosting-east1.apiversion} + ${test.openhosting-east1.api-version} ${test.openhosting-east1.identity} ${test.openhosting-east1.credential} ${test.openhosting-east1.image-id} diff --git a/providers/rimuhosting/pom.xml b/providers/rimuhosting/pom.xml index 43cfa53949..f0dfd86ad5 100644 --- a/providers/rimuhosting/pom.xml +++ b/providers/rimuhosting/pom.xml @@ -35,7 +35,7 @@ https://api.rimuhosting.com/r - 1.0 + 1.0 FIXME @@ -101,7 +101,7 @@ ${test.rimuhosting.endpoint} - ${test.rimuhosting.apiversion} + ${test.rimuhosting.api-version} ${test.rimuhosting.identity} ${test.rimuhosting.image-id} diff --git a/providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java b/providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java index 818e14e9b8..e63a5f0942 100644 --- a/providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java +++ b/providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java @@ -56,12 +56,12 @@ public class RimuHostingClientLiveTest { protected String provider = "rimuhosting"; protected String identity; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -71,8 +71,8 @@ public class RimuHostingClientLiveTest { overrides.setProperty(provider + ".identity", identity); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/providers/savvis-symphonyvpdc/pom.xml b/providers/savvis-symphonyvpdc/pom.xml index d46ade811b..14044f29f9 100644 --- a/providers/savvis-symphonyvpdc/pom.xml +++ b/providers/savvis-symphonyvpdc/pom.xml @@ -49,7 +49,7 @@ https://api.symphonyvpdc.savvis.net/vpdc - 1.0 + 1.0 FIXME FIXME @@ -114,7 +114,7 @@ 1 ${test.savvis-symphonyvpdc.endpoint} - ${test.savvis-symphonyvpdc.apiversion} + ${test.savvis-symphonyvpdc.api-version} ${test.savvis-symphonyvpdc.identity} ${test.savvis-symphonyvpdc.credential} ${test.savvis-symphonyvpdc.image-id} diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/BaseVPDCClientLiveTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/BaseVPDCClientLiveTest.java index 3df5493e4f..b3888a58be 100644 --- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/BaseVPDCClientLiveTest.java +++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/BaseVPDCClientLiveTest.java @@ -54,7 +54,7 @@ public class BaseVPDCClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected ComputeServiceContext context; protected String email; protected RetryablePredicate taskTester; @@ -67,7 +67,7 @@ public class BaseVPDCClientLiveTest { email = checkNotNull(System.getProperty("test." + VPDCConstants.PROPERTY_VPDC_VDC_EMAIL), "test." + VPDCConstants.PROPERTY_VPDC_VDC_EMAIL); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -77,8 +77,8 @@ public class BaseVPDCClientLiveTest { overrides.setProperty(VPDCConstants.PROPERTY_VPDC_VDC_EMAIL, email); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); // TODO savvis uses untrusted certificates, remove these once savvis fixes the issue overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true"); overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true"); diff --git a/providers/serverlove-z1-man/pom.xml b/providers/serverlove-z1-man/pom.xml index 8885fd27b9..019824a30b 100644 --- a/providers/serverlove-z1-man/pom.xml +++ b/providers/serverlove-z1-man/pom.xml @@ -35,7 +35,7 @@ https://api.z1-man.serverlove.com - 1.0 + 1.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -100,7 +100,7 @@ ${test.serverlove-z1-man.endpoint} - ${test.serverlove-z1-man.apiversion} + ${test.serverlove-z1-man.api-version} ${test.serverlove-z1-man.identity} ${test.serverlove-z1-man.credential} ${test.serverlove-z1-man.image-id} diff --git a/providers/skalicloud-sdg-my/pom.xml b/providers/skalicloud-sdg-my/pom.xml index 2b8d7c806a..4e30c6a453 100644 --- a/providers/skalicloud-sdg-my/pom.xml +++ b/providers/skalicloud-sdg-my/pom.xml @@ -35,7 +35,7 @@ https://api.sdg-my.skalicloud.com - 1.0 + 1.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -100,7 +100,7 @@ ${test.skalicloud-sdg-my.endpoint} - ${test.skalicloud-sdg-my.apiversion} + ${test.skalicloud-sdg-my.api-version} ${test.skalicloud-sdg-my.identity} ${test.skalicloud-sdg-my.credential} ${test.skalicloud-sdg-my.image-id} diff --git a/providers/slicehost/pom.xml b/providers/slicehost/pom.xml index 856f4dd1cf..39af4e313c 100644 --- a/providers/slicehost/pom.xml +++ b/providers/slicehost/pom.xml @@ -35,7 +35,7 @@ https://api.slicehost.com - 1.4.1.1 + 1.4.1.1 FIXME @@ -93,7 +93,7 @@ 1 ${test.slicehost.endpoint} - ${test.slicehost.apiversion} + ${test.slicehost.api-version} ${test.slicehost.identity} ${test.slicehost.image-id} diff --git a/providers/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java index 0f371ccd42..f20c33596c 100644 --- a/providers/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java +++ b/providers/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java @@ -71,13 +71,13 @@ public class SlicehostClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint"); - apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider - + ".apiversion"); + apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider + + ".api-version"); } protected Properties setupProperties() { @@ -86,7 +86,7 @@ public class SlicehostClientLiveTest { overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true"); overrides.setProperty(provider + ".identity", identity); overrides.setProperty(provider + ".endpoint", endpoint); - overrides.setProperty(provider + ".apiversion", apiversion); + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/providers/softlayer/pom.xml b/providers/softlayer/pom.xml index ebffd1bd99..e230fd32d1 100644 --- a/providers/softlayer/pom.xml +++ b/providers/softlayer/pom.xml @@ -49,7 +49,7 @@ https://api.softlayer.com/rest - 3 + 3 FIXME FIXME @@ -107,7 +107,7 @@ ${test.softlayer.endpoint} - ${test.softlayer.apiversion} + ${test.softlayer.api-version} ${test.softlayer.identity} ${test.softlayer.credential} ${test.softlayer.image-id} diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerExperimentLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerExperimentLiveTest.java index 60cf6ac8be..b613124b7d 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerExperimentLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerExperimentLiveTest.java @@ -41,14 +41,14 @@ public class SoftLayerExperimentLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; @BeforeClass protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } @Test @@ -69,4 +69,4 @@ public class SoftLayerExperimentLiveTest { } } -} \ No newline at end of file +} diff --git a/providers/stratogen-vcloud-mycloud/pom.xml b/providers/stratogen-vcloud-mycloud/pom.xml index c2dd91a612..ea263fc6b5 100644 --- a/providers/stratogen-vcloud-mycloud/pom.xml +++ b/providers/stratogen-vcloud-mycloud/pom.xml @@ -35,7 +35,7 @@ https://vcd.stratogen.net/api - 1.0 + 1.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -100,7 +100,7 @@ ${test.stratogen-vcloud-mycloud.endpoint} - ${test.stratogen-vcloud-mycloud.apiversion} + ${test.stratogen-vcloud-mycloud.api-version} ${test.stratogen-vcloud-mycloud.identity} ${test.stratogen-vcloud-mycloud.credential} ${test.stratogen-vcloud-mycloud.image-id} diff --git a/providers/synaptic-storage/pom.xml b/providers/synaptic-storage/pom.xml index 82d16c3dff..229d6179ca 100644 --- a/providers/synaptic-storage/pom.xml +++ b/providers/synaptic-storage/pom.xml @@ -36,7 +36,7 @@ org.jclouds.synaptic.storage.blobstore.integration.SynapticStorageTestInitializer https://storage.synaptic.att.com - 1.3.0 + 1.3.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -101,7 +101,7 @@ ${test.synaptic-storage.endpoint} - ${test.synaptic-storage.apiversion} + ${test.synaptic-storage.api-version} ${test.synaptic-storage.identity} ${test.synaptic-storage.credential} ${test.initializer} diff --git a/providers/trmk-ecloud/pom.xml b/providers/trmk-ecloud/pom.xml index dab5555c69..ee80cb1886 100644 --- a/providers/trmk-ecloud/pom.xml +++ b/providers/trmk-ecloud/pom.xml @@ -36,7 +36,7 @@ https://services.enterprisecloud.terremark.com/api MIA - 0.8b-ext2.8 + 0.8b-ext2.8 FIXME FIXME @@ -102,7 +102,7 @@ 1 ${test.trmk-ecloud.endpoint} - ${test.trmk-ecloud.apiversion} + ${test.trmk-ecloud.api-version} ${test.trmk-ecloud.identity} ${test.trmk-ecloud.credential} ${test.trmk-ecloud.datacenter} diff --git a/providers/trmk-vcloudexpress/pom.xml b/providers/trmk-vcloudexpress/pom.xml index dce73611d1..ead19e53c2 100644 --- a/providers/trmk-vcloudexpress/pom.xml +++ b/providers/trmk-vcloudexpress/pom.xml @@ -35,7 +35,7 @@ https://services.vcloudexpress.terremark.com/api - 0.8a-ext1.6 + 0.8a-ext1.6 FIXME FIXME @@ -101,7 +101,7 @@ 1 ${test.trmk-vcloudexpress.endpoint} - ${test.trmk-vcloudexpress.apiversion} + ${test.trmk-vcloudexpress.api-version} ${test.trmk-vcloudexpress.identity} ${test.trmk-vcloudexpress.credential} ${test.trmk-vcloudexpress.image-id} diff --git a/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/InternetServiceLiveTest.java b/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/InternetServiceLiveTest.java index e48acf0638..bd84c7b398 100644 --- a/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/InternetServiceLiveTest.java +++ b/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/InternetServiceLiveTest.java @@ -93,15 +93,15 @@ public class InternetServiceLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint"); - apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider - + ".apiversion"); + apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider + + ".api-version"); } protected Properties setupProperties() { @@ -111,7 +111,7 @@ public class InternetServiceLiveTest { overrides.setProperty(provider + ".identity", identity); overrides.setProperty(provider + ".credential", credential); overrides.setProperty(provider + ".endpoint", endpoint); - overrides.setProperty(provider + ".apiversion", apiversion); + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/sandbox-apis/elb/pom.xml b/sandbox-apis/elb/pom.xml index fb57564a58..3ad5a4c9e3 100644 --- a/sandbox-apis/elb/pom.xml +++ b/sandbox-apis/elb/pom.xml @@ -36,12 +36,12 @@ us-east-1a https://elasticloadbalancing.us-east-1.amazonaws.com - 2010-07-01 + 2010-07-01 ${test.aws.identity} ${test.aws.credential} ec2 https://ec2.us-east-1.amazonaws.com - 2010-06-15 + 2010-06-15 ${test.aws.identity} ${test.aws.credential} @@ -113,12 +113,12 @@ ${test.elb.zone} ${test.elb.endpoint} - ${test.elb.apiversion} + ${test.elb.api-version} ${test.elb.identity} ${test.elb.credential} ${test.elb.compute.provider} ${test.elb.compute.endpoint} - ${test.elb.compute.apiversion} + ${test.elb.compute.api-version} ${test.elb.compute.identity} ${test.elb.compute.credential} ${test.elb.compute.image-id} diff --git a/sandbox-apis/elb/src/test/java/org/jclouds/elb/ELBClientLiveTest.java b/sandbox-apis/elb/src/test/java/org/jclouds/elb/ELBClientLiveTest.java index 8f8f285630..78c5e8b53a 100644 --- a/sandbox-apis/elb/src/test/java/org/jclouds/elb/ELBClientLiveTest.java +++ b/sandbox-apis/elb/src/test/java/org/jclouds/elb/ELBClientLiveTest.java @@ -50,7 +50,7 @@ public class ELBClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected String name = "TestLoadBalancer"; protected void setupCredentials() { @@ -58,7 +58,7 @@ public class ELBClientLiveTest { credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -70,8 +70,8 @@ public class ELBClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/sandbox-apis/libvirt/pom.xml b/sandbox-apis/libvirt/pom.xml index 7a07bfa101..43d5747052 100644 --- a/sandbox-apis/libvirt/pom.xml +++ b/sandbox-apis/libvirt/pom.xml @@ -36,7 +36,7 @@ trmkrun-ccc,test.trmk-924 test:///default - 1.0 + 1.0 FIXME FIXME @@ -126,7 +126,7 @@ ${test.libvirt.endpoint} - ${test.libvirt.apiversion} + ${test.libvirt.api-version} ${test.libvirt.identity} ${test.libvirt.credential} ${test.libvirt.image-id} diff --git a/sandbox-apis/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java b/sandbox-apis/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java index f49e9c4834..38208116f7 100644 --- a/sandbox-apis/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java +++ b/sandbox-apis/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java @@ -40,14 +40,14 @@ public class LibvirtExperimentLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; @BeforeClass protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } @Test @@ -92,4 +92,4 @@ public class LibvirtExperimentLiveTest { } } -} \ No newline at end of file +} diff --git a/sandbox-apis/nirvanix/pom.xml b/sandbox-apis/nirvanix/pom.xml index 1c07d593d0..b31dea4676 100644 --- a/sandbox-apis/nirvanix/pom.xml +++ b/sandbox-apis/nirvanix/pom.xml @@ -46,7 +46,7 @@ http://services.nirvanix.com - 2.5.6 + 2.5.6 FIXME FIXME @@ -106,7 +106,7 @@ ${test.nirvanix.endpoint} - ${test.nirvanix.apiversion} + ${test.nirvanix.api-version} ${test.nirvanix.identity} ${test.nirvanix.credential} diff --git a/sandbox-apis/openstack-nova/pom.xml b/sandbox-apis/openstack-nova/pom.xml index 7c912a10fd..1b89c59356 100644 --- a/sandbox-apis/openstack-nova/pom.xml +++ b/sandbox-apis/openstack-nova/pom.xml @@ -35,7 +35,7 @@ http://localhost:8774/v1.1/ - v1.1 + v1.1 FIXME_IDENTITY FIXME_CREDENTIALS @@ -115,7 +115,7 @@ ${test.openstack-nova.endpoint} - ${test.openstack-nova.apiversion} + ${test.openstack-nova.api-version} ${test.openstack-nova.identity} ${test.openstack-nova.credential} ${test.openstack-nova.image-id} diff --git a/sandbox-apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaPropertiesBuilder.java b/sandbox-apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaPropertiesBuilder.java index 6c744a9654..3edac5e65b 100644 --- a/sandbox-apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaPropertiesBuilder.java +++ b/sandbox-apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaPropertiesBuilder.java @@ -37,7 +37,7 @@ public class NovaPropertiesBuilder extends PropertiesBuilder { @Override protected Properties defaultProperties() { Properties properties = super.defaultProperties(); - properties.setProperty(PROPERTY_ENDPOINT, "http://localhost:8774/{apiversion}/{identity}"); + properties.setProperty(PROPERTY_ENDPOINT, "http://localhost:8774/{api-version}/{identity}"); properties.setProperty(PROPERTY_API_VERSION, "v1.1"); return properties; } @@ -47,7 +47,7 @@ public class NovaPropertiesBuilder extends PropertiesBuilder { } public static final Pattern IDENTITY_PATTERN = Pattern.compile("\\{identity\\}"); - public static final Pattern API_VERSION_PATTERN = Pattern.compile("\\{apiversion\\}"); + public static final Pattern API_VERSION_PATTERN = Pattern.compile("\\{api-version\\}"); @Override public Properties build() { diff --git a/sandbox-apis/pcs/pom.xml b/sandbox-apis/pcs/pom.xml index 6589e519b9..cac6fc268b 100644 --- a/sandbox-apis/pcs/pom.xml +++ b/sandbox-apis/pcs/pom.xml @@ -46,7 +46,7 @@ FIXME - 2 + 2 FIXME FIXME @@ -106,7 +106,7 @@ ${test.pcs.endpoint} - ${test.pcs.apiversion} + ${test.pcs.api-version} ${test.pcs.identity} ${test.pcs.credential} diff --git a/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/PCSClientLiveTest.java b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/PCSClientLiveTest.java index 26219432ae..337f47b026 100644 --- a/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/PCSClientLiveTest.java +++ b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs/PCSClientLiveTest.java @@ -82,14 +82,14 @@ public class PCSClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -100,8 +100,8 @@ public class PCSClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/sandbox-apis/scality-rs2/pom.xml b/sandbox-apis/scality-rs2/pom.xml index 1f8e37d778..b6f02ca8f1 100644 --- a/sandbox-apis/scality-rs2/pom.xml +++ b/sandbox-apis/scality-rs2/pom.xml @@ -36,7 +36,7 @@ org.jclouds.scality.rs2.blobstore.ScalityRS2TestInitializer FIXME_ENDPOINT - 2006-03-01 + 2006-03-01 FIXME_IDENTITY FIXME_CREDENTIAL @@ -101,7 +101,7 @@ ${test.scality-rs2.endpoint} - ${test.scality-rs2.apiversion} + ${test.scality-rs2.api-version} ${test.scality-rs2.identity} ${test.scality-rs2.credential} ${test.initializer} diff --git a/sandbox-apis/simpledb/pom.xml b/sandbox-apis/simpledb/pom.xml index ac40645cb8..d9b330b19c 100644 --- a/sandbox-apis/simpledb/pom.xml +++ b/sandbox-apis/simpledb/pom.xml @@ -35,7 +35,7 @@ https://sdb.amazonaws.com - 2009-04-15 + 2009-04-15 ${test.aws.identity} ${test.aws.credential} @@ -79,7 +79,7 @@ ${test.simpledb.endpoint} - ${test.simpledb.apiversion} + ${test.simpledb.api-version} ${test.simpledb.identity} ${test.simpledb.credential} diff --git a/sandbox-apis/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBClientLiveTest.java b/sandbox-apis/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBClientLiveTest.java index 7783be8ec0..dc60197dfb 100644 --- a/sandbox-apis/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBClientLiveTest.java +++ b/sandbox-apis/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBClientLiveTest.java @@ -55,14 +55,14 @@ public class SimpleDBClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -74,8 +74,8 @@ public class SimpleDBClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/sandbox-apis/sqs/pom.xml b/sandbox-apis/sqs/pom.xml index 6c70773fcf..ae9c6039bc 100644 --- a/sandbox-apis/sqs/pom.xml +++ b/sandbox-apis/sqs/pom.xml @@ -35,7 +35,7 @@ https://sqs.us-east-1.amazonaws.com - 2009-02-01 + 2009-02-01 ${test.aws.identity} ${test.aws.credential} @@ -79,7 +79,7 @@ ${test.sqs.endpoint} - ${test.sqs.apiversion} + ${test.sqs.api-version} ${test.sqs.identity} ${test.sqs.credential} diff --git a/sandbox-apis/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java b/sandbox-apis/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java index 2b5139d2a5..2ebff952f6 100644 --- a/sandbox-apis/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java +++ b/sandbox-apis/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java @@ -60,14 +60,14 @@ public class SQSClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -79,8 +79,8 @@ public class SQSClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/sandbox-apis/virtualbox/pom.xml b/sandbox-apis/virtualbox/pom.xml index 313d503322..25473b0fd8 100644 --- a/sandbox-apis/virtualbox/pom.xml +++ b/sandbox-apis/virtualbox/pom.xml @@ -35,7 +35,7 @@ http://localhost:18083/ - 4.1.4 + 4.1.4 administrator 12345 @@ -52,7 +52,7 @@ org.virtualbox vboxjws - ${test.virtualbox.apiversion} + ${test.virtualbox.api-version} org.jclouds.api @@ -129,7 +129,7 @@ 1 ${test.virtualbox.endpoint} - ${test.virtualbox.apiversion} + ${test.virtualbox.api-version} ${test.virtualbox.identity} ${test.virtualbox.credential} ${test.virtualbox.image-id} diff --git a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java index 9bb431f149..e8f20749da 100644 --- a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java +++ b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java @@ -57,14 +57,14 @@ public class BaseVirtualBoxClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; @BeforeClass protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint", "http://localhost:18083/"); - apiversion = System.getProperty("test." + provider + ".apiversion", "4.1.2r73507"); + apiVersion = System.getProperty("test." + provider + ".api-version", "4.1.2r73507"); } protected ComputeServiceContext context; @@ -75,7 +75,7 @@ public class BaseVirtualBoxClientLiveTest { public void setupClient() { Properties properties = new Properties(); properties.setProperty(provider + ".endpoint", endpoint); - properties.setProperty(provider + ".apiversion", apiversion); + properties.setProperty(provider + ".api-version", apiVersion); context = new ComputeServiceContextFactory().createContext(provider, identity, credential, ImmutableSet. of(new Log4JLoggingModule(), new SshjSshClientModule())); jetty = new StartJettyIfNotAlreadyRunning(port).apply(basebaseResource); diff --git a/sandbox-providers/aws-elb/pom.xml b/sandbox-providers/aws-elb/pom.xml index 8e9f11fcbe..613eb4d830 100644 --- a/sandbox-providers/aws-elb/pom.xml +++ b/sandbox-providers/aws-elb/pom.xml @@ -35,12 +35,12 @@ https://elasticloadbalancing.us-east-1.amazonaws.com - 2010-07-01 + 2010-07-01 ${test.aws.identity} ${test.aws.credential} aws-ec2 https://ec2.us-east-1.amazonaws.com - 2010-06-15 + 2010-06-15 ${test.aws.identity} ${test.aws.credential} @@ -119,12 +119,12 @@ ${test.aws-elb.endpoint} - ${test.aws-elb.apiversion} + ${test.aws-elb.api-version} ${test.aws-elb.identity} ${test.aws-elb.credential} ${test.aws-elb.compute.provider} ${test.aws-elb.compute.endpoint} - ${test.aws-elb.compute.apiversion} + ${test.aws-elb.compute.api-version} ${test.aws-elb.compute.identity} ${test.aws-elb.compute.credential} ${test.aws-elb.compute.image-id} diff --git a/sandbox-providers/aws-simpledb/pom.xml b/sandbox-providers/aws-simpledb/pom.xml index 002e7229a3..10e27ce7f5 100644 --- a/sandbox-providers/aws-simpledb/pom.xml +++ b/sandbox-providers/aws-simpledb/pom.xml @@ -35,7 +35,7 @@ https://sdb.amazonaws.com - 2009-04-15 + 2009-04-15 ${test.aws.identity} ${test.aws.credential} @@ -93,7 +93,7 @@ ${test.aws-simpledb.endpoint} - ${test.aws-simpledb.apiversion} + ${test.aws-simpledb.api-version} ${test.aws-simpledb.identity} ${test.aws-simpledb.credential} diff --git a/sandbox-providers/azurequeue/pom.xml b/sandbox-providers/azurequeue/pom.xml index 48c289ecc4..35db768afc 100644 --- a/sandbox-providers/azurequeue/pom.xml +++ b/sandbox-providers/azurequeue/pom.xml @@ -35,7 +35,7 @@ https://{identity}.queue.core.windows.net - 2009-09-19 + 2009-09-19 ${test.azure.identity} ${test.azure.credential} @@ -86,7 +86,7 @@ ${test.azurequeue.endpoint} - ${test.azurequeue.apiversion} + ${test.azurequeue.api-version} ${test.azurequeue.identity} ${test.azurequeue.credential} diff --git a/sandbox-providers/azurequeue/src/test/java/org/jclouds/azurequeue/AzureQueueClientLiveTest.java b/sandbox-providers/azurequeue/src/test/java/org/jclouds/azurequeue/AzureQueueClientLiveTest.java index 49b0e94dc9..054dc021ab 100644 --- a/sandbox-providers/azurequeue/src/test/java/org/jclouds/azurequeue/AzureQueueClientLiveTest.java +++ b/sandbox-providers/azurequeue/src/test/java/org/jclouds/azurequeue/AzureQueueClientLiveTest.java @@ -60,15 +60,15 @@ public class AzureQueueClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"); endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint"); - apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider - + ".apiversion"); + apiVersion = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider + + ".api-version"); } protected Properties setupProperties() { @@ -78,7 +78,7 @@ public class AzureQueueClientLiveTest { overrides.setProperty(provider + ".identity", identity); overrides.setProperty(provider + ".credential", credential); overrides.setProperty(provider + ".endpoint", endpoint); - overrides.setProperty(provider + ".apiversion", apiversion); + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/sandbox-providers/boxdotnet/pom.xml b/sandbox-providers/boxdotnet/pom.xml index 8e87e04c14..80b325609c 100644 --- a/sandbox-providers/boxdotnet/pom.xml +++ b/sandbox-providers/boxdotnet/pom.xml @@ -49,7 +49,7 @@ https://www.box.net/api/1.0/rest - 1.0 + 1.0 FIXME FIXME @@ -97,7 +97,7 @@ ${test.boxdotnet.endpoint} - ${test.boxdotnet.apiversion} + ${test.boxdotnet.api-version} ${test.boxdotnet.identity} ${test.boxdotnet.credential} diff --git a/sandbox-providers/dunkel-vcd/pom.xml b/sandbox-providers/dunkel-vcd/pom.xml index 7c25bc90d3..493608c6e4 100644 --- a/sandbox-providers/dunkel-vcd/pom.xml +++ b/sandbox-providers/dunkel-vcd/pom.xml @@ -34,7 +34,7 @@ https://vcd.dunkel.de/api - 1.0 + 1.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -99,7 +99,7 @@ ${test.dunkel-vcd.endpoint} - ${test.dunkel-vcd.apiversion} + ${test.dunkel-vcd.api-version} ${test.dunkel-vcd.identity} ${test.dunkel-vcd.credential} ${test.dunkel-vcd.image-id} diff --git a/sandbox-providers/glesys/pom.xml b/sandbox-providers/glesys/pom.xml index 76873f5677..e66f0ee7e0 100644 --- a/sandbox-providers/glesys/pom.xml +++ b/sandbox-providers/glesys/pom.xml @@ -49,7 +49,7 @@ https://api.glesys.com - 1 + 1 FIXME FIXME @@ -107,7 +107,7 @@ ${test.glesys.endpoint} - ${test.glesys.apiversion} + ${test.glesys.api-version} ${test.glesys.identity} ${test.glesys.credential} ${test.glesys.image-id} diff --git a/sandbox-providers/googlestorage/pom.xml b/sandbox-providers/googlestorage/pom.xml index 57bc2e7aaf..1ae0934890 100644 --- a/sandbox-providers/googlestorage/pom.xml +++ b/sandbox-providers/googlestorage/pom.xml @@ -36,7 +36,7 @@ org.jclouds.googlestorage.blobstore.GoogleStorageTestInitializer https://commondatastorage.googleapis.com - 2006-03-01 + 2006-03-01 FIX_ME FIX_ME @@ -101,7 +101,7 @@ ${test.googlestorage.endpoint} - ${test.googlestorage.apiversion} + ${test.googlestorage.api-version} ${test.googlestorage.identity} ${test.googlestorage.credential} ${test.initializer} diff --git a/sandbox-providers/hosteurope-storage/pom.xml b/sandbox-providers/hosteurope-storage/pom.xml index 6c01b63456..9ff491182b 100644 --- a/sandbox-providers/hosteurope-storage/pom.xml +++ b/sandbox-providers/hosteurope-storage/pom.xml @@ -36,7 +36,7 @@ org.jclouds.hosteurope.storage.blobstore.HostEuropeStorageTestInitializer https://cs.hosteurope.de - 2006-03-01 + 2006-03-01 FIX_ME FIX_ME @@ -108,7 +108,7 @@ ${test.hosteurope-storage.endpoint} - ${test.hosteurope-storage.apiversion} + ${test.hosteurope-storage.api-version} ${test.hosteurope-storage.identity} ${test.hosteurope-storage.credential} ${test.initializer} diff --git a/sandbox-providers/ibm-smartcloud/pom.xml b/sandbox-providers/ibm-smartcloud/pom.xml index 08f70f0fdd..c6c5d59e0b 100644 --- a/sandbox-providers/ibm-smartcloud/pom.xml +++ b/sandbox-providers/ibm-smartcloud/pom.xml @@ -49,7 +49,7 @@ https://www-147.ibm.com/computecloud/enterprise/api/rest - 20100331 + 20100331 FIXME FIXME @@ -110,7 +110,7 @@ ${test.ibm-smartcloud.endpoint} - ${test.ibm-smartcloud.apiversion} + ${test.ibm-smartcloud.api-version} ${test.ibm-smartcloud.identity} ${test.ibm-smartcloud.credential} ${test.ibm-smartcloud.image-id} diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/BaseIBMSmartCloudClientLiveTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/BaseIBMSmartCloudClientLiveTest.java index 736bf85dde..b755e6973b 100644 --- a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/BaseIBMSmartCloudClientLiveTest.java +++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/BaseIBMSmartCloudClientLiveTest.java @@ -49,7 +49,7 @@ public abstract class BaseIBMSmartCloudClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected IBMSmartCloudClient connection; @@ -61,7 +61,7 @@ public abstract class BaseIBMSmartCloudClientLiveTest { credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential must be set. ex. secretKey"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -72,8 +72,8 @@ public abstract class BaseIBMSmartCloudClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/sandbox-providers/scaleup-storage/pom.xml b/sandbox-providers/scaleup-storage/pom.xml index cc711d837e..7b6e12f9ff 100644 --- a/sandbox-providers/scaleup-storage/pom.xml +++ b/sandbox-providers/scaleup-storage/pom.xml @@ -36,7 +36,7 @@ org.jclouds.scaleup.storage.blobstore.ScaleUpStorageTestInitializer https://scs.scaleupstorage.com - 2006-03-01 + 2006-03-01 FIX_ME FIX_ME @@ -108,7 +108,7 @@ ${test.scaleup-storage.endpoint} - ${test.scaleup-storage.apiversion} + ${test.scaleup-storage.api-version} ${test.scaleup-storage.identity} ${test.scaleup-storage.credential} ${test.initializer} diff --git a/sandbox-providers/tiscali-storage/pom.xml b/sandbox-providers/tiscali-storage/pom.xml index 90da8608ce..162874a801 100644 --- a/sandbox-providers/tiscali-storage/pom.xml +++ b/sandbox-providers/tiscali-storage/pom.xml @@ -36,7 +36,7 @@ org.jclouds.tiscali.storage.blobstore.TiscaliStorageTestInitializer https://storage.tiscali.it - 2006-03-01 + 2006-03-01 FIX_ME FIX_ME @@ -109,7 +109,7 @@ 1 ${test.tiscali-storage.endpoint} - ${test.tiscali-storage.apiversion} + ${test.tiscali-storage.api-version} ${test.tiscali-storage.identity} ${test.tiscali-storage.credential} ${test.initializer} diff --git a/sandbox-providers/twitter/pom.xml b/sandbox-providers/twitter/pom.xml index b17df9779c..d3450cc782 100644 --- a/sandbox-providers/twitter/pom.xml +++ b/sandbox-providers/twitter/pom.xml @@ -50,7 +50,7 @@ http://api.twitter.com - 1.0 + 1.0 FIXME FIXME @@ -98,7 +98,7 @@ ${test.twitter.endpoint} - ${test.twitter.apiversion} + ${test.twitter.api-version} ${test.twitter.identity} ${test.twitter.credential} diff --git a/sandbox-providers/twitter/src/test/java/org/jclouds/twitter/TwitterClientLiveTest.java b/sandbox-providers/twitter/src/test/java/org/jclouds/twitter/TwitterClientLiveTest.java index 30ef89b853..0ac3cf809b 100644 --- a/sandbox-providers/twitter/src/test/java/org/jclouds/twitter/TwitterClientLiveTest.java +++ b/sandbox-providers/twitter/src/test/java/org/jclouds/twitter/TwitterClientLiveTest.java @@ -51,13 +51,13 @@ public class TwitterClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected Properties setupProperties() { @@ -69,8 +69,8 @@ public class TwitterClientLiveTest { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } diff --git a/sandbox-providers/virtacore-vcloudexpress/pom.xml b/sandbox-providers/virtacore-vcloudexpress/pom.xml index 37b4df57ec..4f7eae25cc 100644 --- a/sandbox-providers/virtacore-vcloudexpress/pom.xml +++ b/sandbox-providers/virtacore-vcloudexpress/pom.xml @@ -34,7 +34,7 @@ https://vcloud.virtacore.com/api - 1.0 + 1.0 FIXME_IDENTITY FIXME_CREDENTIAL @@ -99,7 +99,7 @@ ${test.virtacore-vcloudexpress.endpoint} - ${test.virtacore-vcloudexpress.apiversion} + ${test.virtacore-vcloudexpress.api-version} ${test.virtacore-vcloudexpress.identity} ${test.virtacore-vcloudexpress.credential} ${test.virtacore-vcloudexpress.image-id} diff --git a/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml index c41698794d..ca2919fd67 100644 --- a/skeletons/standalone-compute/pom.xml +++ b/skeletons/standalone-compute/pom.xml @@ -37,7 +37,7 @@ trmkrun-ccc,test.trmk-924 FIXME https://servermanager.com - 1.0 + 1.0 FIXME @@ -98,7 +98,7 @@ ${test.servermanager.endpoint} - ${test.servermanager.apiversion} + ${test.servermanager.api-version} ${test.servermanager.identity} ${jclouds.compute.blacklist-nodes} diff --git a/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceContextBuilderTest.java b/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceContextBuilderTest.java index 3aea091b15..70d2543ae2 100644 --- a/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceContextBuilderTest.java +++ b/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceContextBuilderTest.java @@ -67,7 +67,7 @@ public class ServerManagerComputeServiceContextBuilderTest { restProperties.setProperty("servermanager.contextbuilder", ServerManagerComputeServiceContextBuilder.class .getName()); restProperties.setProperty("servermanager.endpoint", "http://host"); - restProperties.setProperty("servermanager.apiversion", "1"); + restProperties.setProperty("servermanager.api-version", "1"); ComputeServiceContext context = new ComputeServiceContextFactory(restProperties).createContext("servermanager", "identity", "credential"); diff --git a/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceLiveTest.java b/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceLiveTest.java index 51c5278d1b..7844e19065 100644 --- a/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceLiveTest.java +++ b/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceLiveTest.java @@ -50,7 +50,7 @@ public class ServerManagerComputeServiceLiveTest extends BaseComputeServiceLiveT restProperties.setProperty("servermanager.contextbuilder", ServerManagerComputeServiceContextBuilder.class.getName()); restProperties.setProperty("servermanager.endpoint", "http://host"); - restProperties.setProperty("servermanager.apiversion", "1"); + restProperties.setProperty("servermanager.api-version", "1"); return restProperties; } diff --git a/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerExperimentLiveTest.java b/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerExperimentLiveTest.java index e0753bb68e..cf1b82a621 100644 --- a/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerExperimentLiveTest.java +++ b/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerExperimentLiveTest.java @@ -44,14 +44,14 @@ public class ServerManagerExperimentLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; @BeforeClass protected void setupCredentials() { identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"); credential = System.getProperty("test." + provider + ".credential"); endpoint = System.getProperty("test." + provider + ".endpoint"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } @Test @@ -60,7 +60,7 @@ public class ServerManagerExperimentLiveTest { try { context = new ComputeServiceContextFactory() .createContext(new StandaloneComputeServiceContextSpec( - "servermanager", endpoint, apiversion, "", identity, credential, ServerManager.class, + "servermanager", endpoint, apiVersion, "", identity, credential, ServerManager.class, ServerManagerComputeServiceContextBuilder.class, ImmutableSet. of())); context.getComputeService().listNodes(); @@ -71,4 +71,4 @@ public class ServerManagerExperimentLiveTest { } } -} \ No newline at end of file +}