Issue 801:fix inconsistency in test property test.provider.apiversion set in pom.xml -> api-version

apis/atmos/pom.xml

@@ -36,7 +36,7 @@
   <properties>
     <test.initializer>org.jclouds.atmos.blobstore.integration.AtmosStorageTestInitializer</test.initializer>
     <test.atmos.endpoint>https://accesspoint.atmos.com</test.atmos.endpoint>
-    <test.atmos.apiversion>1.3.0</test.atmos.apiversion>
+    <test.atmos.api-version>1.3.0</test.atmos.api-version>
     <test.atmos.identity>FIXME</test.atmos.identity>
     <test.atmos.credential>FIXME</test.atmos.credential>
   </properties>
@@ -95,7 +95,7 @@
                     <jclouds.blobstore.httpstream.url>${jclouds.blobstore.httpstream.url}</jclouds.blobstore.httpstream.url>
                     <jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5>
                     <test.atmos.endpoint>${test.atmos.endpoint}</test.atmos.endpoint>
-                    <test.atmos.apiversion>${test.atmos.apiversion}</test.atmos.apiversion>
+                    <test.atmos.api-version>${test.atmos.api-version}</test.atmos.api-version>
                     <test.atmos.identity>${test.atmos.identity}</test.atmos.identity>
                     <test.atmos.credential>${test.atmos.credential}</test.atmos.credential>
                   </systemPropertyVariables>

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));
    }
 
 }

apis/cloudfiles/pom.xml

@@ -36,7 +36,7 @@
   <properties>
     <test.initializer>org.jclouds.cloudfiles.blobstore.integration.CloudFilesTestInitializer</test.initializer>
     <test.cloudfiles.endpoint>https://auth.api.rackspacecloud.com</test.cloudfiles.endpoint>
-    <test.cloudfiles.apiversion>1.0</test.cloudfiles.apiversion>
+    <test.cloudfiles.api-version>1.0</test.cloudfiles.api-version>
     <test.cloudfiles.identity>${test.rackspace.identity}</test.cloudfiles.identity>
     <test.cloudfiles.credential>${test.rackspace.credential}</test.cloudfiles.credential>
   </properties>
@@ -110,7 +110,7 @@
                     <jclouds.blobstore.httpstream.url>${jclouds.blobstore.httpstream.url}</jclouds.blobstore.httpstream.url>
                     <jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5>
                     <test.cloudfiles.endpoint>${test.cloudfiles.endpoint}</test.cloudfiles.endpoint>
-                    <test.cloudfiles.apiversion>${test.cloudfiles.apiversion}</test.cloudfiles.apiversion>
+                    <test.cloudfiles.api-version>${test.cloudfiles.api-version}</test.cloudfiles.api-version>
                     <test.cloudfiles.identity>${test.cloudfiles.identity}</test.cloudfiles.identity>
                     <test.cloudfiles.credential>${test.cloudfiles.credential}</test.cloudfiles.credential>
                   </systemPropertyVariables>

apis/cloudloadbalancers/pom.xml

@@ -35,7 +35,7 @@
   
    <properties>
     <test.cloudloadbalancers.endpoint>https://auth.api.rackspacecloud.com</test.cloudloadbalancers.endpoint>
-    <test.cloudloadbalancers.apiversion>1.0</test.cloudloadbalancers.apiversion>
+    <test.cloudloadbalancers.api-version>1.0</test.cloudloadbalancers.api-version>
     <test.cloudloadbalancers.identity>${test.rackspace.identity}</test.cloudloadbalancers.identity>
     <test.cloudloadbalancers.credential>${test.rackspace.credential}</test.cloudloadbalancers.credential>
   </properties>
@@ -96,7 +96,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.cloudloadbalancers.endpoint>${test.cloudloadbalancers.endpoint}</test.cloudloadbalancers.endpoint>
-                    <test.cloudloadbalancers.apiversion>${test.cloudloadbalancers.apiversion}</test.cloudloadbalancers.apiversion>
+                    <test.cloudloadbalancers.api-version>${test.cloudloadbalancers.api-version}</test.cloudloadbalancers.api-version>
                     <test.cloudloadbalancers.identity>${test.cloudloadbalancers.identity}</test.cloudloadbalancers.identity>
                     <test.cloudloadbalancers.credential>${test.cloudloadbalancers.credential}</test.cloudloadbalancers.credential>
                   </systemPropertyVariables>

apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/BaseCloudLoadBalancersClientLiveTest.java

@@ -57,7 +57,7 @@ public class BaseCloudLoadBalancersClientLiveTest {
    protected String identity;
    protected String credential;
    protected String endpoint;
-   protected String apiversion;
+   protected String apiVersion;
    protected Predicate<IPSocket> socketTester;
    protected RetryablePredicate<LoadBalancer> loadBalancerActive;
    protected RetryablePredicate<LoadBalancer> loadBalancerDeleted;
@@ -70,7 +70,7 @@ public class BaseCloudLoadBalancersClientLiveTest {
       credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
                + ".credential must be set.  ex. secretKey");
       endpoint = System.getProperty("test." + provider + ".endpoint");
-      apiversion = System.getProperty("test." + provider + ".apiversion");
+     apiVersion = System.getProperty("test." + provider + ".api-version");
    }
 
    protected Properties setupProperties() {
@@ -81,8 +81,8 @@ public class BaseCloudLoadBalancersClientLiveTest {
       overrides.setProperty(provider + ".credential", credential);
       if (endpoint != null)
          overrides.setProperty(provider + ".endpoint", endpoint);
-      if (apiversion != null)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

apis/cloudservers/pom.xml

@@ -36,7 +36,7 @@
 
   <properties>
     <test.cloudservers.endpoint>https://auth.api.rackspacecloud.com</test.cloudservers.endpoint>
-    <test.cloudservers.apiversion>1.0</test.cloudservers.apiversion>
+    <test.cloudservers.api-version>1.0</test.cloudservers.api-version>
     <test.cloudservers.identity>${test.rackspace.identity}</test.cloudservers.identity>
     <test.cloudservers.credential>${test.rackspace.credential}</test.cloudservers.credential>
     <test.cloudservers.image-id></test.cloudservers.image-id>
@@ -108,7 +108,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.cloudstack.endpoint>${test.cloudstack.endpoint}</test.cloudstack.endpoint>
-                    <test.cloudstack.apiversion>${test.cloudstack.apiversion}</test.cloudstack.apiversion>
+                    <test.cloudstack.api-version>${test.cloudstack.api-version}</test.cloudstack.api-version>
                     <test.cloudstack.identity>${test.cloudstack.identity}</test.cloudstack.identity>
                     <test.cloudstack.credential>${test.cloudstack.credential}</test.cloudstack.credential>
                     <test.cloudstack.image-id>${test.cloudstack.image-id}</test.cloudstack.image-id>

apis/cloudsigma/pom.xml

@@ -35,7 +35,7 @@
   
   <properties>
     <test.cloudsigma.endpoint>https://api.cloudsigma.com</test.cloudsigma.endpoint>
-    <test.cloudsigma.apiversion>1.0</test.cloudsigma.apiversion>
+    <test.cloudsigma.api-version>1.0</test.cloudsigma.api-version>
     <test.cloudsigma.identity>FIXME</test.cloudsigma.identity>
     <test.cloudsigma.credential>FIXME</test.cloudsigma.credential>
     <test.cloudsigma.image-id></test.cloudsigma.image-id>
@@ -94,7 +94,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.cloudsigma.endpoint>${test.cloudsigma.endpoint}</test.cloudsigma.endpoint>
-                    <test.cloudsigma.apiversion>${test.cloudsigma.apiversion}</test.cloudsigma.apiversion>
+                    <test.cloudsigma.api-version>${test.cloudsigma.api-version}</test.cloudsigma.api-version>
                     <test.cloudsigma.identity>${test.cloudsigma.identity}</test.cloudsigma.identity>
                     <test.cloudsigma.credential>${test.cloudsigma.credential}</test.cloudsigma.credential>
                     <test.cloudsigma.image-id>${test.cloudsigma.image-id}</test.cloudsigma.image-id>

apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java

@@ -87,14 +87,14 @@ public class CloudSigmaClientLiveTest {
    protected String identity;
    protected String credential;
    protected String endpoint;
-   protected String apiversion;
+   protected String apiVersion;
    protected Predicate<DriveInfo> driveNotClaimed;
 
    protected void setupCredentials() {
       identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
       credential = System.getProperty("test." + provider + ".credential");
       endpoint = System.getProperty("test." + provider + ".endpoint");
-      apiversion = System.getProperty("test." + provider + ".apiversion");
+     apiVersion = System.getProperty("test." + provider + ".api-version");
    }
 
    protected Properties setupProperties() {
@@ -106,8 +106,8 @@ public class CloudSigmaClientLiveTest {
          overrides.setProperty(provider + ".credential", credential);
       if (endpoint != null)
          overrides.setProperty(provider + ".endpoint", endpoint);
-      if (apiversion != null)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

apis/cloudstack/pom.xml

@@ -49,7 +49,7 @@
   
   <properties>
     <test.cloudstack.endpoint>http://localhost:8080/client/api</test.cloudstack.endpoint>
-    <test.cloudstack.apiversion>2.2.12</test.cloudstack.apiversion>
+    <test.cloudstack.api-version>2.2.12</test.cloudstack.api-version>
     <test.cloudstack.identity>FIXME_apiKey</test.cloudstack.identity>
     <test.cloudstack.credential>FIXME_secretKey</test.cloudstack.credential>
     <test.cloudstack.domainAdminIdentity></test.cloudstack.domainAdminIdentity>
@@ -116,7 +116,7 @@
                   <threadCount>2</threadCount>
                   <systemPropertyVariables>
                     <test.cloudstack.endpoint>${test.cloudstack.endpoint}</test.cloudstack.endpoint>
-                    <test.cloudstack.apiversion>${test.cloudstack.apiversion}</test.cloudstack.apiversion>
+                    <test.cloudstack.api-version>${test.cloudstack.api-version}</test.cloudstack.api-version>
                     <test.cloudstack.identity>${test.cloudstack.identity}</test.cloudstack.identity>
                     <test.cloudstack.credential>${test.cloudstack.credential}</test.cloudstack.credential>
                     <test.cloudstack.image-id>${test.cloudstack.image-id}</test.cloudstack.image-id>

apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingClientLiveTest.java

@@ -64,7 +64,7 @@ public class OfferingClientLiveTest extends BaseCloudStackClientLiveTest {
 
          } catch (NoSuchElementException e) {
             // This bug is present both in 2.2.8 and 2.2.12
-           assertTrue("2.2.8".equals(apiversion) || "2.2.12".equals(apiversion));
+           assertTrue("2.2.8".equals(apiVersion) || "2.2.12".equals(apiVersion));
          }
       }
    }

apis/cloudwatch/pom.xml

@@ -35,7 +35,7 @@
 
   <properties>
     <test.cloudwatch.endpoint>https://monitoring.us-east-1.amazonaws.com</test.cloudwatch.endpoint>
-    <test.cloudwatch.apiversion>2009-05-15</test.cloudwatch.apiversion>
+    <test.cloudwatch.api-version>2009-05-15</test.cloudwatch.api-version>
     <test.cloudwatch.identity>${test.aws.identity}</test.cloudwatch.identity>
     <test.cloudwatch.credential>${test.aws.credential}</test.cloudwatch.credential>
   </properties>
@@ -86,7 +86,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.cloudwatch.endpoint>${test.cloudwatch.endpoint}</test.cloudwatch.endpoint>
-                    <test.cloudwatch.apiversion>${test.cloudwatch.apiversion}</test.cloudwatch.apiversion>
+                    <test.cloudwatch.api-version>${test.cloudwatch.api-version}</test.cloudwatch.api-version>
                     <test.cloudwatch.identity>${test.cloudwatch.identity}</test.cloudwatch.identity>
                     <test.cloudwatch.credential>${test.cloudwatch.credential}</test.cloudwatch.credential>
                   </systemPropertyVariables>

apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java

@@ -54,14 +54,14 @@ public class CloudWatchClientLiveTest {
    protected String identity;
    protected String credential;
    protected String endpoint;
-   protected String apiversion;
+   protected String apiVersion;
 
    protected void setupCredentials() {
       identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
       credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
                + ".credential");
       endpoint = System.getProperty("test." + provider + ".endpoint", null);
-      apiversion = System.getProperty("test." + provider + ".apiversion", null);
+     apiVersion = System.getProperty("test." + provider + ".api-version", null);
    }
 
    protected Properties setupProperties() {
@@ -72,8 +72,8 @@ public class CloudWatchClientLiveTest {
       overrides.setProperty(provider + ".credential", credential);
       if (endpoint != null)
          overrides.setProperty(provider + ".endpoint", endpoint);
-      if (apiversion != null)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

apis/deltacloud/pom.xml

@@ -49,7 +49,7 @@
   
   <properties>
     <test.deltacloud.endpoint>http://localhost:3001/api</test.deltacloud.endpoint>
-    <test.deltacloud.apiversion>0.3.0</test.deltacloud.apiversion>
+    <test.deltacloud.api-version>0.3.0</test.deltacloud.api-version>
     <test.deltacloud.identity>mockuser</test.deltacloud.identity>
     <test.deltacloud.credential>mockpassword</test.deltacloud.credential>
     <test.deltacloud.image-id></test.deltacloud.image-id>
@@ -107,7 +107,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.deltacloud.endpoint>${test.deltacloud.endpoint}</test.deltacloud.endpoint>
-                    <test.deltacloud.apiversion>${test.deltacloud.apiversion}</test.deltacloud.apiversion>
+                    <test.deltacloud.api-version>${test.deltacloud.api-version}</test.deltacloud.api-version>
                     <test.deltacloud.identity>${test.deltacloud.identity}</test.deltacloud.identity>
                     <test.deltacloud.credential>${test.deltacloud.credential}</test.deltacloud.credential>
                     <test.deltacloud.image-id>${test.deltacloud.image-id}</test.deltacloud.image-id>

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<IPSocket> socketTester;
    protected ImmutableMap<State, Predicate<Instance>> 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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

apis/ec2/pom.xml

@@ -35,7 +35,7 @@
 
   <properties>
     <test.ec2.endpoint>https://ec2.us-east-1.amazonaws.com</test.ec2.endpoint>
-    <test.ec2.apiversion>2010-06-15</test.ec2.apiversion>
+    <test.ec2.api-version>2010-06-15</test.ec2.api-version>
     <test.ec2.identity>${test.aws.identity}</test.ec2.identity>
     <test.ec2.credential>${test.aws.credential}</test.ec2.credential>
     <test.ec2.image-id></test.ec2.image-id>
@@ -102,7 +102,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.ec2.endpoint>${test.ec2.endpoint}</test.ec2.endpoint>
-                    <test.ec2.apiversion>${test.ec2.apiversion}</test.ec2.apiversion>
+                    <test.ec2.api-version>${test.ec2.api-version}</test.ec2.api-version>
                     <test.ec2.identity>${test.ec2.identity}</test.ec2.identity>
                     <test.ec2.credential>${test.ec2.credential}</test.ec2.credential>
                     <test.ec2.image-id>${test.ec2.image-id}</test.ec2.image-id>

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 = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
-            + ".apiversion");
+            + ".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;
    }
 

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 = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
-            + ".apiversion");
+            + ".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;
    }
 

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

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 = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
-               + ".apiversion");
+               + ".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;
    }
 

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 = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
-               + ".apiversion");
+               + ".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;
    }
 

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 = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
-               + ".apiversion");
+               + ".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;
    }
 

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

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 = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
-               + ".apiversion");
+               + ".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;
    }
 

apis/elasticstack/pom.xml

@@ -49,7 +49,7 @@
   
   <properties>
     <test.elasticstack.endpoint>https://api.lon-p.elastichosts.com</test.elasticstack.endpoint>
-    <test.elasticstack.apiversion>1.0</test.elasticstack.apiversion>
+    <test.elasticstack.api-version>1.0</test.elasticstack.api-version>
     <test.elasticstack.identity>FIXME</test.elasticstack.identity>
     <test.elasticstack.credential>FIXME</test.elasticstack.credential>
     <test.elasticstack.image-id></test.elasticstack.image-id>
@@ -107,7 +107,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.elasticstack.endpoint>${test.elasticstack.endpoint}</test.elasticstack.endpoint>
-                    <test.elasticstack.apiversion>${test.elasticstack.apiversion}</test.elasticstack.apiversion>
+                    <test.elasticstack.api-version>${test.elasticstack.api-version}</test.elasticstack.api-version>
                     <test.elasticstack.identity>${test.elasticstack.identity}</test.elasticstack.identity>
                     <test.elasticstack.credential>${test.elasticstack.credential}</test.elasticstack.credential>
                     <test.elasticstack.image-id>${test.elasticstack.image-id}</test.elasticstack.image-id>

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<DriveInfo> 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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

apis/eucalyptus/pom.xml

@@ -35,7 +35,7 @@
 
   <properties>
     <test.eucalyptus.endpoint>http://ecc.eucalyptus.com:8773/services/Eucalyptus</test.eucalyptus.endpoint>
-    <test.eucalyptus.apiversion>2010-06-15</test.eucalyptus.apiversion>
+    <test.eucalyptus.api-version>2010-06-15</test.eucalyptus.api-version>
     <test.eucalyptus.identity>FIXME_IDENTITY</test.eucalyptus.identity>
     <test.eucalyptus.credential>FIXME_CREDENTIAL</test.eucalyptus.credential>
     <test.eucalyptus.image-id></test.eucalyptus.image-id>
@@ -102,7 +102,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.eucalyptus.endpoint>${test.eucalyptus.endpoint}</test.eucalyptus.endpoint>
-                    <test.eucalyptus.apiversion>${test.eucalyptus.apiversion}</test.eucalyptus.apiversion>
+                    <test.eucalyptus.api-version>${test.eucalyptus.api-version}</test.eucalyptus.api-version>
                     <test.eucalyptus.identity>${test.eucalyptus.identity}</test.eucalyptus.identity>
                     <test.eucalyptus.credential>${test.eucalyptus.credential}</test.eucalyptus.credential>
                     <test.eucalyptus.image-id>${test.eucalyptus.image-id}</test.eucalyptus.image-id>

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) {
+   protected Properties setupProperties(String endpoint, String apiVersion, String identity, String credential) {
-      Properties props = super.setupProperties(endpoint, apiversion, identity, credential);
+      Properties props = super.setupProperties(endpoint, apiVersion, identity, credential);
       props.setProperty(FilesystemConstants.PROPERTY_BASEDIR, TestUtils.TARGET_BASE_DIR);
       return props;
    }
 
-}
+}

apis/nova/pom.xml

@@ -35,7 +35,7 @@
 
   <properties>
     <test.nova.endpoint>http://localhost:8773/services/Cloud</test.nova.endpoint>
-    <test.nova.apiversion>1.1</test.nova.apiversion>
+    <test.nova.api-version>1.1</test.nova.api-version>
     <test.nova.identity>FIXME_IDENTITY</test.nova.identity>
     <test.nova.credential>FIXME_CREDENTIALS</test.nova.credential>
     <test.nova.image-id></test.nova.image-id>
@@ -115,7 +115,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.nova.endpoint>${test.nova.endpoint}</test.nova.endpoint>
-                    <test.nova.apiversion>${test.nova.apiversion}</test.nova.apiversion>
+                    <test.nova.api-version>${test.nova.api-version}</test.nova.api-version>
                     <test.nova.identity>${test.nova.identity}</test.nova.identity>
                     <test.nova.credential>${test.nova.credential}</test.nova.credential>
                     <test.nova.image-id>${test.nova.image-id}</test.nova.image-id>

apis/nova/src/test/java/org/jclouds/openstack/nova/NovaAsyncClientTest.java

@@ -78,7 +78,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
             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<NovaAsyncClient> {
       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<NovaAsyncClient> {
       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<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("deleteImage", int.class);
       HttpRequest request = processor.createRequest(method, 2);
 
-      assertRequestLineEquals(request, "DELETE http://endpoint/vapiversion/images/2 HTTP/1.1");
+      assertRequestLineEquals(request, "DELETE http://endpoint/vapi-version/images/2 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: */*\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -153,7 +153,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       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<NovaAsyncClient> {
       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<NovaAsyncClient> {
       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<NovaAsyncClient> {
       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<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("getServer", String.class);
       HttpRequest request = processor.createRequest(method, "dfdcd0a6-0a2f-11e1-8505-2837371c69ae");
 
-      assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/dfdcd0a6-0a2f-11e1-8505-2837371c69ae?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/dfdcd0a6-0a2f-11e1-8505-2837371c69ae?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -231,7 +231,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("listFlavors", listOptionsVarargsClass);
       HttpRequest request = processor.createRequest(method);
 
-      assertRequestLineEquals(request, "GET http://endpoint/vapiversion/flavors?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "GET http://endpoint/vapi-version/flavors?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -247,7 +247,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       HttpRequest request = processor.createRequest(method, changesSince(now).maxResults(1).startAt(2));
 
       assertRequestLineEquals(request,
-            "GET http://endpoint/vapiversion/flavors?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
+            "GET http://endpoint/vapi-version/flavors?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -262,7 +262,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("listFlavors", listOptionsVarargsClass);
       HttpRequest request = processor.createRequest(method, withDetails());
 
-      assertRequestLineEquals(request, "GET http://endpoint/vapiversion/flavors/detail?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "GET http://endpoint/vapi-version/flavors/detail?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -278,7 +278,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       HttpRequest request = processor.createRequest(method, withDetails().changesSince(now).maxResults(1).startAt(2));
 
       assertRequestLineEquals(request,
-            "GET http://endpoint/vapiversion/flavors/detail?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
+            "GET http://endpoint/vapi-version/flavors/detail?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -293,7 +293,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("getFlavor", int.class);
       HttpRequest request = processor.createRequest(method, 2);
 
-      assertRequestLineEquals(request, "GET http://endpoint/vapiversion/flavors/2?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "GET http://endpoint/vapi-version/flavors/2?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -308,7 +308,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("getFlavor", String.class);
       HttpRequest request = processor.createRequest(method, "209904b6-0a30-11e1-a0f0-2837371c69ae");
 
-      assertRequestLineEquals(request, "GET http://endpoint/vapiversion/flavors/209904b6-0a30-11e1-a0f0-2837371c69ae?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "GET http://endpoint/vapi-version/flavors/209904b6-0a30-11e1-a0f0-2837371c69ae?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -323,7 +323,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("listImages", listOptionsVarargsClass);
       HttpRequest request = processor.createRequest(method);
 
-      assertRequestLineEquals(request, "GET http://endpoint/vapiversion/images?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "GET http://endpoint/vapi-version/images?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -338,7 +338,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("listImages", listOptionsVarargsClass);
       HttpRequest request = processor.createRequest(method, withDetails());
 
-      assertRequestLineEquals(request, "GET http://endpoint/vapiversion/images/detail?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "GET http://endpoint/vapi-version/images/detail?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -354,7 +354,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       HttpRequest request = processor.createRequest(method, changesSince(now).maxResults(1).startAt(2));
 
       assertRequestLineEquals(request,
-            "GET http://endpoint/vapiversion/images?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
+            "GET http://endpoint/vapi-version/images?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -370,7 +370,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       HttpRequest request = processor.createRequest(method, withDetails().changesSince(now).maxResults(1).startAt(2));
 
       assertRequestLineEquals(request,
-            "GET http://endpoint/vapiversion/images/detail?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
+            "GET http://endpoint/vapi-version/images/detail?format=json&changes-since=10000&limit=1&offset=2 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -385,7 +385,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("getImage", int.class);
       HttpRequest request = processor.createRequest(method, 2);
 
-      assertRequestLineEquals(request, "GET http://endpoint/vapiversion/images/2?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "GET http://endpoint/vapi-version/images/2?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -400,7 +400,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("getImage", int.class);
       HttpRequest request = processor.createRequest(method, "3bd52d90-0a30-11e1-83f5-2837371c69ae");
 
-      assertRequestLineEquals(request, "GET http://endpoint/vapiversion/images/3bd52d90-0a30-11e1-83f5-2837371c69ae?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "GET http://endpoint/vapi-version/images/3bd52d90-0a30-11e1-83f5-2837371c69ae?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -415,7 +415,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("deleteServer", int.class);
       HttpRequest request = processor.createRequest(method, 2);
 
-      assertRequestLineEquals(request, "DELETE http://endpoint/vapiversion/servers/2 HTTP/1.1");
+      assertRequestLineEquals(request, "DELETE http://endpoint/vapi-version/servers/2 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: */*\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -430,7 +430,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("deleteServer", String.class);
       HttpRequest request = processor.createRequest(method, "db8a1ac6-0a35-11e1-a42f-2837371c69ae");
 
-      assertRequestLineEquals(request, "DELETE http://endpoint/vapiversion/servers/db8a1ac6-0a35-11e1-a42f-2837371c69ae HTTP/1.1");
+      assertRequestLineEquals(request, "DELETE http://endpoint/vapi-version/servers/db8a1ac6-0a35-11e1-a42f-2837371c69ae HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: */*\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -445,7 +445,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("changeAdminPass", int.class, String.class);
       HttpRequest request = processor.createRequest(method, 2, "foo");
 
-      assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action HTTP/1.1");
+      assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: */*\n");
       assertPayloadEquals(request, "{\"changePassword\":{\"adminPass\":\"foo\"}}", MediaType.APPLICATION_JSON, false);
 
@@ -461,7 +461,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("renameServer", int.class, String.class);
       HttpRequest request = processor.createRequest(method, 2, "foo");
 
-      assertRequestLineEquals(request, "PUT http://endpoint/vapiversion/servers/2 HTTP/1.1");
+      assertRequestLineEquals(request, "PUT http://endpoint/vapi-version/servers/2 HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: */*\n");
       assertPayloadEquals(request, "{\"server\":{\"name\":\"foo\"}}", MediaType.APPLICATION_JSON, false);
 
@@ -477,7 +477,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("getAddresses", int.class);
       HttpRequest request = processor.createRequest(method, 2);
 
-      assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/2/ips?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/2/ips?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -492,7 +492,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("listPublicAddresses", int.class);
       HttpRequest request = processor.createRequest(method, 2);
 
-      assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/2/ips/public?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/2/ips/public?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -508,7 +508,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("listPrivateAddresses", int.class);
       HttpRequest request = processor.createRequest(method, 2);
 
-      assertRequestLineEquals(request, "GET http://endpoint/vapiversion/servers/2/ips/private?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "GET http://endpoint/vapi-version/servers/2/ips/private?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -524,7 +524,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("createImageFromServer", String.class, int.class);
       HttpRequest request = processor.createRequest(method, "ralphie", 2);
 
-      assertRequestLineEquals(request, "POST http://endpoint/vapiversion/images?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "POST http://endpoint/vapi-version/images?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: application/json\n");
       assertPayloadEquals(request, "{\"image\":{\"serverId\":2,\"name\":\"ralphie\"}}", MediaType.APPLICATION_JSON,
             false);
@@ -546,7 +546,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
             rebuildServerOptionsVarargsClass);
       HttpRequest request = processor.createRequest(method, 3);
 
-      assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/3/action?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/3/action?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: */*\n");
       assertPayloadEquals(request, "{\"rebuild\":{}}", MediaType.APPLICATION_JSON, false);
 
@@ -563,7 +563,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
             rebuildServerOptionsVarargsClass);
       HttpRequest request = processor.createRequest(method, 3, withImage("2"));
 
-      assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/3/action?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/3/action?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: */*\n");
       assertPayloadEquals(request, "{\"rebuild\":{\"imageRef\":\"2\"}}", MediaType.APPLICATION_JSON, false);
 
@@ -579,7 +579,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("rebootServer", int.class, RebootType.class);
       HttpRequest request = processor.createRequest(method, 2, RebootType.HARD);
 
-      assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: */*\n");
       assertPayloadEquals(request, "{\"reboot\":{\"type\":\"HARD\"}}", MediaType.APPLICATION_JSON, false);
 
@@ -595,7 +595,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("resizeServer", int.class, int.class);
       HttpRequest request = processor.createRequest(method, 2, 3);
 
-      assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: */*\n");
       assertPayloadEquals(request, "{\"resize\":{\"flavorId\":3}}", MediaType.APPLICATION_JSON, false);
 
@@ -611,7 +611,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("confirmResizeServer", int.class);
       HttpRequest request = processor.createRequest(method, 2);
 
-      assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: */*\n");
       assertPayloadEquals(request, "{\"confirmResize\":null}", MediaType.APPLICATION_JSON, false);
 
@@ -626,7 +626,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
       Method method = NovaAsyncClient.class.getMethod("revertResizeServer", int.class);
       HttpRequest request = processor.createRequest(method, 2);
 
-      assertRequestLineEquals(request, "POST http://endpoint/vapiversion/servers/2/action?format=json HTTP/1.1");
+      assertRequestLineEquals(request, "POST http://endpoint/vapi-version/servers/2/action?format=json HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "Accept: */*\n");
       assertPayloadEquals(request, "{\"revertResize\":null}", MediaType.APPLICATION_JSON, false);
 
@@ -665,7 +665,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
 
       @Override
       protected URI provideServerUrl(AuthenticationResponse response) {
-         return URI.create("http://endpoint/vapiversion");
+         return URI.create("http://endpoint/vapi-version");
       }
 
    }
@@ -680,7 +680,7 @@ public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
    @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;

apis/s3/pom.xml

@@ -36,7 +36,7 @@
   <properties>
     <test.initializer>org.jclouds.s3.blobstore.integration.S3TestInitializer</test.initializer>
     <test.s3.endpoint>https://s3.amazonaws.com</test.s3.endpoint>
-    <test.s3.apiversion>2006-03-01</test.s3.apiversion>
+    <test.s3.api-version>2006-03-01</test.s3.api-version>
     <test.s3.identity>${test.aws.identity}</test.s3.identity>
     <test.s3.credential>${test.aws.credential}</test.s3.credential>
   </properties>
@@ -108,7 +108,7 @@
                     <jclouds.blobstore.httpstream.url>${jclouds.blobstore.httpstream.url}</jclouds.blobstore.httpstream.url>
                     <jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5>
                     <test.s3.endpoint>${test.s3.endpoint}</test.s3.endpoint>
-                    <test.s3.apiversion>${test.s3.apiversion}</test.s3.apiversion>
+                    <test.s3.api-version>${test.s3.api-version}</test.s3.api-version>
                     <test.s3.identity>${test.s3.identity}</test.s3.identity>
                     <test.s3.credential>${test.s3.credential}</test.s3.credential>
                   </systemPropertyVariables>

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));
    }
 
 }

apis/swift/pom.xml

@@ -36,7 +36,7 @@
   <properties>
     <test.initializer>org.jclouds.openstack.swift.blobstore.integration.SwiftTestInitializer</test.initializer>
     <test.swift.endpoint>http://localhost:11000</test.swift.endpoint>
-    <test.swift.apiversion>1.0</test.swift.apiversion>
+    <test.swift.api-version>1.0</test.swift.api-version>
     <test.swift.identity>test:tester</test.swift.identity>
     <test.swift.credential>testing</test.swift.credential>
   </properties>
@@ -108,7 +108,7 @@
                     <jclouds.blobstore.httpstream.url>${jclouds.blobstore.httpstream.url}</jclouds.blobstore.httpstream.url>
                     <jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5>
                     <test.swift.endpoint>${test.swift.endpoint}</test.swift.endpoint>
-                    <test.swift.apiversion>${test.swift.apiversion}</test.swift.apiversion>
+                    <test.swift.api-version>${test.swift.api-version}</test.swift.api-version>
                     <test.swift.identity>${test.swift.identity}</test.swift.identity>
                     <test.swift.credential>${test.swift.credential}</test.swift.credential>
                   </systemPropertyVariables>

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));
    }
 
 }

apis/vcloud/pom.xml

@@ -35,7 +35,7 @@
 
   <properties>
     <test.vcloud.endpoint>FIXME</test.vcloud.endpoint>
-    <test.vcloud.apiversion>1.0</test.vcloud.apiversion>
+    <test.vcloud.api-version>1.0</test.vcloud.api-version>
     <test.vcloud.identity>FIXME</test.vcloud.identity>
     <test.vcloud.credential>FIXME</test.vcloud.credential>
     <test.vcloud.image-id></test.vcloud.image-id>
@@ -105,7 +105,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.vcloud.endpoint>${test.vcloud.endpoint}</test.vcloud.endpoint>
-                    <test.vcloud.apiversion>${test.vcloud.apiversion}</test.vcloud.apiversion>
+                    <test.vcloud.api-version>${test.vcloud.api-version}</test.vcloud.api-version>
                     <test.vcloud.identity>${test.vcloud.identity}</test.vcloud.identity>
                     <test.vcloud.credential>${test.vcloud.credential}</test.vcloud.credential>
                     <test.vcloud.image-id>${test.vcloud.image-id}</test.vcloud.image-id>

apis/walrus/pom.xml

@@ -36,7 +36,7 @@
   <properties>
     <test.initializer>org.jclouds.walrus.blobstore.WalrusTestInitializer</test.initializer>
     <test.walrus.endpoint>http://ecc.eucalyptus.com:8773/services/Walrus</test.walrus.endpoint>
-    <test.walrus.apiversion>2006-03-01</test.walrus.apiversion>
+    <test.walrus.api-version>2006-03-01</test.walrus.api-version>
     <test.walrus.identity>${test.eucalyptus.identity}</test.walrus.identity>
     <test.walrus.credential>${test.eucalyptus.credential}</test.walrus.credential>
   </properties>
@@ -104,7 +104,7 @@
                     <jclouds.blobstore.httpstream.url>${jclouds.blobstore.httpstream.url}</jclouds.blobstore.httpstream.url>
                     <jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5>
                     <test.walrus.endpoint>${test.walrus.endpoint}</test.walrus.endpoint>
-                    <test.walrus.apiversion>${test.walrus.apiversion}</test.walrus.apiversion>
+                    <test.walrus.api-version>${test.walrus.api-version}</test.walrus.api-version>
                     <test.walrus.identity>${test.walrus.identity}</test.walrus.identity>
                     <test.walrus.credential>${test.walrus.credential}</test.walrus.credential>
                   </systemPropertyVariables>

archetypes/rest-client-archetype/src/main/resources/archetype-resources/pom.xml

@@ -58,7 +58,7 @@ $symbol_dollar = '$' )
     <properties>
         <test.${lcaseProviderName}.identity>${providerIdentity}</test.${lcaseProviderName}.identity>
         <test.${lcaseProviderName}.credential>${providerCredential}</test.${lcaseProviderName}.credential>
-        <test.${lcaseProviderName}.apiversion>${providerApiVersion}</test.${lcaseProviderName}.apiversion>
+        <test.${lcaseProviderName}.api-version>${providerApiVersion}</test.${lcaseProviderName}.api-version>
         <test.${lcaseProviderName}.endpoint>${providerEndpoint}</test.${lcaseProviderName}.endpoint>
     </properties>
     <dependencies>
@@ -107,7 +107,7 @@ $symbol_dollar = '$' )
                                         <test.${lcaseProviderName}.identity>\$\{test.${lcaseProviderName}.identity\}</test.${lcaseProviderName}.identity>
                                         <test.${lcaseProviderName}.credential>\$\{test.${lcaseProviderName}.credential\}</test.${lcaseProviderName}.credential>
                                         <test.${lcaseProviderName}.endpoint>\$\{test.${lcaseProviderName}.endpoint\}</test.${lcaseProviderName}.endpoint>
-                                        <test.${lcaseProviderName}.apiversion>\$\{test.${lcaseProviderName}.apiversion\}</test.${lcaseProviderName}.apiversion>
+                                        <test.${lcaseProviderName}.api-version>\$\{test.${lcaseProviderName}.api-version\}</test.${lcaseProviderName}.api-version>
                                     </systemPropertyVariables>
                                 </configuration>
                             </execution>

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" })

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();
    }
 
 
-}
+}

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         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;
-}
+}

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 = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
-               + ".apiversion");
+               + ".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;
    }
 

compute/src/test/java/org/jclouds/compute/BaseVersionedServiceLiveTest.java

@@ -43,7 +43,7 @@ public abstract class BaseVersionedServiceLiveTest {
    protected String identity;
    protected String credential;
    protected String endpoint;
-   protected String apiversion;
+   protected String apiVersion;
    protected String imageId;
    protected String loginUser;
    protected String authenticateSudo;
@@ -70,8 +70,8 @@ public abstract class BaseVersionedServiceLiveTest {
          overrides.setProperty(provider + ".credential", credential);
       if (endpoint != null)
          overrides.setProperty(provider + ".endpoint", endpoint);
-      if (apiversion != null)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       if (imageId != null)
          overrides.setProperty(provider + ".image-id", imageId);
       if (loginUser != null)
@@ -87,7 +87,7 @@ public abstract class BaseVersionedServiceLiveTest {
       identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
       credential = System.getProperty("test." + provider + ".credential");
       endpoint = System.getProperty("test." + provider + ".endpoint");
-      apiversion = System.getProperty("test." + provider + ".apiversion");
+      apiVersion = System.getProperty("test." + provider + ".api-version");
       imageId = System.getProperty("test." + provider + ".image-id");
       loginUser = System.getProperty("test." + provider + ".image.login-user");
       authenticateSudo = System.getProperty("test." + provider + ".image.authenticate-sudo");

core/src/main/java/org/jclouds/rest/RestContextFactory.java

@@ -241,7 +241,7 @@ public class RestContextFactory {
       Properties props = new Properties();
 
       props.setProperty(contextSpec.provider + ".endpoint", contextSpec.endpoint);
-      props.setProperty(contextSpec.provider + ".apiversion", contextSpec.apiVersion);
+      props.setProperty(contextSpec.provider + ".api-version", contextSpec.apiVersion);
       props.setProperty(contextSpec.provider + "." + LocationConstants.ISO3166_CODES, contextSpec.iso3166Codes);
       props.setProperty(contextSpec.provider + ".identity", contextSpec.identity);
       if (contextSpec.credential != null)
@@ -289,7 +289,7 @@ public class RestContextFactory {
 
       String endpoint = props.getProperty(providerName + "." + LocationConstants.ENDPOINT, null);
       String iso3166Codes = props.getProperty(providerName + "." + LocationConstants.ISO3166_CODES, null);
-      String apiVersion = props.getProperty(providerName + ".apiversion", null);
+      String apiVersion = props.getProperty(providerName + ".api-version", null);
       identity = props.getProperty(providerName + ".identity", props.getProperty("jclouds.identity", identity));
       credential = loadCredentialOrDefault(props, providerName + ".credential",
             loadCredentialOrDefault(props, "jclouds.credential", credential));

core/src/main/resources/rest.properties

@@ -4,7 +4,7 @@ byon.propertiesbuilder=org.jclouds.byon.BYONPropertiesBuilder
 azurequeue.contextbuilder=org.jclouds.azure.storage.AzureStorageContextBuilder
 azurequeue.sync=org.jclouds.azurequeue.AzureQueueClient
 azurequeue.async=org.jclouds.azurequeue.AzureQueueAsyncClient
-azurequeue.apiversion=2009-09-19
+azurequeue.api-version=2009-09-19
 azurequeue.propertiesbuilder=org.jclouds.azure.storage.AzureStoragePropertiesBuilder
 azurequeue.endpoint=https://{identity}.queue.core.windows.net
 
@@ -100,7 +100,7 @@ deltacloud.contextbuilder=org.jclouds.deltacloud.DeltacloudContextBuilder
 
 elasticstack.propertiesbuilder=org.jclouds.elasticstack.ElasticStackPropertiesBuilder
 elasticstack.contextbuilder=org.jclouds.elasticstack.ElasticStackContextBuilder
-elasticstack.apiversion=1.0
+elasticstack.api-version=1.0
 
 elastichosts-lon-p.propertiesbuilder=org.jclouds.elastichosts.ElasticHostsPeer1LondonPropertiesBuilder
 elastichosts-lon-p.contextbuilder=org.jclouds.elasticstack.ElasticStackContextBuilder
@@ -153,7 +153,7 @@ stub.contextbuilder=org.jclouds.compute.stub.StubComputeServiceContextBuilder
 
 atmos.contextbuilder=org.jclouds.atmos.AtmosContextBuilder
 atmos.endpoint=https://accesspoint.atmosonline.com
-atmos.apiversion=1.3.0
+atmos.api-version=1.3.0
 
 synaptic-storage.contextbuilder=org.jclouds.atmos.AtmosContextBuilder
 synaptic-storage.propertiesbuilder=org.jclouds.synaptic.storage.SynapticStoragePropertiesBuilder

core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java

@@ -66,7 +66,7 @@ public class RestContextFactoryTest {
 
       Properties props = RestContextFactory.toProperties(contextSpec);
       assertEquals(props.getProperty("test.endpoint"), "http://localhost");
-      assertEquals(props.getProperty("test.apiversion"), "1");
+      assertEquals(props.getProperty("test.api-version"), "1");
       assertEquals(props.getProperty("test.identity"), "dummy");
       assertEquals(props.getProperty("test.iso3166-codes"), "US-CA");
       assertEquals(props.getProperty("test.credential"), null);
@@ -86,7 +86,7 @@ public class RestContextFactoryTest {
 
       Properties props = RestContextFactory.toProperties(contextSpec);
       assertEquals(props.getProperty("test.endpoint"), "http://localhost");
-      assertEquals(props.getProperty("test.apiversion"), "1");
+      assertEquals(props.getProperty("test.api-version"), "1");
       assertEquals(props.getProperty("test.identity"), "dummy");
       assertEquals(props.getProperty("test.credential"), "credential");
       assertEquals(props.getProperty("test.sync"), IntegrationTestClient.class.getName());
@@ -107,7 +107,7 @@ public class RestContextFactoryTest {
 
       Properties props = RestContextFactory.toProperties(contextSpec);
       assertEquals(props.getProperty("test.endpoint"), "http://localhost");
-      assertEquals(props.getProperty("test.apiversion"), "1");
+      assertEquals(props.getProperty("test.api-version"), "1");
       assertEquals(props.getProperty("test.identity"), "dummy");
       assertEquals(props.getProperty("test.credential"), null);
       assertEquals(props.getProperty("test.sync"), null);
@@ -128,7 +128,7 @@ public class RestContextFactoryTest {
 
       Properties props = RestContextFactory.toProperties(contextSpec);
       assertEquals(props.getProperty("test.endpoint"), "http://localhost");
-      assertEquals(props.getProperty("test.apiversion"), "1");
+      assertEquals(props.getProperty("test.api-version"), "1");
       assertEquals(props.getProperty("test.identity"), "dummy");
       assertEquals(props.getProperty("test.credential"), null);
       assertEquals(props.getProperty("test.sync"), null);
@@ -149,7 +149,7 @@ public class RestContextFactoryTest {
 
       Properties props = RestContextFactory.toProperties(contextSpec);
       assertEquals(props.getProperty("test.endpoint"), "http://localhost");
-      assertEquals(props.getProperty("test.apiversion"), "1");
+      assertEquals(props.getProperty("test.api-version"), "1");
       assertEquals(props.getProperty("test.identity"), "dummy");
       assertEquals(props.getProperty("test.credential"), null);
       assertEquals(props.getProperty("test.sync"), null);
@@ -165,7 +165,7 @@ public class RestContextFactoryTest {
    public void testBuilderPropertiesJCloudsScope() {
       Properties props = new Properties();
       props.setProperty("test.endpoint", "http://localhost");
-      props.setProperty("test.apiversion", "1");
+      props.setProperty("test.api-version", "1");
       props.setProperty("test.iso3166-codes", "US");
       props.setProperty("jclouds.identity", "foo");
       props.setProperty("jclouds.credential", "bar");
@@ -200,7 +200,7 @@ public class RestContextFactoryTest {
       Files.write("bar", file, Charsets.UTF_8);
       Properties props = new Properties();
       props.setProperty("test.endpoint", "http://localhost");
-      props.setProperty("test.apiversion", "1");
+      props.setProperty("test.api-version", "1");
       props.setProperty("test.iso3166-codes", "US");
       props.setProperty("test.identity", "foo");
       props.setProperty("test.credential.file", file.getAbsolutePath());

loadbalancer/src/test/java/org/jclouds/loadbalancer/BaseLoadBalancerServiceLiveTest.java

@@ -85,7 +85,7 @@ public abstract class BaseLoadBalancerServiceLiveTest extends BaseVersionedServi
             + ".compute.identity");
       computeCredential = System.getProperty("test." + provider + ".compute.credential");
       computeEndpoint = System.getProperty("test." + provider + ".compute.endpoint");
-      computeApiversion = System.getProperty("test." + provider + ".compute.apiversion");
+      computeApiversion = System.getProperty("test." + provider + ".compute.api-version");
    }
 
    protected Properties setupComputeProperties() {
@@ -98,7 +98,7 @@ public abstract class BaseLoadBalancerServiceLiveTest extends BaseVersionedServi
       if (computeEndpoint != null)
          overrides.setProperty(computeProvider + ".endpoint", computeEndpoint);
       if (computeApiversion != null)
-         overrides.setProperty(computeProvider + ".apiversion", computeApiversion);
+         overrides.setProperty(computeProvider + ".api-version", computeApiversion);
       return overrides;
    }
 

providers/aws-cloudwatch/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.aws-cloudwatch.endpoint>https://monitoring.us-east-1.amazonaws.com</test.aws-cloudwatch.endpoint>
-        <test.aws-cloudwatch.apiversion>2009-05-15</test.aws-cloudwatch.apiversion>
+        <test.aws-cloudwatch.api-version>2009-05-15</test.aws-cloudwatch.api-version>
         <test.aws-cloudwatch.identity>${test.aws.identity}</test.aws-cloudwatch.identity>
         <test.aws-cloudwatch.credential>${test.aws.credential}</test.aws-cloudwatch.credential>
     </properties>
@@ -87,12 +87,12 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.aws-cloudwatch.endpoint>${test.aws-cloudwatch.endpoint}</test.aws-cloudwatch.endpoint>
-                                        <test.aws-cloudwatch.apiversion>${test.aws-cloudwatch.apiversion}</test.aws-cloudwatch.apiversion>
+                                        <test.aws-cloudwatch.api-version>${test.aws-cloudwatch.api-version}</test.aws-cloudwatch.api-version>
                                         <test.aws-cloudwatch.identity>${test.aws-cloudwatch.identity}</test.aws-cloudwatch.identity>
                                         <test.aws-cloudwatch.credential>${test.aws-cloudwatch.credential}</test.aws-cloudwatch.credential>
                                         <test.aws-cloudwatch.compute.provider>${test.aws-cloudwatch.compute.provider}</test.aws-cloudwatch.compute.provider>
                                         <test.aws-cloudwatch.compute.endpoint>${test.aws-cloudwatch.compute.endpoint}</test.aws-cloudwatch.compute.endpoint>
-                                        <test.aws-cloudwatch.compute.apiversion>${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.api-version>
                                         <test.aws-cloudwatch.compute.identity>${test.aws-cloudwatch.compute.identity}</test.aws-cloudwatch.compute.identity>
                                         <test.aws-cloudwatch.compute.credential>${test.aws-cloudwatch.compute.credential}</test.aws-cloudwatch.compute.credential>
                                     </systemPropertyVariables>

providers/aws-ec2/pom.xml

@@ -35,7 +35,7 @@
 
   <properties>
     <test.aws-ec2.endpoint>https://ec2.us-east-1.amazonaws.com</test.aws-ec2.endpoint>
-    <test.aws-ec2.apiversion>2011-05-15</test.aws-ec2.apiversion>
+    <test.aws-ec2.api-version>2011-05-15</test.aws-ec2.api-version>
     <test.aws-ec2.identity>${test.aws.identity}</test.aws-ec2.identity>
     <test.aws-ec2.credential>${test.aws.credential}</test.aws-ec2.credential>
     <test.aws-ec2.image-id></test.aws-ec2.image-id>
@@ -113,7 +113,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.aws-ec2.endpoint>${test.aws-ec2.endpoint}</test.aws-ec2.endpoint>
-                    <test.aws-ec2.apiversion>${test.aws-ec2.apiversion}</test.aws-ec2.apiversion>
+                    <test.aws-ec2.api-version>${test.aws-ec2.api-version}</test.aws-ec2.api-version>
                     <test.aws-ec2.identity>${test.aws-ec2.identity}</test.aws-ec2.identity>
                     <test.aws-ec2.credential>${test.aws-ec2.credential}</test.aws-ec2.credential>
                     <test.aws-ec2.image-id>${test.aws-ec2.image-id}</test.aws-ec2.image-id>

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

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 = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
-               + ".apiversion");
+               + ".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;
    }
 

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

providers/aws-s3/pom.xml

@@ -36,7 +36,7 @@
     <properties>
         <test.initializer>org.jclouds.aws.s3.blobstore.integration.AWSS3TestInitializer</test.initializer>
         <test.aws-s3.endpoint>https://s3.amazonaws.com</test.aws-s3.endpoint>
-        <test.aws-s3.apiversion>2006-03-01</test.aws-s3.apiversion>
+        <test.aws-s3.api-version>2006-03-01</test.aws-s3.api-version>
         <test.aws-s3.identity>${test.aws.identity}</test.aws-s3.identity>
         <test.aws-s3.credential>${test.aws.credential}</test.aws-s3.credential>
         <test.blobstore.container-count>25</test.blobstore.container-count>
@@ -123,7 +123,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.aws-s3.endpoint>${test.aws-s3.endpoint}</test.aws-s3.endpoint>
-                                        <test.aws-s3.apiversion>${test.aws-s3.apiversion}</test.aws-s3.apiversion>
+                                        <test.aws-s3.api-version>${test.aws-s3.api-version}</test.aws-s3.api-version>
                                         <test.aws-s3.identity>${test.aws-s3.identity}</test.aws-s3.identity>
                                         <test.aws-s3.credential>${test.aws-s3.credential}</test.aws-s3.credential>
                                         <test.initializer>${test.initializer}</test.initializer>

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));
    }
 

providers/azureblob/pom.xml

@@ -36,7 +36,7 @@
     <properties>
         <test.initializer>org.jclouds.azureblob.blobstore.integration.AzureBlobTestInitializer</test.initializer>
         <test.azureblob.endpoint>https://{identity}.blob.core.windows.net</test.azureblob.endpoint>
-        <test.azureblob.apiversion>2009-09-19</test.azureblob.apiversion>
+        <test.azureblob.api-version>2009-09-19</test.azureblob.api-version>
         <test.azureblob.identity>${test.azure.identity}</test.azureblob.identity>
         <test.azureblob.credential>${test.azure.credential}</test.azureblob.credential>
     </properties>
@@ -94,7 +94,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.azureblob.endpoint>${test.azureblob.endpoint}</test.azureblob.endpoint>
-                                        <test.azureblob.apiversion>${test.azureblob.apiversion}</test.azureblob.apiversion>
+                                        <test.azureblob.api-version>${test.azureblob.api-version}</test.azureblob.api-version>
                                         <test.azureblob.identity>${test.azureblob.identity}</test.azureblob.identity>
                                         <test.azureblob.credential>${test.azureblob.credential}</test.azureblob.credential>
                                         <test.initializer>${test.initializer}</test.initializer>

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

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));
    }
 
 }

providers/bluelock-vcloud-zone01/pom.xml

@@ -35,7 +35,7 @@
 
   <properties>
     <test.bluelock-vcloud-zone01.endpoint>https://zone01.bluelock.com/api</test.bluelock-vcloud-zone01.endpoint>
-    <test.bluelock-vcloud-zone01.apiversion>1.0</test.bluelock-vcloud-zone01.apiversion>
+    <test.bluelock-vcloud-zone01.api-version>1.0</test.bluelock-vcloud-zone01.api-version>
     <test.bluelock-vcloud-zone01.identity>FIXME_IDENTITY</test.bluelock-vcloud-zone01.identity>
     <test.bluelock-vcloud-zone01.credential>FIXME_CREDENTIAL</test.bluelock-vcloud-zone01.credential>
     <test.bluelock-vcloud-zone01.image-id></test.bluelock-vcloud-zone01.image-id>
@@ -102,7 +102,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.bluelock-vcloud-zone01.endpoint>${test.bluelock-vcloud-zone01.endpoint}</test.bluelock-vcloud-zone01.endpoint>
-                    <test.bluelock-vcloud-zone01.apiversion>${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.api-version>
                     <test.bluelock-vcloud-zone01.identity>${test.bluelock-vcloud-zone01.identity}</test.bluelock-vcloud-zone01.identity>
                     <test.bluelock-vcloud-zone01.credential>${test.bluelock-vcloud-zone01.credential}</test.bluelock-vcloud-zone01.credential>
                     <test.bluelock-vcloud-zone01.image-id>${test.bluelock-vcloud-zone01.image-id}</test.bluelock-vcloud-zone01.image-id>

providers/cloudfiles-uk/pom.xml

@@ -36,7 +36,7 @@
     <properties>
         <test.initializer>org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUKTestInitializer</test.initializer>
         <test.cloudfiles-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudfiles-uk.endpoint>
-        <test.cloudfiles-uk.apiversion>1.0</test.cloudfiles-uk.apiversion>
+        <test.cloudfiles-uk.api-version>1.0</test.cloudfiles-uk.api-version>
         <test.cloudfiles-uk.identity>${test.rackspace-uk.identity}</test.cloudfiles-uk.identity>
         <test.cloudfiles-uk.credential>${test.rackspace-uk.credential}</test.cloudfiles-uk.credential>
     </properties>
@@ -109,7 +109,7 @@
                                     <threadCount>1</threadCount>
                                     <systemPropertyVariables>
                                         <test.cloudfiles-uk.endpoint>${test.cloudfiles-uk.endpoint}</test.cloudfiles-uk.endpoint>
-                                        <test.cloudfiles-uk.apiversion>${test.cloudfiles-uk.apiversion}</test.cloudfiles-uk.apiversion>
+                                        <test.cloudfiles-uk.api-version>${test.cloudfiles-uk.api-version}</test.cloudfiles-uk.api-version>
                                         <test.cloudfiles-uk.identity>${test.cloudfiles-uk.identity}</test.cloudfiles-uk.identity>
                                         <test.cloudfiles-uk.credential>${test.cloudfiles-uk.credential}</test.cloudfiles-uk.credential>
                                         <test.initializer>${test.initializer}</test.initializer>

providers/cloudfiles-us/pom.xml

@@ -36,7 +36,7 @@
     <properties>
         <test.initializer>org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUSTestInitializer</test.initializer>
         <test.cloudfiles-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudfiles-us.endpoint>
-        <test.cloudfiles-us.apiversion>1.0</test.cloudfiles-us.apiversion>
+        <test.cloudfiles-us.api-version>1.0</test.cloudfiles-us.api-version>
         <test.cloudfiles-us.identity>${test.rackspace-us.identity}</test.cloudfiles-us.identity>
         <test.cloudfiles-us.credential>${test.rackspace-us.credential}</test.cloudfiles-us.credential>
     </properties>
@@ -109,7 +109,7 @@
                                     <threadCount>1</threadCount>
                                     <systemPropertyVariables>
                                         <test.cloudfiles-us.endpoint>${test.cloudfiles-us.endpoint}</test.cloudfiles-us.endpoint>
-                                        <test.cloudfiles-us.apiversion>${test.cloudfiles-us.apiversion}</test.cloudfiles-us.apiversion>
+                                        <test.cloudfiles-us.api-version>${test.cloudfiles-us.api-version}</test.cloudfiles-us.api-version>
                                         <test.cloudfiles-us.identity>${test.cloudfiles-us.identity}</test.cloudfiles-us.identity>
                                         <test.cloudfiles-us.credential>${test.cloudfiles-us.credential}</test.cloudfiles-us.credential>
                                         <test.initializer>${test.initializer}</test.initializer>

providers/cloudloadbalancers-uk/pom.xml

@@ -35,7 +35,7 @@
     
     <properties>
         <test.cloudloadbalancers-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudloadbalancers-uk.endpoint>
-        <test.cloudloadbalancers-uk.apiversion>1.0</test.cloudloadbalancers-uk.apiversion>
+        <test.cloudloadbalancers-uk.api-version>1.0</test.cloudloadbalancers-uk.api-version>
         <test.cloudloadbalancers-uk.identity>${test.rackspace-uk.identity}</test.cloudloadbalancers-uk.identity>
         <test.cloudloadbalancers-uk.credential>${test.rackspace-uk.credential}</test.cloudloadbalancers-uk.credential>
     </properties>
@@ -109,7 +109,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.cloudloadbalancers-uk.endpoint>${test.cloudloadbalancers-uk.endpoint}</test.cloudloadbalancers-uk.endpoint>
-                                        <test.cloudloadbalancers-uk.apiversion>${test.cloudloadbalancers-uk.apiversion}</test.cloudloadbalancers-uk.apiversion>
+                                        <test.cloudloadbalancers-uk.api-version>${test.cloudloadbalancers-uk.api-version}</test.cloudloadbalancers-uk.api-version>
                                         <test.cloudloadbalancers-uk.identity>${test.cloudloadbalancers-uk.identity}</test.cloudloadbalancers-uk.identity>
                                         <test.cloudloadbalancers-uk.credential>${test.cloudloadbalancers-uk.credential}</test.cloudloadbalancers-uk.credential>
                                     </systemPropertyVariables>

providers/cloudloadbalancers-us/pom.xml

@@ -35,7 +35,7 @@
     
     <properties>
         <test.cloudloadbalancers-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudloadbalancers-us.endpoint>
-        <test.cloudloadbalancers-us.apiversion>1.0</test.cloudloadbalancers-us.apiversion>
+        <test.cloudloadbalancers-us.api-version>1.0</test.cloudloadbalancers-us.api-version>
         <test.cloudloadbalancers-us.identity>${test.rackspace-us.identity}</test.cloudloadbalancers-us.identity>
         <test.cloudloadbalancers-us.credential>${test.rackspace-us.credential}</test.cloudloadbalancers-us.credential>
     </properties>
@@ -109,7 +109,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.cloudloadbalancers-us.endpoint>${test.cloudloadbalancers-us.endpoint}</test.cloudloadbalancers-us.endpoint>
-                                        <test.cloudloadbalancers-us.apiversion>${test.cloudloadbalancers-us.apiversion}</test.cloudloadbalancers-us.apiversion>
+                                        <test.cloudloadbalancers-us.api-version>${test.cloudloadbalancers-us.api-version}</test.cloudloadbalancers-us.api-version>
                                         <test.cloudloadbalancers-us.identity>${test.cloudloadbalancers-us.identity}</test.cloudloadbalancers-us.identity>
                                         <test.cloudloadbalancers-us.credential>${test.cloudloadbalancers-us.credential}</test.cloudloadbalancers-us.credential>
                                     </systemPropertyVariables>

providers/cloudonestorage/pom.xml

@@ -36,7 +36,7 @@
     <properties>
         <test.initializer>org.jclouds.cloudonestorage.blobstore.integration.CloudOneStorageTestInitializer</test.initializer>
         <test.cloudonestorage.endpoint>https://cloudonestorage.peer1.com</test.cloudonestorage.endpoint>
-        <test.cloudonestorage.apiversion>1.3.0</test.cloudonestorage.apiversion>
+        <test.cloudonestorage.api-version>1.3.0</test.cloudonestorage.api-version>
         <test.cloudonestorage.identity>FIXME_IDENTITY</test.cloudonestorage.identity>
         <test.cloudonestorage.credential>FIXME_CREDENTIAL</test.cloudonestorage.credential>
     </properties>
@@ -102,7 +102,7 @@
                                     <threadCount>1</threadCount>
                                     <systemPropertyVariables>
                                         <test.cloudonestorage.endpoint>${test.cloudonestorage.endpoint}</test.cloudonestorage.endpoint>
-                                        <test.cloudonestorage.apiversion>${test.cloudonestorage.apiversion}</test.cloudonestorage.apiversion>
+                                        <test.cloudonestorage.api-version>${test.cloudonestorage.api-version}</test.cloudonestorage.api-version>
                                         <test.cloudonestorage.identity>${test.cloudonestorage.identity}</test.cloudonestorage.identity>
                                         <test.cloudonestorage.credential>${test.cloudonestorage.credential}</test.cloudonestorage.credential>
                                         <test.initializer>${test.initializer}</test.initializer>

providers/cloudservers-uk/pom.xml

@@ -35,7 +35,7 @@
 
   <properties>
     <test.cloudservers-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudservers-uk.endpoint>
-    <test.cloudservers-uk.apiversion>1.0</test.cloudservers-uk.apiversion>
+    <test.cloudservers-uk.api-version>1.0</test.cloudservers-uk.api-version>
     <test.cloudservers-uk.identity>${test.rackspace-uk.identity}</test.cloudservers-uk.identity>
     <test.cloudservers-uk.credential>${test.rackspace-uk.credential}</test.cloudservers-uk.credential>
     <test.cloudservers-uk.image-id></test.cloudservers-uk.image-id>
@@ -107,7 +107,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.cloudservers-uk.endpoint>${test.cloudservers-uk.endpoint}</test.cloudservers-uk.endpoint>
-                    <test.cloudservers-uk.apiversion>${test.cloudservers-uk.apiversion}</test.cloudservers-uk.apiversion>
+                    <test.cloudservers-uk.api-version>${test.cloudservers-uk.api-version}</test.cloudservers-uk.api-version>
                     <test.cloudservers-uk.identity>${test.cloudservers-uk.identity}</test.cloudservers-uk.identity>
                     <test.cloudservers-uk.credential>${test.cloudservers-uk.credential}</test.cloudservers-uk.credential>
                     <test.cloudservers-uk.image-id>${test.cloudservers-uk.image-id}</test.cloudservers-uk.image-id>

providers/cloudservers-us/pom.xml

@@ -35,7 +35,7 @@
 
   <properties>
     <test.cloudservers-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudservers-us.endpoint>
-    <test.cloudservers-us.apiversion>1.0</test.cloudservers-us.apiversion>
+    <test.cloudservers-us.api-version>1.0</test.cloudservers-us.api-version>
     <test.cloudservers-us.identity>${test.rackspace-us.identity}</test.cloudservers-us.identity>
     <test.cloudservers-us.credential>${test.rackspace-us.credential}</test.cloudservers-us.credential>
     <test.cloudservers-us.image-id></test.cloudservers-us.image-id>
@@ -108,7 +108,7 @@
                   <threadCount>1</threadCount>
                   <systemPropertyVariables>
                     <test.cloudservers-us.endpoint>${test.cloudservers-us.endpoint}</test.cloudservers-us.endpoint>
-                    <test.cloudservers-us.apiversion>${test.cloudservers-us.apiversion}</test.cloudservers-us.apiversion>
+                    <test.cloudservers-us.api-version>${test.cloudservers-us.api-version}</test.cloudservers-us.api-version>
                     <test.cloudservers-us.identity>${test.cloudservers-us.identity}</test.cloudservers-us.identity>
                     <test.cloudservers-us.credential>${test.cloudservers-us.credential}</test.cloudservers-us.credential>
                     <test.cloudservers-us.image-id>${test.cloudservers-us.image-id}</test.cloudservers-us.image-id>

providers/cloudsigma-lvs/pom.xml

@@ -35,7 +35,7 @@
 
   <properties>
     <test.cloudsigma-lvs.endpoint>https://api.lvs.cloudsigma.com</test.cloudsigma-lvs.endpoint>
-    <test.cloudsigma-lvs.apiversion>1.0</test.cloudsigma-lvs.apiversion>
+    <test.cloudsigma-lvs.api-version>1.0</test.cloudsigma-lvs.api-version>
     <test.cloudsigma-lvs.identity>FIXME</test.cloudsigma-lvs.identity>
     <test.cloudsigma-lvs.credential>FIXME</test.cloudsigma-lvs.credential>
     <test.cloudsigma-lvs.image-id></test.cloudsigma-lvs.image-id>
@@ -102,7 +102,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.cloudsigma-lvs.endpoint>${test.cloudsigma-lvs.endpoint}</test.cloudsigma-lvs.endpoint>
-                    <test.cloudsigma-lvs.apiversion>${test.cloudsigma-lvs.apiversion}</test.cloudsigma-lvs.apiversion>
+                    <test.cloudsigma-lvs.api-version>${test.cloudsigma-lvs.api-version}</test.cloudsigma-lvs.api-version>
                     <test.cloudsigma-lvs.identity>${test.cloudsigma-lvs.identity}</test.cloudsigma-lvs.identity>
                     <test.cloudsigma-lvs.credential>${test.cloudsigma-lvs.credential}</test.cloudsigma-lvs.credential>
                     <test.cloudsigma-lvs.image-id>${test.cloudsigma-lvs.image-id}</test.cloudsigma-lvs.image-id>

providers/cloudsigma-zrh/pom.xml

@@ -35,7 +35,7 @@
 
   <properties>
     <test.cloudsigma-zrh.endpoint>https://api.zrh.cloudsigma.com</test.cloudsigma-zrh.endpoint>
-    <test.cloudsigma-zrh.apiversion>1.0</test.cloudsigma-zrh.apiversion>
+    <test.cloudsigma-zrh.api-version>1.0</test.cloudsigma-zrh.api-version>
     <test.cloudsigma-zrh.identity>FIXME</test.cloudsigma-zrh.identity>
     <test.cloudsigma-zrh.credential>FIXME</test.cloudsigma-zrh.credential>
     <test.cloudsigma-zrh.image-id></test.cloudsigma-zrh.image-id>
@@ -102,7 +102,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.cloudsigma-zrh.endpoint>${test.cloudsigma-zrh.endpoint}</test.cloudsigma-zrh.endpoint>
-                    <test.cloudsigma-zrh.apiversion>${test.cloudsigma-zrh.apiversion}</test.cloudsigma-zrh.apiversion>
+                    <test.cloudsigma-zrh.api-version>${test.cloudsigma-zrh.api-version}</test.cloudsigma-zrh.api-version>
                     <test.cloudsigma-zrh.identity>${test.cloudsigma-zrh.identity}</test.cloudsigma-zrh.identity>
                     <test.cloudsigma-zrh.credential>${test.cloudsigma-zrh.credential}</test.cloudsigma-zrh.credential>
                     <test.cloudsigma-zrh.image-id>${test.cloudsigma-zrh.image-id}</test.cloudsigma-zrh.image-id>

providers/elastichosts-lax-p/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.elastichosts-lax-p.endpoint>https://api.lax-p.elastichosts.com</test.elastichosts-lax-p.endpoint>
-        <test.elastichosts-lax-p.apiversion>2.0</test.elastichosts-lax-p.apiversion>
+        <test.elastichosts-lax-p.api-version>2.0</test.elastichosts-lax-p.api-version>
         <test.elastichosts-lax-p.identity>FIXME_IDENTITY</test.elastichosts-lax-p.identity>
         <test.elastichosts-lax-p.credential>FIXME_CREDENTIAL</test.elastichosts-lax-p.credential>
         <test.elastichosts-lax-p.image-id></test.elastichosts-lax-p.image-id>
@@ -100,7 +100,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.elastichosts-lax-p.endpoint>${test.elastichosts-lax-p.endpoint}</test.elastichosts-lax-p.endpoint>
-                                        <test.elastichosts-lax-p.apiversion>${test.elastichosts-lax-p.apiversion}</test.elastichosts-lax-p.apiversion>
+                                        <test.elastichosts-lax-p.api-version>${test.elastichosts-lax-p.api-version}</test.elastichosts-lax-p.api-version>
                                         <test.elastichosts-lax-p.identity>${test.elastichosts-lax-p.identity}</test.elastichosts-lax-p.identity>
                                         <test.elastichosts-lax-p.credential>${test.elastichosts-lax-p.credential}</test.elastichosts-lax-p.credential>
                                         <test.elastichosts-lax-p.image-id>${test.elastichosts-lax-p.image-id}</test.elastichosts-lax-p.image-id>

providers/elastichosts-lon-b/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.elastichosts-lon-b.endpoint>https://api.lon-b.elastichosts.com</test.elastichosts-lon-b.endpoint>
-        <test.elastichosts-lon-b.apiversion>2.0</test.elastichosts-lon-b.apiversion>
+        <test.elastichosts-lon-b.api-version>2.0</test.elastichosts-lon-b.api-version>
         <test.elastichosts-lon-b.identity>FIXME_IDENTITY</test.elastichosts-lon-b.identity>
         <test.elastichosts-lon-b.credential>FIXME_CREDENTIAL</test.elastichosts-lon-b.credential>
         <test.elastichosts-lon-b.image-id></test.elastichosts-lon-b.image-id>
@@ -100,7 +100,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.elastichosts-lon-b.endpoint>${test.elastichosts-lon-b.endpoint}</test.elastichosts-lon-b.endpoint>
-                                        <test.elastichosts-lon-b.apiversion>${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.api-version>
                                         <test.elastichosts-lon-b.identity>${test.elastichosts-lon-b.identity}</test.elastichosts-lon-b.identity>
                                         <test.elastichosts-lon-b.credential>${test.elastichosts-lon-b.credential}</test.elastichosts-lon-b.credential>
                                         <test.elastichosts-lon-b.image-id>${test.elastichosts-lon-b.image-id}</test.elastichosts-lon-b.image-id>

providers/elastichosts-lon-p/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.elastichosts-lon-p.endpoint>https://api.lon-p.elastichosts.com</test.elastichosts-lon-p.endpoint>
-        <test.elastichosts-lon-p.apiversion>2.0</test.elastichosts-lon-p.apiversion>
+        <test.elastichosts-lon-p.api-version>2.0</test.elastichosts-lon-p.api-version>
         <test.elastichosts-lon-p.identity>FIXME_IDENTITY</test.elastichosts-lon-p.identity>
         <test.elastichosts-lon-p.credential>FIXME_CREDENTIAL</test.elastichosts-lon-p.credential>
         <test.elastichosts-lon-p.image-id></test.elastichosts-lon-p.image-id>
@@ -100,7 +100,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.elastichosts-lon-p.endpoint>${test.elastichosts-lon-p.endpoint}</test.elastichosts-lon-p.endpoint>
-                                        <test.elastichosts-lon-p.apiversion>${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.api-version>
                                         <test.elastichosts-lon-p.identity>${test.elastichosts-lon-p.identity}</test.elastichosts-lon-p.identity>
                                         <test.elastichosts-lon-p.credential>${test.elastichosts-lon-p.credential}</test.elastichosts-lon-p.credential>
                                         <test.elastichosts-lon-p.image-id>${test.elastichosts-lon-p.image-id}</test.elastichosts-lon-p.image-id>

providers/elastichosts-sat-p/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.elastichosts-sat-p.endpoint>https://api.sat-p.elastichosts.com</test.elastichosts-sat-p.endpoint>
-        <test.elastichosts-sat-p.apiversion>2.0</test.elastichosts-sat-p.apiversion>
+        <test.elastichosts-sat-p.api-version>2.0</test.elastichosts-sat-p.api-version>
         <test.elastichosts-sat-p.identity>FIXME_IDENTITY</test.elastichosts-sat-p.identity>
         <test.elastichosts-sat-p.credential>FIXME_CREDENTIAL</test.elastichosts-sat-p.credential>
         <test.elastichosts-sat-p.image-id></test.elastichosts-sat-p.image-id>
@@ -100,7 +100,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.elastichosts-sat-p.endpoint>${test.elastichosts-sat-p.endpoint}</test.elastichosts-sat-p.endpoint>
-                                        <test.elastichosts-sat-p.apiversion>${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.api-version>
                                         <test.elastichosts-sat-p.identity>${test.elastichosts-sat-p.identity}</test.elastichosts-sat-p.identity>
                                         <test.elastichosts-sat-p.credential>${test.elastichosts-sat-p.credential}</test.elastichosts-sat-p.credential>
                                         <test.elastichosts-sat-p.image-id>${test.elastichosts-sat-p.image-id}</test.elastichosts-sat-p.image-id>

providers/elastichosts-tor-p/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.elastichosts-tor-p.endpoint>https://api.tor-p.elastichosts.com</test.elastichosts-tor-p.endpoint>
-        <test.elastichosts-tor-p.apiversion>2.0</test.elastichosts-tor-p.apiversion>
+        <test.elastichosts-tor-p.api-version>2.0</test.elastichosts-tor-p.api-version>
         <test.elastichosts-tor-p.identity>FIXME_IDENTITY</test.elastichosts-tor-p.identity>
         <test.elastichosts-tor-p.credential>FIXME_CREDENTIAL</test.elastichosts-tor-p.credential>
         <test.elastichosts-tor-p.image-id></test.elastichosts-tor-p.image-id>
@@ -100,7 +100,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.elastichosts-tor-p.endpoint>${test.elastichosts-tor-p.endpoint}</test.elastichosts-tor-p.endpoint>
-                                        <test.elastichosts-tor-p.apiversion>${test.elastichosts-tor-p.apiversion}</test.elastichosts-tor-p.apiversion>
+                                        <test.elastichosts-tor-p.api-version>${test.elastichosts-tor-p.api-version}</test.elastichosts-tor-p.api-version>
                                         <test.elastichosts-tor-p.identity>${test.elastichosts-tor-p.identity}</test.elastichosts-tor-p.identity>
                                         <test.elastichosts-tor-p.credential>${test.elastichosts-tor-p.credential}</test.elastichosts-tor-p.credential>
                                         <test.elastichosts-tor-p.image-id>${test.elastichosts-tor-p.image-id}</test.elastichosts-tor-p.image-id>

providers/eucalyptus-partnercloud-ec2/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.eucalyptus-partnercloud-ec2.endpoint>http://partnercloud.eucalyptus.com:8773/services/Eucalyptus</test.eucalyptus-partnercloud-ec2.endpoint>
-        <test.eucalyptus-partnercloud-ec2.apiversion>2010-06-15</test.eucalyptus-partnercloud-ec2.apiversion>
+        <test.eucalyptus-partnercloud-ec2.api-version>2010-06-15</test.eucalyptus-partnercloud-ec2.api-version>
         <test.eucalyptus-partnercloud-ec2.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-ec2.identity>
         <test.eucalyptus-partnercloud-ec2.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-ec2.credential>
         <test.eucalyptus-partnercloud-ec2.image-id></test.eucalyptus-partnercloud-ec2.image-id>
@@ -115,7 +115,7 @@
                                     <threadCount>1</threadCount>
                                     <systemPropertyVariables>
                                         <test.eucalyptus-partnercloud-ec2.endpoint>${test.eucalyptus-partnercloud-ec2.endpoint}</test.eucalyptus-partnercloud-ec2.endpoint>
-                                        <test.eucalyptus-partnercloud-ec2.apiversion>${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.api-version>
                                         <test.eucalyptus-partnercloud-ec2.identity>${test.eucalyptus-partnercloud-ec2.identity}</test.eucalyptus-partnercloud-ec2.identity>
                                         <test.eucalyptus-partnercloud-ec2.credential>${test.eucalyptus-partnercloud-ec2.credential}</test.eucalyptus-partnercloud-ec2.credential>
                                         <test.eucalyptus-partnercloud-ec2.image-id>${test.eucalyptus-partnercloud-ec2.image-id}</test.eucalyptus-partnercloud-ec2.image-id>

providers/eucalyptus-partnercloud-s3/pom.xml

@@ -36,7 +36,7 @@
     <properties>
         <test.initializer>org.jclouds.epc.blobstore.EucalyptusPartnerCloudWalrusTestInitializer</test.initializer>
         <test.eucalyptus-partnercloud-s3.endpoint>http://partnercloud.eucalyptus.com:8773/services/Walrus</test.eucalyptus-partnercloud-s3.endpoint>
-        <test.eucalyptus-partnercloud-s3.apiversion>2006-03-01</test.eucalyptus-partnercloud-s3.apiversion>
+        <test.eucalyptus-partnercloud-s3.api-version>2006-03-01</test.eucalyptus-partnercloud-s3.api-version>
         <test.eucalyptus-partnercloud-s3.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-s3.identity>
         <test.eucalyptus-partnercloud-s3.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-s3.credential>
         <test.blobstore.container-count>15</test.blobstore.container-count>
@@ -110,7 +110,7 @@
                                     <threadCount>1</threadCount>
                                     <systemPropertyVariables>
                                         <test.eucalyptus-partnercloud-s3.endpoint>${test.eucalyptus-partnercloud-s3.endpoint}</test.eucalyptus-partnercloud-s3.endpoint>
-                                        <test.eucalyptus-partnercloud-s3.apiversion>${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.api-version>
                                         <test.eucalyptus-partnercloud-s3.identity>${test.eucalyptus-partnercloud-s3.identity}</test.eucalyptus-partnercloud-s3.identity>
                                         <test.eucalyptus-partnercloud-s3.credential>${test.eucalyptus-partnercloud-s3.credential}</test.eucalyptus-partnercloud-s3.credential>
                                         <test.initializer>${test.initializer}</test.initializer>

providers/go2cloud-jhb1/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.go2cloud-jhb1.endpoint>http://api.jhb1.go2cloud.co.za</test.go2cloud-jhb1.endpoint>
-        <test.go2cloud-jhb1.apiversion>2.0</test.go2cloud-jhb1.apiversion>
+        <test.go2cloud-jhb1.api-version>2.0</test.go2cloud-jhb1.api-version>
         <test.go2cloud-jhb1.identity>FIXME_IDENTITY</test.go2cloud-jhb1.identity>
         <test.go2cloud-jhb1.credential>FIXME_CREDENTIAL</test.go2cloud-jhb1.credential>
         <test.go2cloud-jhb1.image-id></test.go2cloud-jhb1.image-id>
@@ -100,7 +100,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.go2cloud-jhb1.endpoint>${test.go2cloud-jhb1.endpoint}</test.go2cloud-jhb1.endpoint>
-                                        <test.go2cloud-jhb1.apiversion>${test.go2cloud-jhb1.apiversion}</test.go2cloud-jhb1.apiversion>
+                                        <test.go2cloud-jhb1.api-version>${test.go2cloud-jhb1.api-version}</test.go2cloud-jhb1.api-version>
                                         <test.go2cloud-jhb1.identity>${test.go2cloud-jhb1.identity}</test.go2cloud-jhb1.identity>
                                         <test.go2cloud-jhb1.credential>${test.go2cloud-jhb1.credential}</test.go2cloud-jhb1.credential>
                                         <test.go2cloud-jhb1.image-id>${test.go2cloud-jhb1.image-id}</test.go2cloud-jhb1.image-id>

providers/gogrid/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.gogrid.endpoint>https://api.gogrid.com/api</test.gogrid.endpoint>
-        <test.gogrid.apiversion>1.5</test.gogrid.apiversion>
+        <test.gogrid.api-version>1.5</test.gogrid.api-version>
         <test.gogrid.identity>FIXME</test.gogrid.identity>
         <test.gogrid.credential>FIXME</test.gogrid.credential>
         <test.gogrid.image-id></test.gogrid.image-id>
@@ -93,7 +93,7 @@
                                     <threadCount>1</threadCount>
                                     <systemPropertyVariables>
                                         <test.gogrid.endpoint>${test.gogrid.endpoint}</test.gogrid.endpoint>
-                                        <test.gogrid.apiversion>${test.gogrid.apiversion}</test.gogrid.apiversion>
+                                        <test.gogrid.api-version>${test.gogrid.api-version}</test.gogrid.api-version>
                                         <test.gogrid.identity>${test.gogrid.identity}</test.gogrid.identity>
                                         <test.gogrid.credential>${test.gogrid.credential}</test.gogrid.credential>
                                         <test.gogrid.image-id>${test.gogrid.image-id}</test.gogrid.image-id>

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

providers/greenhousedata-element-vcloud/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.greenhousedata-element-vcloud.endpoint>https://mycloud.greenhousedata.com/api</test.greenhousedata-element-vcloud.endpoint>
-        <test.greenhousedata-element-vcloud.apiversion>1.0</test.greenhousedata-element-vcloud.apiversion>
+        <test.greenhousedata-element-vcloud.api-version>1.0</test.greenhousedata-element-vcloud.api-version>
         <test.greenhousedata-element-vcloud.identity>FIXME_IDENTITY</test.greenhousedata-element-vcloud.identity>
         <test.greenhousedata-element-vcloud.credential>FIXME_CREDENTIAL</test.greenhousedata-element-vcloud.credential>
         <test.greenhousedata-element-vcloud.image-id></test.greenhousedata-element-vcloud.image-id>
@@ -100,7 +100,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.greenhousedata-element-vcloud.endpoint>${test.greenhousedata-element-vcloud.endpoint}</test.greenhousedata-element-vcloud.endpoint>
-                                        <test.greenhousedata-element-vcloud.apiversion>${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.api-version>
                                         <test.greenhousedata-element-vcloud.identity>${test.greenhousedata-element-vcloud.identity}</test.greenhousedata-element-vcloud.identity>
                                         <test.greenhousedata-element-vcloud.credential>${test.greenhousedata-element-vcloud.credential}</test.greenhousedata-element-vcloud.credential>
                                         <test.greenhousedata-element-vcloud.image-id>${test.greenhousedata-element-vcloud.image-id}</test.greenhousedata-element-vcloud.image-id>

providers/hpcloud-objectstorage-lvs/pom.xml

@@ -36,7 +36,7 @@
     <properties>
         <test.initializer>org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration.HPCloudObjectStorageLasVegasTestInitializer</test.initializer>
         <test.hpcloud-objectstorage-lvs.endpoint>https://region-a.geo-1.objects.hpcloudsvc.com/auth</test.hpcloud-objectstorage-lvs.endpoint>
-        <test.hpcloud-objectstorage-lvs.apiversion>1.0</test.hpcloud-objectstorage-lvs.apiversion>
+        <test.hpcloud-objectstorage-lvs.api-version>1.0</test.hpcloud-objectstorage-lvs.api-version>
         <test.hpcloud-objectstorage-lvs.identity>FIXME_IDENTITY</test.hpcloud-objectstorage-lvs.identity>
         <test.hpcloud-objectstorage-lvs.credential>FIXME_CREDENTIAL</test.hpcloud-objectstorage-lvs.credential>        
     </properties>
@@ -111,8 +111,8 @@
                                             <value>${test.hpcloud-objectstorage-lvs.endpoint}</value>
                                         </property>
                                         <property>
-                                            <name>test.hpcloud-objectstorage-lvs.apiversion</name>
+                                            <name>test.hpcloud-objectstorage-lvs.api-version</name>
-                                            <value>${test.hpcloud-objectstorage-lvs.apiversion}</value>
+                                            <value>${test.hpcloud-objectstorage-lvs.api-version}</value>
                                         </property>
                                         <property>
                                             <name>test.hpcloud-objectstorage-lvs.identity</name>

providers/ninefold-compute/pom.xml

@@ -35,7 +35,7 @@
 
   <properties>
     <test.ninefold-compute.endpoint>https://api.ninefold.com/compute/v1.0/</test.ninefold-compute.endpoint>
-    <test.ninefold-compute.apiversion>2.2.12</test.ninefold-compute.apiversion>
+    <test.ninefold-compute.api-version>2.2.12</test.ninefold-compute.api-version>
     <test.ninefold-compute.identity>FIXME_IDENTITY</test.ninefold-compute.identity>
     <test.ninefold-compute.credential>FIXME_CREDENTIAL</test.ninefold-compute.credential>
     <test.ninefold-compute.image-id>1215</test.ninefold-compute.image-id>
@@ -103,7 +103,7 @@
                   <threadCount>1</threadCount>
                   <systemPropertyVariables>
                     <test.ninefold-compute.endpoint>${test.ninefold-compute.endpoint}</test.ninefold-compute.endpoint>
-                    <test.ninefold-compute.apiversion>${test.ninefold-compute.apiversion}</test.ninefold-compute.apiversion>
+                    <test.ninefold-compute.api-version>${test.ninefold-compute.api-version}</test.ninefold-compute.api-version>
                     <test.ninefold-compute.identity>${test.ninefold-compute.identity}</test.ninefold-compute.identity>
                     <test.ninefold-compute.credential>${test.ninefold-compute.credential}</test.ninefold-compute.credential>
                     <test.ninefold-compute.image-id>${test.ninefold-compute.image-id}</test.ninefold-compute.image-id>

providers/ninefold-storage/pom.xml

@@ -36,7 +36,7 @@
     <properties>
         <test.initializer>org.jclouds.ninefold.storage.blobstore.integration.NinefoldStorageTestInitializer</test.initializer>
         <test.ninefold-storage.endpoint>http://onlinestorage.ninefold.com</test.ninefold-storage.endpoint>
-        <test.ninefold-storage.apiversion>1.4.0</test.ninefold-storage.apiversion>
+        <test.ninefold-storage.api-version>1.4.0</test.ninefold-storage.api-version>
         <test.ninefold-storage.identity>FIXME_IDENTITY</test.ninefold-storage.identity>
         <test.ninefold-storage.credential>FIXME_CREDENTIAL</test.ninefold-storage.credential>
     </properties>
@@ -101,7 +101,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.ninefold-storage.endpoint>${test.ninefold-storage.endpoint}</test.ninefold-storage.endpoint>
-                                        <test.ninefold-storage.apiversion>${test.ninefold-storage.apiversion}</test.ninefold-storage.apiversion>
+                                        <test.ninefold-storage.api-version>${test.ninefold-storage.api-version}</test.ninefold-storage.api-version>
                                         <test.ninefold-storage.identity>${test.ninefold-storage.identity}</test.ninefold-storage.identity>
                                         <test.ninefold-storage.credential>${test.ninefold-storage.credential}</test.ninefold-storage.credential>
                                         <test.initializer>${test.initializer}</test.initializer>

providers/openhosting-east1/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.openhosting-east1.endpoint>https://api.east1.openhosting.com</test.openhosting-east1.endpoint>
-        <test.openhosting-east1.apiversion>2.0</test.openhosting-east1.apiversion>
+        <test.openhosting-east1.api-version>2.0</test.openhosting-east1.api-version>
         <test.openhosting-east1.identity>FIXME_IDENTITY</test.openhosting-east1.identity>
         <test.openhosting-east1.credential>FIXME_CREDENTIAL</test.openhosting-east1.credential>
         <test.openhosting-east1.image-id></test.openhosting-east1.image-id>
@@ -100,7 +100,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.openhosting-east1.endpoint>${test.openhosting-east1.endpoint}</test.openhosting-east1.endpoint>
-                                        <test.openhosting-east1.apiversion>${test.openhosting-east1.apiversion}</test.openhosting-east1.apiversion>
+                                        <test.openhosting-east1.api-version>${test.openhosting-east1.api-version}</test.openhosting-east1.api-version>
                                         <test.openhosting-east1.identity>${test.openhosting-east1.identity}</test.openhosting-east1.identity>
                                         <test.openhosting-east1.credential>${test.openhosting-east1.credential}</test.openhosting-east1.credential>
                                         <test.openhosting-east1.image-id>${test.openhosting-east1.image-id}</test.openhosting-east1.image-id>

providers/rimuhosting/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.rimuhosting.endpoint>https://api.rimuhosting.com/r</test.rimuhosting.endpoint>
-        <test.rimuhosting.apiversion>1.0</test.rimuhosting.apiversion>
+        <test.rimuhosting.api-version>1.0</test.rimuhosting.api-version>
         <test.rimuhosting.identity>FIXME</test.rimuhosting.identity>
         <test.rimuhosting.image-id></test.rimuhosting.image-id>
     </properties>
@@ -101,7 +101,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.rimuhosting.endpoint>${test.rimuhosting.endpoint}</test.rimuhosting.endpoint>
-                                        <test.rimuhosting.apiversion>${test.rimuhosting.apiversion}</test.rimuhosting.apiversion>
+                                        <test.rimuhosting.api-version>${test.rimuhosting.api-version}</test.rimuhosting.api-version>
                                         <test.rimuhosting.identity>${test.rimuhosting.identity}</test.rimuhosting.identity>
                                         <test.rimuhosting.image-id>${test.rimuhosting.image-id}</test.rimuhosting.image-id>
                                     </systemPropertyVariables>

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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         overrides.setProperty(provider + ".api-version", apiVersion);
       return overrides;
    }
 

providers/savvis-symphonyvpdc/pom.xml

@@ -49,7 +49,7 @@
     
     <properties>
         <test.savvis-symphonyvpdc.endpoint>https://api.symphonyvpdc.savvis.net/vpdc</test.savvis-symphonyvpdc.endpoint>
-        <test.savvis-symphonyvpdc.apiversion>1.0</test.savvis-symphonyvpdc.apiversion>
+        <test.savvis-symphonyvpdc.api-version>1.0</test.savvis-symphonyvpdc.api-version>
         <test.savvis-symphonyvpdc.identity>FIXME</test.savvis-symphonyvpdc.identity>
         <test.savvis-symphonyvpdc.credential>FIXME</test.savvis-symphonyvpdc.credential>
         <test.savvis-symphonyvpdc.image-id></test.savvis-symphonyvpdc.image-id>
@@ -114,7 +114,7 @@
                                 	<threadCount>1</threadCount>
                                     <systemPropertyVariables>
                                         <test.savvis-symphonyvpdc.endpoint>${test.savvis-symphonyvpdc.endpoint}</test.savvis-symphonyvpdc.endpoint>
-                                        <test.savvis-symphonyvpdc.apiversion>${test.savvis-symphonyvpdc.apiversion}</test.savvis-symphonyvpdc.apiversion>
+                                        <test.savvis-symphonyvpdc.api-version>${test.savvis-symphonyvpdc.api-version}</test.savvis-symphonyvpdc.api-version>
                                         <test.savvis-symphonyvpdc.identity>${test.savvis-symphonyvpdc.identity}</test.savvis-symphonyvpdc.identity>
                                         <test.savvis-symphonyvpdc.credential>${test.savvis-symphonyvpdc.credential}</test.savvis-symphonyvpdc.credential>
                                         <test.savvis-symphonyvpdc.image-id>${test.savvis-symphonyvpdc.image-id}</test.savvis-symphonyvpdc.image-id>

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<String> 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)
+      if (apiVersion != null)
-         overrides.setProperty(provider + ".apiversion", apiversion);
+         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");

providers/serverlove-z1-man/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.serverlove-z1-man.endpoint>https://api.z1-man.serverlove.com</test.serverlove-z1-man.endpoint>
-        <test.serverlove-z1-man.apiversion>1.0</test.serverlove-z1-man.apiversion>
+        <test.serverlove-z1-man.api-version>1.0</test.serverlove-z1-man.api-version>
         <test.serverlove-z1-man.identity>FIXME_IDENTITY</test.serverlove-z1-man.identity>
         <test.serverlove-z1-man.credential>FIXME_CREDENTIAL</test.serverlove-z1-man.credential>
         <test.serverlove-z1-man.image-id></test.serverlove-z1-man.image-id>
@@ -100,7 +100,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.serverlove-z1-man.endpoint>${test.serverlove-z1-man.endpoint}</test.serverlove-z1-man.endpoint>
-                                        <test.serverlove-z1-man.apiversion>${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.api-version>
                                         <test.serverlove-z1-man.identity>${test.serverlove-z1-man.identity}</test.serverlove-z1-man.identity>
                                         <test.serverlove-z1-man.credential>${test.serverlove-z1-man.credential}</test.serverlove-z1-man.credential>
                                         <test.serverlove-z1-man.image-id>${test.serverlove-z1-man.image-id}</test.serverlove-z1-man.image-id>

providers/skalicloud-sdg-my/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.skalicloud-sdg-my.endpoint>https://api.sdg-my.skalicloud.com</test.skalicloud-sdg-my.endpoint>
-        <test.skalicloud-sdg-my.apiversion>1.0</test.skalicloud-sdg-my.apiversion>
+        <test.skalicloud-sdg-my.api-version>1.0</test.skalicloud-sdg-my.api-version>
         <test.skalicloud-sdg-my.identity>FIXME_IDENTITY</test.skalicloud-sdg-my.identity>
         <test.skalicloud-sdg-my.credential>FIXME_CREDENTIAL</test.skalicloud-sdg-my.credential>
         <test.skalicloud-sdg-my.image-id></test.skalicloud-sdg-my.image-id>
@@ -100,7 +100,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.skalicloud-sdg-my.endpoint>${test.skalicloud-sdg-my.endpoint}</test.skalicloud-sdg-my.endpoint>
-                                        <test.skalicloud-sdg-my.apiversion>${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.api-version>
                                         <test.skalicloud-sdg-my.identity>${test.skalicloud-sdg-my.identity}</test.skalicloud-sdg-my.identity>
                                         <test.skalicloud-sdg-my.credential>${test.skalicloud-sdg-my.credential}</test.skalicloud-sdg-my.credential>
                                         <test.skalicloud-sdg-my.image-id>${test.skalicloud-sdg-my.image-id}</test.skalicloud-sdg-my.image-id>

providers/slicehost/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.slicehost.endpoint>https://api.slicehost.com</test.slicehost.endpoint>
-        <test.slicehost.apiversion>1.4.1.1</test.slicehost.apiversion>
+        <test.slicehost.api-version>1.4.1.1</test.slicehost.api-version>
         <test.slicehost.identity>FIXME</test.slicehost.identity>
         <test.slicehost.image-id></test.slicehost.image-id>
     </properties>
@@ -93,7 +93,7 @@
                                     <threadCount>1</threadCount>
                                     <systemPropertyVariables>
                                         <test.slicehost.endpoint>${test.slicehost.endpoint}</test.slicehost.endpoint>
-                                        <test.slicehost.apiversion>${test.slicehost.apiversion}</test.slicehost.apiversion>
+                                        <test.slicehost.api-version>${test.slicehost.api-version}</test.slicehost.api-version>
                                         <test.slicehost.identity>${test.slicehost.identity}</test.slicehost.identity>
                                         <test.slicehost.image-id>${test.slicehost.image-id}</test.slicehost.image-id>
                                     </systemPropertyVariables>

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 = checkNotNull(System.getProperty("test." + provider + ".api-version"), "test." + provider
-            + ".apiversion");
+            + ".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;
    }
 

providers/softlayer/pom.xml

@@ -49,7 +49,7 @@
 
   <properties>
     <test.softlayer.endpoint>https://api.softlayer.com/rest</test.softlayer.endpoint>
-    <test.softlayer.apiversion>3</test.softlayer.apiversion>
+    <test.softlayer.api-version>3</test.softlayer.api-version>
     <test.softlayer.identity>FIXME</test.softlayer.identity>
     <test.softlayer.credential>FIXME</test.softlayer.credential>
     <test.softlayer.image-id></test.softlayer.image-id>
@@ -107,7 +107,7 @@
                 <configuration>
                   <systemPropertyVariables>
                     <test.softlayer.endpoint>${test.softlayer.endpoint}</test.softlayer.endpoint>
-                    <test.softlayer.apiversion>${test.softlayer.apiversion}</test.softlayer.apiversion>
+                    <test.softlayer.api-version>${test.softlayer.api-version}</test.softlayer.api-version>
                     <test.softlayer.identity>${test.softlayer.identity}</test.softlayer.identity>
                     <test.softlayer.credential>${test.softlayer.credential}</test.softlayer.credential>
                     <test.softlayer.image-id>${test.softlayer.image-id}</test.softlayer.image-id>

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 {
       }
    }
 
-}
+}

providers/stratogen-vcloud-mycloud/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <test.stratogen-vcloud-mycloud.endpoint>https://vcd.stratogen.net/api</test.stratogen-vcloud-mycloud.endpoint>
-        <test.stratogen-vcloud-mycloud.apiversion>1.0</test.stratogen-vcloud-mycloud.apiversion>
+        <test.stratogen-vcloud-mycloud.api-version>1.0</test.stratogen-vcloud-mycloud.api-version>
         <test.stratogen-vcloud-mycloud.identity>FIXME_IDENTITY</test.stratogen-vcloud-mycloud.identity>
         <test.stratogen-vcloud-mycloud.credential>FIXME_CREDENTIAL</test.stratogen-vcloud-mycloud.credential>
         <test.stratogen-vcloud-mycloud.image-id></test.stratogen-vcloud-mycloud.image-id>
@@ -100,7 +100,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.stratogen-vcloud-mycloud.endpoint>${test.stratogen-vcloud-mycloud.endpoint}</test.stratogen-vcloud-mycloud.endpoint>
-                                        <test.stratogen-vcloud-mycloud.apiversion>${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.api-version>
                                         <test.stratogen-vcloud-mycloud.identity>${test.stratogen-vcloud-mycloud.identity}</test.stratogen-vcloud-mycloud.identity>
                                         <test.stratogen-vcloud-mycloud.credential>${test.stratogen-vcloud-mycloud.credential}</test.stratogen-vcloud-mycloud.credential>
                                         <test.stratogen-vcloud-mycloud.image-id>${test.stratogen-vcloud-mycloud.image-id}</test.stratogen-vcloud-mycloud.image-id>

providers/synaptic-storage/pom.xml

@@ -36,7 +36,7 @@
     <properties>
         <test.initializer>org.jclouds.synaptic.storage.blobstore.integration.SynapticStorageTestInitializer</test.initializer>
         <test.synaptic-storage.endpoint>https://storage.synaptic.att.com</test.synaptic-storage.endpoint>
-        <test.synaptic-storage.apiversion>1.3.0</test.synaptic-storage.apiversion>
+        <test.synaptic-storage.api-version>1.3.0</test.synaptic-storage.api-version>
         <test.synaptic-storage.identity>FIXME_IDENTITY</test.synaptic-storage.identity>
         <test.synaptic-storage.credential>FIXME_CREDENTIAL</test.synaptic-storage.credential>
     </properties>
@@ -101,7 +101,7 @@
                                 <configuration>
                                     <systemPropertyVariables>
                                         <test.synaptic-storage.endpoint>${test.synaptic-storage.endpoint}</test.synaptic-storage.endpoint>
-                                        <test.synaptic-storage.apiversion>${test.synaptic-storage.apiversion}</test.synaptic-storage.apiversion>
+                                        <test.synaptic-storage.api-version>${test.synaptic-storage.api-version}</test.synaptic-storage.api-version>
                                         <test.synaptic-storage.identity>${test.synaptic-storage.identity}</test.synaptic-storage.identity>
                                         <test.synaptic-storage.credential>${test.synaptic-storage.credential}</test.synaptic-storage.credential>
                                         <test.initializer>${test.initializer}</test.initializer>