diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml index 0369c992d5..9c59c4afd0 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 @@ -96,8 +96,8 @@ ${test.atmos.endpoint} - test.atmos.apiversion - ${test.atmos.apiversion} + test.atmos.api-version + ${test.atmos.api-version} test.atmos.identity 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 ec7c9cf307..6e1f7c575e 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} @@ -111,8 +111,8 @@ ${test.cloudfiles.endpoint} - test.cloudfiles.apiversion - ${test.cloudfiles.apiversion} + test.cloudfiles.api-version + ${test.cloudfiles.api-version} test.cloudfiles.identity diff --git a/apis/cloudservers/pom.xml b/apis/cloudservers/pom.xml index 41ae21b360..ad6e59fa9b 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} @@ -109,8 +109,8 @@ ${test.cloudservers.endpoint} - test.cloudservers.apiversion - ${test.cloudservers.apiversion} + test.cloudservers.api-version + ${test.cloudservers.api-version} test.cloudservers.identity diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersClientLiveTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersClientLiveTest.java index 610aabcdaa..4915bb3931 100644 --- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersClientLiveTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/CloudServersClientLiveTest.java @@ -87,14 +87,14 @@ public class CloudServersClientLiveTest { 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() { @@ -105,8 +105,8 @@ public class CloudServersClientLiveTest { 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/cloudsigma/pom.xml b/apis/cloudsigma/pom.xml index c2c8959dc3..56367a51e5 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 @@ -95,8 +95,8 @@ ${test.cloudsigma.endpoint} - test.cloudsigma.apiversion - ${test.cloudsigma.apiversion} + test.cloudsigma.api-version + ${test.cloudsigma.api-version} test.cloudsigma.identity 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 1727e586e3..2b46fa8b32 100644 --- a/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java +++ b/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java @@ -73,14 +73,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() { @@ -92,8 +92,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/cloudwatch/pom.xml b/apis/cloudwatch/pom.xml index 6230db8679..e75065c5cf 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} @@ -90,8 +90,8 @@ ${test.cloudwatch.endpoint} - test.cloudwatch.apiversion - ${test.cloudwatch.apiversion} + test.cloudwatch.api-version + ${test.cloudwatch.api-version} test.cloudwatch.identity 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 f7755ae9c4..2343bcd06b 100644 --- a/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java +++ b/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java @@ -49,14 +49,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() { @@ -67,8 +67,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 bbae86fab6..5265a31c1e 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 @@ -108,8 +108,8 @@ ${test.deltacloud.endpoint} - test.deltacloud.apiversion - ${test.deltacloud.apiversion} + test.deltacloud.api-version + ${test.deltacloud.api-version} test.deltacloud.identity 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 848edb748a..cf4e5153ad 100644 --- a/apis/ec2/pom.xml +++ b/apis/ec2/pom.xml @@ -37,7 +37,7 @@ trmkrun-ccc,test.trmk-924 https://ec2.us-east-1.amazonaws.com - 2010-06-15 + 2010-06-15 ${test.aws.identity} ${test.aws.credential} @@ -105,8 +105,8 @@ ${test.ec2.endpoint} - test.ec2.apiversion - ${test.ec2.apiversion} + test.ec2.api-version + ${test.ec2.api-version} test.ec2.identity 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 805f097434..4f86deeb15 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 6a064a8e93..f104d73a14 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 c18a0cfc99..b105c38b1e 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 5eede17a0e..127dcae2b1 100644 --- a/apis/elasticstack/pom.xml +++ b/apis/elasticstack/pom.xml @@ -51,7 +51,7 @@ trmkrun-ccc,test.trmk-924 https://api.lon-p.elastichosts.com - 1.0 + 1.0 FIXME FIXME @@ -110,8 +110,8 @@ ${test.elasticstack.endpoint} - test.elasticstack.apiversion - ${test.elasticstack.apiversion} + test.elasticstack.api-version + ${test.elasticstack.api-version} test.elasticstack.identity 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 56705f9a66..0b527f7a73 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 c035975bba..682452a204 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 @@ -103,8 +103,8 @@ ${test.eucalyptus.endpoint} - test.eucalyptus.apiversion - ${test.eucalyptus.apiversion} + test.eucalyptus.api-version + ${test.eucalyptus.api-version} test.eucalyptus.identity 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 10b55e8ef4..66376516a1 100644 --- a/apis/nova/pom.xml +++ b/apis/nova/pom.xml @@ -125,8 +125,8 @@ ${test.nova.endpoint} - test.nova.apiversion - ${test.nova.apiversion} + test.nova.api-version + ${test.nova.api-version} test.nova.identity 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 26cf26deba..1b66c1e709 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, ""); 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("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); @@ -232,7 +232,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); @@ -247,7 +247,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); @@ -263,7 +263,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); @@ -278,7 +278,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); @@ -293,7 +293,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); @@ -308,7 +308,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); @@ -324,7 +324,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); @@ -340,7 +340,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); @@ -355,7 +355,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); @@ -370,7 +370,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, ""); assertPayloadEquals(request, null, null, false); @@ -385,7 +385,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, ""); assertPayloadEquals(request, "{\"changePassword\":{\"adminPass\":\"foo\"}}", MediaType.APPLICATION_JSON, false); @@ -401,7 +401,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, ""); assertPayloadEquals(request, "{\"server\":{\"name\":\"foo\"}}", MediaType.APPLICATION_JSON, false); @@ -417,7 +417,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); @@ -432,7 +432,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); @@ -448,7 +448,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); @@ -464,7 +464,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); @@ -486,7 +486,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, ""); assertPayloadEquals(request, "{\"rebuild\":{}}", MediaType.APPLICATION_JSON, false); @@ -503,7 +503,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, ""); assertPayloadEquals(request, "{\"rebuild\":{\"imageRef\":\"2\"}}", MediaType.APPLICATION_JSON, false); @@ -519,7 +519,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, ""); assertPayloadEquals(request, "{\"reboot\":{\"type\":\"HARD\"}}", MediaType.APPLICATION_JSON, false); @@ -535,7 +535,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, ""); assertPayloadEquals(request, "{\"resize\":{\"flavorId\":3}}", MediaType.APPLICATION_JSON, false); @@ -551,7 +551,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, ""); assertPayloadEquals(request, "{\"confirmResize\":null}", MediaType.APPLICATION_JSON, false); @@ -566,7 +566,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, ""); assertPayloadEquals(request, "{\"revertResize\":null}", MediaType.APPLICATION_JSON, false); @@ -605,7 +605,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"); } } @@ -620,7 +620,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/nova/src/test/java/org/jclouds/openstack/nova/live/PropertyHelper.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/live/PropertyHelper.java index 7a4a6188ce..c7b5703929 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/live/PropertyHelper.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/live/PropertyHelper.java @@ -60,7 +60,7 @@ public class PropertyHelper { properties.setProperty(provider + ".identity", properties.getProperty("test." + provider + ".identity")); properties.setProperty(provider + ".credential", properties.getProperty("test." + provider + ".credential")); properties.setProperty(provider + ".endpoint", properties.getProperty("test." + provider + ".endpoint")); - properties.setProperty(provider + ".apiversion", properties.getProperty("test." + provider + ".apiversion")); + properties.setProperty(provider + ".api-version", properties.getProperty("test." + provider + ".api-version")); properties.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true"); properties.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true"); return properties; diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml index 4913d65bac..a5af0677b2 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} @@ -109,8 +109,8 @@ ${test.s3.endpoint} - test.s3.apiversion - ${test.s3.apiversion} + test.s3.api-version + ${test.s3.api-version} test.s3.identity 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 d78458f70f..d81825b5f4 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 @@ -109,8 +109,8 @@ ${test.swift.endpoint} - test.swift.apiversion - ${test.swift.apiversion} + test.swift.api-version + ${test.swift.api-version} test.swift.identity 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 458eb605ad..22df726268 100644 --- a/apis/vcloud/pom.xml +++ b/apis/vcloud/pom.xml @@ -37,7 +37,7 @@ trmkrun-ccc,test.trmk-924 FIXME - 1.0 + 1.0 FIXME FIXME @@ -118,8 +118,8 @@ ${test.vcloud.endpoint} - test.vcloud.apiversion - ${test.vcloud.apiversion} + test.vcloud.api-version + ${test.vcloud.api-version} test.vcloud.identity diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/DeprecatedVCloudClientLiveTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/DeprecatedVCloudClientLiveTest.java index 0e6039345f..a0816370c4 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/DeprecatedVCloudClientLiveTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/DeprecatedVCloudClientLiveTest.java @@ -285,7 +285,7 @@ public class DeprecatedVCloudClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected Iterable orgs; protected void setupCredentials() { @@ -293,7 +293,7 @@ public class DeprecatedVCloudClientLiveTest { credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "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() { @@ -304,8 +304,8 @@ public class DeprecatedVCloudClientLiveTest { 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/vcloud/src/test/java/org/jclouds/vcloud/internal/BaseVCloudClientLiveTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/BaseVCloudClientLiveTest.java index 9a8369f897..618987963d 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/BaseVCloudClientLiveTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/BaseVCloudClientLiveTest.java @@ -53,7 +53,7 @@ public abstract class BaseVCloudClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected VCloudClient getVCloudApi() { return VCloudClient.class.cast(client.getContext().getProviderSpecificContext().getApi()); @@ -64,7 +64,7 @@ public abstract class BaseVCloudClientLiveTest { 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() { @@ -76,8 +76,8 @@ public abstract class BaseVCloudClientLiveTest { 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; } @@ -101,4 +101,4 @@ public abstract class BaseVCloudClientLiveTest { protected void cleanup() throws InterruptedException, ExecutionException, TimeoutException { client.getContext().close(); } -} \ No newline at end of file +} diff --git a/apis/walrus/pom.xml b/apis/walrus/pom.xml index b9df931afd..daf8fb91e2 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} @@ -105,8 +105,8 @@ ${test.walrus.endpoint} - test.walrus.apiversion - ${test.walrus.apiversion} + test.walrus.api-version + ${test.walrus.api-version} test.walrus.identity 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 3f61885b91..b397f7f408 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} @@ -117,8 +117,8 @@ $symbol_dollar = '$' ) \$\{test.${lcaseProviderName}.endpoint\} - test.${lcaseProviderName}.apiversion - \$\{test.${lcaseProviderName}.apiversion\} + test.${lcaseProviderName}.api-version + \$\{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/TerremarkClientLiveTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/TerremarkClientLiveTest.java index 873bc43ca6..f9d96639ca 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/TerremarkClientLiveTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/TerremarkClientLiveTest.java @@ -461,7 +461,7 @@ public abstract class TerremarkClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; @BeforeGroups(groups = { "live" }) public void setupClient() { @@ -725,7 +725,7 @@ public abstract class TerremarkClientLiveTest { credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "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() { @@ -736,8 +736,8 @@ public abstract class TerremarkClientLiveTest { 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; } @@ -820,4 +820,4 @@ public abstract class TerremarkClientLiveTest { } } } -} \ 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/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/BaseTerremarkClientLiveTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/BaseTerremarkClientLiveTest.java index 5eea4fdc51..1a934a1d9a 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/BaseTerremarkClientLiveTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/BaseTerremarkClientLiveTest.java @@ -59,7 +59,7 @@ public abstract class BaseTerremarkClientLiveTest socketTester; protected Factory sshFactory; @@ -74,7 +74,7 @@ public abstract class BaseTerremarkClientLiveTest https://monitoring.us-east-1.amazonaws.com - 2009-05-15 + 2009-05-15 ${test.aws.identity} ${test.aws.credential} @@ -91,8 +91,8 @@ ${test.aws-cloudwatch.endpoint} - test.aws-cloudwatch.apiversion - ${test.aws-cloudwatch.apiversion} + test.aws-cloudwatch.api-version + ${test.aws-cloudwatch.api-version} test.aws-cloudwatch.identity @@ -111,8 +111,8 @@ ${test.aws-cloudwatch.compute.endpoint} - test.aws-cloudwatch.compute.apiversion - ${test.aws-cloudwatch.compute.apiversion} + test.aws-cloudwatch.compute.api-version + ${test.aws-cloudwatch.compute.api-version} test.aws-cloudwatch.compute.identity diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml index 219e3aa7b1..51267dfef2 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} @@ -114,8 +114,8 @@ ${test.aws-ec2.endpoint} - test.aws-ec2.apiversion - ${test.aws-ec2.apiversion} + test.aws-ec2.api-version + ${test.aws-ec2.api-version} test.aws-ec2.identity 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 15c3a81d71..6c004b4c9b 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 06d69eb8a9..810a7e4cf3 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 d1c56b281f..12a4c1a2f8 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 5af5c33030..49f4fbf354 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 573978feae..026ed54eb7 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 @@ -127,8 +127,8 @@ ${test.aws-s3.endpoint} - test.aws-s3.apiversion - ${test.aws-s3.apiversion} + test.aws-s3.api-version + ${test.aws-s3.api-version} test.aws-s3.identity 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 79b8517e76..b048565b0b 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} @@ -104,8 +104,8 @@ ${test.azureblob.endpoint} - test.azureblob.apiversion - ${test.azureblob.apiversion} + test.azureblob.api-version + ${test.azureblob.api-version} test.azureblob.identity 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 0159f5d21d..0de834fa12 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 @@ -103,8 +103,8 @@ ${test.bluelock-vcloud-zone01.endpoint} - test.bluelock-vcloud-zone01.apiversion - ${test.bluelock-vcloud-zone01.apiversion} + test.bluelock-vcloud-zone01.api-version + ${test.bluelock-vcloud-zone01.api-version} test.bluelock-vcloud-zone01.identity diff --git a/providers/cloudfiles-uk/pom.xml b/providers/cloudfiles-uk/pom.xml index 6d0abdc0c6..327bd93826 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} @@ -113,8 +113,8 @@ ${test.cloudfiles-uk.endpoint} - test.cloudfiles-uk.apiversion - ${test.cloudfiles-uk.apiversion} + test.cloudfiles-uk.api-version + ${test.cloudfiles-uk.api-version} test.cloudfiles-uk.identity diff --git a/providers/cloudfiles-us/pom.xml b/providers/cloudfiles-us/pom.xml index ac9955f923..9a71b5fa20 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} @@ -113,8 +113,8 @@ ${test.cloudfiles-us.endpoint} - test.cloudfiles-us.apiversion - ${test.cloudfiles-us.apiversion} + test.cloudfiles-us.api-version + ${test.cloudfiles-us.api-version} test.cloudfiles-us.identity diff --git a/providers/cloudloadbalancers-us/pom.xml b/providers/cloudloadbalancers-us/pom.xml index 17d41d8cb9..fb6ce1d000 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} @@ -100,8 +100,8 @@ ${test.cloudloadbalancers-us.endpoint} - test.cloudloadbalancers-us.apiversion - ${test.cloudloadbalancers-us.apiversion} + test.cloudloadbalancers-us.api-version + ${test.cloudloadbalancers-us.api-version} test.cloudloadbalancers-us.identity diff --git a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/features/BaseCloudLoadBalancersClientLiveTest.java b/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/features/BaseCloudLoadBalancersClientLiveTest.java index 7cc48c94e0..6d3554094b 100644 --- a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/features/BaseCloudLoadBalancersClientLiveTest.java +++ b/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/features/BaseCloudLoadBalancersClientLiveTest.java @@ -56,7 +56,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; @@ -69,7 +69,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() { @@ -80,8 +80,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/providers/cloudonestorage/pom.xml b/providers/cloudonestorage/pom.xml index d7a4048f2a..1af8fcde3c 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 @@ -106,8 +106,8 @@ ${test.cloudonestorage.endpoint} - test.cloudonestorage.apiversion - ${test.cloudonestorage.apiversion} + test.cloudonestorage.api-version + ${test.cloudonestorage.api-version} test.cloudonestorage.identity diff --git a/providers/cloudservers-uk/pom.xml b/providers/cloudservers-uk/pom.xml index c72af76915..19246a67cd 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} @@ -108,8 +108,8 @@ ${test.cloudservers-uk.endpoint} - test.cloudservers-uk.apiversion - ${test.cloudservers-uk.apiversion} + test.cloudservers-uk.api-version + ${test.cloudservers-uk.api-version} test.cloudservers-uk.identity diff --git a/providers/cloudservers-us/pom.xml b/providers/cloudservers-us/pom.xml index 75d2306780..431aa819fe 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} @@ -109,8 +109,8 @@ ${test.cloudservers-us.endpoint} - test.cloudservers-us.apiversion - ${test.cloudservers-us.apiversion} + test.cloudservers-us.api-version + ${test.cloudservers-us.api-version} test.cloudservers-us.identity diff --git a/providers/cloudsigma-lvs/pom.xml b/providers/cloudsigma-lvs/pom.xml index 356ff05d03..0cd26a87f4 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 @@ -103,8 +103,8 @@ ${test.cloudsigma-lvs.endpoint} - test.cloudsigma-lvs.apiversion - ${test.cloudsigma-lvs.apiversion} + test.cloudsigma-lvs.api-version + ${test.cloudsigma-lvs.api-version} test.cloudsigma-lvs.identity diff --git a/providers/cloudsigma-zrh/pom.xml b/providers/cloudsigma-zrh/pom.xml index 04e4fa0259..1666820399 100644 --- a/providers/cloudsigma-zrh/pom.xml +++ b/providers/cloudsigma-zrh/pom.xml @@ -35,7 +35,7 @@ https://api.cloudsigma.com - 1.0 + 1.0 FIXME FIXME @@ -103,8 +103,8 @@ ${test.cloudsigma-zrh.endpoint} - test.cloudsigma-zrh.apiversion - ${test.cloudsigma-zrh.apiversion} + test.cloudsigma-zrh.api-version + ${test.cloudsigma-zrh.api-version} test.cloudsigma-zrh.identity diff --git a/providers/elastichosts-lon-b/pom.xml b/providers/elastichosts-lon-b/pom.xml index 781ff0bf1b..8e788a897e 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 @@ -103,8 +103,8 @@ ${test.elastichosts-lon-b.endpoint} - test.elastichosts-lon-b.apiversion - ${test.elastichosts-lon-b.apiversion} + test.elastichosts-lon-b.api-version + ${test.elastichosts-lon-b.api-version} test.elastichosts-lon-b.identity diff --git a/providers/elastichosts-lon-p/pom.xml b/providers/elastichosts-lon-p/pom.xml index f9539c7c3c..613912f125 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 @@ -103,8 +103,8 @@ ${test.elastichosts-lon-p.endpoint} - test.elastichosts-lon-p.apiversion - ${test.elastichosts-lon-p.apiversion} + test.elastichosts-lon-p.api-version + ${test.elastichosts-lon-p.api-version} test.elastichosts-lon-p.identity diff --git a/providers/elastichosts-sat-p/pom.xml b/providers/elastichosts-sat-p/pom.xml index a062572983..88f8c207ff 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 @@ -103,8 +103,8 @@ ${test.elastichosts-sat-p.endpoint} - test.elastichosts-sat-p.apiversion - ${test.elastichosts-sat-p.apiversion} + test.elastichosts-sat-p.api-version + ${test.elastichosts-sat-p.api-version} test.elastichosts-sat-p.identity diff --git a/providers/eucalyptus-partnercloud-ec2/pom.xml b/providers/eucalyptus-partnercloud-ec2/pom.xml index c593245900..b87093677d 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 @@ -118,8 +118,8 @@ ${test.eucalyptus-partnercloud-ec2.endpoint} - test.eucalyptus-partnercloud-ec2.apiversion - ${test.eucalyptus-partnercloud-ec2.apiversion} + test.eucalyptus-partnercloud-ec2.api-version + ${test.eucalyptus-partnercloud-ec2.api-version} test.eucalyptus-partnercloud-ec2.identity diff --git a/providers/eucalyptus-partnercloud-s3/pom.xml b/providers/eucalyptus-partnercloud-s3/pom.xml index 3ac919582f..19d630b78c 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 @@ -114,8 +114,8 @@ ${test.eucalyptus-partnercloud-s3.endpoint} - test.eucalyptus-partnercloud-s3.apiversion - ${test.eucalyptus-partnercloud-s3.apiversion} + test.eucalyptus-partnercloud-s3.api-version + ${test.eucalyptus-partnercloud-s3.api-version} test.eucalyptus-partnercloud-s3.identity diff --git a/providers/go2cloud-jhb1/pom.xml b/providers/go2cloud-jhb1/pom.xml index 91567c2d70..d8e0cd4c27 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 @@ -103,8 +103,8 @@ ${test.go2cloud-jhb1.endpoint} - test.go2cloud-jhb1.apiversion - ${test.go2cloud-jhb1.apiversion} + test.go2cloud-jhb1.api-version + ${test.go2cloud-jhb1.api-version} test.go2cloud-jhb1.identity diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml index 477b863216..b6bc88bbbf 100644 --- a/providers/gogrid/pom.xml +++ b/providers/gogrid/pom.xml @@ -37,7 +37,7 @@ trmkrun-ccc,test.trmk-924 https://api.gogrid.com/api - 1.5 + 1.5 FIXME FIXME @@ -98,8 +98,8 @@ ${test.gogrid.endpoint} - test.gogrid.apiversion - ${test.gogrid.apiversion} + test.gogrid.api-version + ${test.gogrid.api-version} test.gogrid.identity 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 517bf0e43d..31855a2c4d 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 4aeedf0e2e..23c339af80 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 @@ -103,8 +103,8 @@ ${test.greenhousedata-element-vcloud.endpoint} - test.greenhousedata-element-vcloud.apiversion - ${test.greenhousedata-element-vcloud.apiversion} + test.greenhousedata-element-vcloud.api-version + ${test.greenhousedata-element-vcloud.api-version} test.greenhousedata-element-vcloud.identity diff --git a/providers/ninefold-storage/pom.xml b/providers/ninefold-storage/pom.xml index 588a8762d4..f0bc30adc4 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 @@ -105,8 +105,8 @@ ${test.ninefold-storage.endpoint} - test.ninefold-storage.apiversion - ${test.ninefold-storage.apiversion} + test.ninefold-storage.api-version + ${test.ninefold-storage.api-version} test.ninefold-storage.identity diff --git a/providers/openhosting-east1/pom.xml b/providers/openhosting-east1/pom.xml index d19f2f5188..309277987e 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 @@ -103,8 +103,8 @@ ${test.openhosting-east1.endpoint} - test.openhosting-east1.apiversion - ${test.openhosting-east1.apiversion} + test.openhosting-east1.api-version + ${test.openhosting-east1.api-version} test.openhosting-east1.identity diff --git a/providers/rimuhosting/pom.xml b/providers/rimuhosting/pom.xml index b329e380ad..5298d87d71 100644 --- a/providers/rimuhosting/pom.xml +++ b/providers/rimuhosting/pom.xml @@ -37,7 +37,7 @@ trmkrun-ccc,test.trmk-924 https://api.rimuhosting.com/r - 1.0 + 1.0 FIXME @@ -106,8 +106,8 @@ ${test.rimuhosting.endpoint} - test.rimuhosting.apiversion - ${test.rimuhosting.apiversion} + test.rimuhosting.api-version + ${test.rimuhosting.api-version} test.rimuhosting.identity 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 09172ef0eb..87c0969ff3 100644 --- a/providers/savvis-symphonyvpdc/pom.xml +++ b/providers/savvis-symphonyvpdc/pom.xml @@ -51,7 +51,7 @@ node-924 https://api.symphonyvpdc.savvis.net/vpdc - 1.0 + 1.0 FIXME FIXME FIXME @@ -119,8 +119,8 @@ ${test.savvis-symphonyvpdc.endpoint} - test.savvis-symphonyvpdc.apiversion - ${test.savvis-symphonyvpdc.apiversion} + test.savvis-symphonyvpdc.api-version + ${test.savvis-symphonyvpdc.api-version} test.savvis-symphonyvpdc.identity 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 c2118354d3..dfbc393cd5 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 @@ -103,8 +103,8 @@ ${test.serverlove-z1-man.endpoint} - test.serverlove-z1-man.apiversion - ${test.serverlove-z1-man.apiversion} + test.serverlove-z1-man.api-version + ${test.serverlove-z1-man.api-version} test.serverlove-z1-man.identity diff --git a/providers/skalicloud-sdg-my/pom.xml b/providers/skalicloud-sdg-my/pom.xml index 69032c269e..5ea67557c3 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 @@ -103,8 +103,8 @@ ${test.skalicloud-sdg-my.endpoint} - test.skalicloud-sdg-my.apiversion - ${test.skalicloud-sdg-my.apiversion} + test.skalicloud-sdg-my.api-version + ${test.skalicloud-sdg-my.api-version} test.skalicloud-sdg-my.identity diff --git a/providers/slicehost/pom.xml b/providers/slicehost/pom.xml index 8ccd44e688..fc4c80ed32 100644 --- a/providers/slicehost/pom.xml +++ b/providers/slicehost/pom.xml @@ -37,7 +37,7 @@ trmkrun-ccc,test.trmk-924 https://api.slicehost.com - 1.4.1.1 + 1.4.1.1 FIXME @@ -98,8 +98,8 @@ ${test.slicehost.endpoint} - test.slicehost.apiversion - ${test.slicehost.apiversion} + test.slicehost.api-version + ${test.slicehost.api-version} test.slicehost.identity 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 66353c1671..6f249da81c 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 90b10706f6..067f8e0699 100644 --- a/providers/softlayer/pom.xml +++ b/providers/softlayer/pom.xml @@ -49,7 +49,7 @@ https://api.softlayer.com/rest - 3 + 3 FIXME FIXME @@ -108,8 +108,8 @@ ${test.softlayer.endpoint} - test.softlayer.apiversion - ${test.softlayer.apiversion} + test.softlayer.api-version + ${test.softlayer.api-version} test.softlayer.identity 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 26257ef066..1827cb46e1 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 b4cb52b5fd..5f2516b9f7 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 @@ -103,8 +103,8 @@ ${test.stratogen-vcloud-mycloud.endpoint} - test.stratogen-vcloud-mycloud.apiversion - ${test.stratogen-vcloud-mycloud.apiversion} + test.stratogen-vcloud-mycloud.api-version + ${test.stratogen-vcloud-mycloud.api-version} test.stratogen-vcloud-mycloud.identity diff --git a/providers/synaptic-storage/pom.xml b/providers/synaptic-storage/pom.xml index ba5206149d..9f3443c24d 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 @@ -105,8 +105,8 @@ ${test.synaptic-storage.endpoint} - test.synaptic-storage.apiversion - ${test.synaptic-storage.apiversion} + test.synaptic-storage.api-version + ${test.synaptic-storage.api-version} test.synaptic-storage.identity diff --git a/providers/trmk-ecloud/pom.xml b/providers/trmk-ecloud/pom.xml index 84209395ad..1487bdea8f 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 @@ -105,8 +105,8 @@ ${test.trmk-ecloud.endpoint} - test.trmk-ecloud.apiversion - ${test.trmk-ecloud.apiversion} + test.trmk-ecloud.api-version + ${test.trmk-ecloud.api-version} test.trmk-ecloud.identity diff --git a/providers/trmk-vcloudexpress/pom.xml b/providers/trmk-vcloudexpress/pom.xml index 494859402e..63f791c3fa 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 @@ -104,8 +104,8 @@ ${test.trmk-vcloudexpress.endpoint} - test.trmk-vcloudexpress.apiversion - ${test.trmk-vcloudexpress.apiversion} + test.trmk-vcloudexpress.api-version + ${test.trmk-vcloudexpress.api-version} test.trmk-vcloudexpress.identity 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/cloudstack/pom.xml b/sandbox-apis/cloudstack/pom.xml index d4b2a241db..2caeaf3cd7 100644 --- a/sandbox-apis/cloudstack/pom.xml +++ b/sandbox-apis/cloudstack/pom.xml @@ -49,7 +49,7 @@ http://localhost:8080/client/api - 2.2.0 + 2.2.0 FIXME_apiKey FIXME_secretKey @@ -115,8 +115,8 @@ ${test.cloudstack.endpoint} - test.cloudstack.apiversion - ${test.cloudstack.apiversion} + test.cloudstack.api-version + ${test.cloudstack.api-version} test.cloudstack.identity diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackClientLiveTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackClientLiveTest.java index ab971c5bf4..5666d42704 100644 --- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackClientLiveTest.java +++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackClientLiveTest.java @@ -68,7 +68,7 @@ public class BaseCloudStackClientLiveTest { protected String identity; protected String credential; protected String endpoint; - protected String apiversion; + protected String apiVersion; protected Predicate socketTester; protected RetryablePredicate jobComplete; protected RetryablePredicate virtualMachineRunning; @@ -87,7 +87,7 @@ public class BaseCloudStackClientLiveTest { + ".credential must be set. ex. secretKey"); endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint must be set. ex. http://localhost:8080/client/api"); - apiversion = System.getProperty("test." + provider + ".apiversion"); + apiVersion = System.getProperty("test." + provider + ".api-version"); } protected void checkSSH(IPSocket socket) { @@ -111,8 +111,8 @@ public class BaseCloudStackClientLiveTest { overrides.setProperty(provider + ".identity", identity); overrides.setProperty(provider + ".credential", credential); overrides.setProperty(provider + ".endpoint", endpoint); - if (apiversion != null) - overrides.setProperty(provider + ".apiversion", apiversion); + if (apiVersion != null) + overrides.setProperty(provider + ".api-version", apiVersion); return overrides; } @@ -155,4 +155,4 @@ public class BaseCloudStackClientLiveTest { context.close(); } -} \ No newline at end of file +} diff --git a/sandbox-apis/elb/pom.xml b/sandbox-apis/elb/pom.xml index c5376c05ca..81aec1b6dc 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} @@ -123,8 +123,8 @@ ${test.elb.endpoint} - test.elb.apiversion - ${test.elb.apiversion} + test.elb.api-version + ${test.elb.api-version} test.elb.identity @@ -143,8 +143,8 @@ ${test.elb.compute.endpoint} - test.elb.compute.apiversion - ${test.elb.compute.apiversion} + test.elb.compute.api-version + ${test.elb.compute.api-version} test.elb.compute.identity 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 17fb2b007e..4c5bd872ca 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 @@ -129,8 +129,8 @@ ${test.libvirt.endpoint} - test.libvirt.apiversion - ${test.libvirt.apiversion} + test.libvirt.api-version + ${test.libvirt.api-version} test.libvirt.identity 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 fda7117565..6739526749 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 @@ -110,8 +110,8 @@ ${test.nirvanix.endpoint} - test.nirvanix.apiversion - ${test.nirvanix.apiversion} + test.nirvanix.api-version + ${test.nirvanix.api-version} test.nirvanix.identity diff --git a/sandbox-apis/pcs/pom.xml b/sandbox-apis/pcs/pom.xml index 39a66b3464..7d11e0c51f 100644 --- a/sandbox-apis/pcs/pom.xml +++ b/sandbox-apis/pcs/pom.xml @@ -46,7 +46,7 @@ FIXME - 2 + 2 FIXME FIXME @@ -110,8 +110,8 @@ ${test.pcs.endpoint} - test.pcs.apiversion - ${test.pcs.apiversion} + test.pcs.api-version + ${test.pcs.api-version} test.pcs.identity 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 343802f71a..f34f9ca100 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 @@ -105,8 +105,8 @@ ${test.scality-rs2.endpoint} - test.scality-rs2.apiversion - ${test.scality-rs2.apiversion} + test.scality-rs2.api-version + ${test.scality-rs2.api-version} test.scality-rs2.identity diff --git a/sandbox-apis/simpledb/pom.xml b/sandbox-apis/simpledb/pom.xml index ec230c784f..4c4c09ee59 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} @@ -83,8 +83,8 @@ ${test.simpledb.endpoint} - test.simpledb.apiversion - ${test.simpledb.apiversion} + test.simpledb.api-version + ${test.simpledb.api-version} test.simpledb.identity 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 4e19128f77..233aae3a19 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} @@ -83,8 +83,8 @@ ${test.sqs.endpoint} - test.sqs.apiversion - ${test.sqs.apiversion} + test.sqs.api-version + ${test.sqs.api-version} test.sqs.identity 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 52ecc8019f..a9e9126d0c 100644 --- a/sandbox-apis/virtualbox/pom.xml +++ b/sandbox-apis/virtualbox/pom.xml @@ -35,7 +35,7 @@ http://localhost:18083/ - 4.1.2r73507 + 4.1.2r73507 administrator 12345 @@ -72,7 +72,7 @@ org.virtualbox vboxjws - ${test.virtualbox.apiversion} + ${test.virtualbox.api-version} org.jclouds.api @@ -166,8 +166,8 @@ ${test.virtualbox.endpoint} - test.virtualbox.apiversion - ${test.virtualbox.apiversion} + test.virtualbox.api-version + ${test.virtualbox.api-version} test.virtualbox.identity 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 a8e1d57995..afbbb52732 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 @@ -47,14 +47,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; @@ -63,7 +63,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())); } diff --git a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/experiment/SetupVirtualBoxForLiveTest.java b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/experiment/SetupVirtualBoxForLiveTest.java index adf05bc0db..5b7a5ae1e2 100644 --- a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/experiment/SetupVirtualBoxForLiveTest.java +++ b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/experiment/SetupVirtualBoxForLiveTest.java @@ -77,7 +77,7 @@ public class SetupVirtualBoxForLiveTest { public void setupCredentials() { endpoint = URI.create(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"); majorVersion = Iterables.get(Splitter.on('r').split(apiVersion), 0); } @@ -214,4 +214,4 @@ public class SetupVirtualBoxForLiveTest { return runScriptOnNode(nodeId, command, wrapInInitScript(false)); } -} \ No newline at end of file +} diff --git a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/experiment/VirtualboxAdministrationKickstartLiveTest.java b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/experiment/VirtualboxAdministrationKickstartLiveTest.java index 7b3efd7c37..f40f894a7c 100644 --- a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/experiment/VirtualboxAdministrationKickstartLiveTest.java +++ b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/experiment/VirtualboxAdministrationKickstartLiveTest.java @@ -113,7 +113,7 @@ public class VirtualboxAdministrationKickstartLiveTest extends BaseVirtualBoxCli ; distroIsoName = System.getProperty("test." + provider + ".distroIsoName", "ubuntu-11.04-server-i386.iso"); adminDisk = workingDir + File.separator + System.getProperty("test." + provider + ".adminDisk", "admin.vdi"); - String majorVersion = Iterables.get(Splitter.on('r').split(apiversion), 0); + String majorVersion = Iterables.get(Splitter.on('r').split(apiVersion), 0); guestAdditionsDvd = workingDir + File.separator + System.getProperty("test." + provider + ".guestAdditionsDvd", "VBoxGuestAdditions_" + majorVersion @@ -429,4 +429,4 @@ public class VirtualboxAdministrationKickstartLiveTest extends BaseVirtualBoxCli } } -} \ No newline at end of file +} diff --git a/sandbox-providers/aws-elb/pom.xml b/sandbox-providers/aws-elb/pom.xml index 7489277cac..88f0bbe8a3 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} @@ -126,8 +126,8 @@ ${test.aws-elb.endpoint} - test.aws-elb.apiversion - ${test.aws-elb.apiversion} + test.aws-elb.api-version + ${test.aws-elb.api-version} test.aws-elb.identity @@ -146,8 +146,8 @@ ${test.aws-elb.compute.endpoint} - test.aws-elb.compute.apiversion - ${test.aws-elb.compute.apiversion} + test.aws-elb.compute.api-version + ${test.aws-elb.compute.api-version} test.aws-elb.compute.identity diff --git a/sandbox-providers/aws-simpledb/pom.xml b/sandbox-providers/aws-simpledb/pom.xml index 3c7af0ead1..ab7d805ece 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} @@ -97,8 +97,8 @@ ${test.aws-simpledb.endpoint} - test.aws-simpledb.apiversion - ${test.aws-simpledb.apiversion} + test.aws-simpledb.api-version + ${test.aws-simpledb.api-version} test.aws-simpledb.identity diff --git a/sandbox-providers/azurequeue/pom.xml b/sandbox-providers/azurequeue/pom.xml index 9883faea08..2a17d22e4d 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} @@ -90,8 +90,8 @@ ${test.azurequeue.endpoint} - test.azurequeue.apiversion - ${test.azurequeue.apiversion} + test.azurequeue.api-version + ${test.azurequeue.api-version} test.azurequeue.identity 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 f3fc8622ab..c92580f5cd 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 @@ -101,8 +101,8 @@ ${test.boxdotnet.endpoint} - test.boxdotnet.apiversion - ${test.boxdotnet.apiversion} + test.boxdotnet.api-version + ${test.boxdotnet.api-version} test.boxdotnet.identity diff --git a/sandbox-providers/dunkel-vcd/pom.xml b/sandbox-providers/dunkel-vcd/pom.xml index ef611724de..8a41722cb2 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 @@ -102,8 +102,8 @@ ${test.dunkel-vcd.endpoint} - test.dunkel-vcd.apiversion - ${test.dunkel-vcd.apiversion} + test.dunkel-vcd.api-version + ${test.dunkel-vcd.api-version} test.dunkel-vcd.identity diff --git a/sandbox-providers/googlestorage/pom.xml b/sandbox-providers/googlestorage/pom.xml index 500dbb95e3..eb60aa836d 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 @@ -105,8 +105,8 @@ ${test.googlestorage.endpoint} - test.googlestorage.apiversion - ${test.googlestorage.apiversion} + test.googlestorage.api-version + ${test.googlestorage.api-version} test.googlestorage.identity diff --git a/sandbox-providers/hosteurope-storage/pom.xml b/sandbox-providers/hosteurope-storage/pom.xml index 0063577080..5828f48406 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 @@ -112,8 +112,8 @@ ${test.hosteurope-storage.endpoint} - test.hosteurope-storage.apiversion - ${test.hosteurope-storage.apiversion} + test.hosteurope-storage.api-version + ${test.hosteurope-storage.api-version} test.hosteurope-storage.identity diff --git a/sandbox-providers/ibm-smartcloud/pom.xml b/sandbox-providers/ibm-smartcloud/pom.xml index 59c7fda79a..38f2ec9fc0 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 @@ -113,8 +113,8 @@ ${test.ibm-smartcloud.endpoint} - test.ibm-smartcloud.apiversion - ${test.ibm-smartcloud.apiversion} + test.ibm-smartcloud.api-version + ${test.ibm-smartcloud.api-version} test.ibm-smartcloud.identity 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 2bad83f16d..36cd2c968a 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 @@ -112,8 +112,8 @@ ${test.scaleup-storage.endpoint} - test.scaleup-storage.apiversion - ${test.scaleup-storage.apiversion} + test.scaleup-storage.api-version + ${test.scaleup-storage.api-version} test.scaleup-storage.identity diff --git a/sandbox-providers/tiscali-storage/pom.xml b/sandbox-providers/tiscali-storage/pom.xml index 60c59d6938..6f802c998e 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 @@ -113,8 +113,8 @@ ${test.tiscali-storage.endpoint} - test.tiscali-storage.apiversion - ${test.tiscali-storage.apiversion} + test.tiscali-storage.api-version + ${test.tiscali-storage.api-version} test.tiscali-storage.identity diff --git a/sandbox-providers/twitter/pom.xml b/sandbox-providers/twitter/pom.xml index d81b757a4e..e563041ae6 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 @@ -102,8 +102,8 @@ ${test.twitter.endpoint} - test.twitter.apiversion - ${test.twitter.apiversion} + test.twitter.api-version + ${test.twitter.api-version} test.twitter.identity 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 fb5356436f..cc9b2cee29 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 @@ -102,8 +102,8 @@ ${test.virtacore-vcloudexpress.endpoint} - test.virtacore-vcloudexpress.apiversion - ${test.virtacore-vcloudexpress.apiversion} + test.virtacore-vcloudexpress.api-version + ${test.virtacore-vcloudexpress.api-version} test.virtacore-vcloudexpress.identity diff --git a/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml index 9c7d5529b6..265c0f75eb 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 @@ -102,8 +102,8 @@ ${test.servermanager.endpoint} - test.servermanager.apiversion - ${test.servermanager.apiversion} + test.servermanager.api-version + ${test.servermanager.api-version} test.servermanager.identity 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 +}