diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml index 39b35a7b0d..eab04c365b 100644 --- a/apis/atmos/pom.xml +++ b/apis/atmos/pom.xml @@ -37,6 +37,7 @@ org.jclouds.atmos.blobstore.integration.AtmosStorageTestInitializer https://accesspoint.atmos.com 1.3.0 + FIXME FIXME @@ -96,6 +97,7 @@ ${jclouds.blobstore.httpstream.md5} ${test.atmos.endpoint} ${test.atmos.api-version} + ${test.atmos.build-version} ${test.atmos.identity} ${test.atmos.credential} diff --git a/apis/cloudfiles/pom.xml b/apis/cloudfiles/pom.xml index fb89a2e315..0ab0549aa3 100644 --- a/apis/cloudfiles/pom.xml +++ b/apis/cloudfiles/pom.xml @@ -37,6 +37,7 @@ org.jclouds.cloudfiles.blobstore.integration.CloudFilesTestInitializer https://auth.api.rackspacecloud.com 1.0 + ${test.rackspace.identity} ${test.rackspace.credential} @@ -111,6 +112,7 @@ ${jclouds.blobstore.httpstream.md5} ${test.cloudfiles.endpoint} ${test.cloudfiles.api-version} + ${test.cloudfiles.build-version} ${test.cloudfiles.identity} ${test.cloudfiles.credential} diff --git a/apis/cloudloadbalancers/pom.xml b/apis/cloudloadbalancers/pom.xml index 695cff8f1c..f414c69876 100644 --- a/apis/cloudloadbalancers/pom.xml +++ b/apis/cloudloadbalancers/pom.xml @@ -36,6 +36,7 @@ https://auth.api.rackspacecloud.com 1.0 + ${test.rackspace.identity} ${test.rackspace.credential} @@ -97,6 +98,7 @@ ${test.cloudloadbalancers.endpoint} ${test.cloudloadbalancers.api-version} + ${test.cloudloadbalancers.build-version} ${test.cloudloadbalancers.identity} ${test.cloudloadbalancers.credential} diff --git a/apis/cloudservers/pom.xml b/apis/cloudservers/pom.xml index 9fa8134f41..6342b134f0 100644 --- a/apis/cloudservers/pom.xml +++ b/apis/cloudservers/pom.xml @@ -37,6 +37,7 @@ https://auth.api.rackspacecloud.com 1.0 + ${test.rackspace.identity} ${test.rackspace.credential} @@ -109,6 +110,7 @@ ${test.cloudstack.endpoint} ${test.cloudstack.api-version} + ${test.cloudstack.build-version} ${test.cloudstack.identity} ${test.cloudstack.credential} ${test.cloudstack.image-id} diff --git a/apis/cloudsigma/pom.xml b/apis/cloudsigma/pom.xml index 669d9de61f..c2cc9a243b 100644 --- a/apis/cloudsigma/pom.xml +++ b/apis/cloudsigma/pom.xml @@ -36,9 +36,10 @@ https://api.cloudsigma.com 1.0 + FIXME FIXME - + f3c7c665-cd54-4a78-8fd2-7ec2f028cf29 @@ -95,6 +96,7 @@ ${test.cloudsigma.endpoint} ${test.cloudsigma.api-version} + ${test.cloudsigma.build-version} ${test.cloudsigma.identity} ${test.cloudsigma.credential} ${test.cloudsigma.image-id} diff --git a/apis/cloudstack/pom.xml b/apis/cloudstack/pom.xml index d5dc5d69ce..4c5626a5b0 100644 --- a/apis/cloudstack/pom.xml +++ b/apis/cloudstack/pom.xml @@ -50,6 +50,7 @@ http://localhost:8080/client/api 2.2.12 + FIXME_apiKey FIXME_secretKey @@ -117,6 +118,7 @@ ${test.cloudstack.endpoint} ${test.cloudstack.api-version} + ${test.cloudstack.build-version} ${test.cloudstack.identity} ${test.cloudstack.credential} ${test.cloudstack.image-id} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java index c2d09ef6b1..46c1b86f25 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java @@ -49,7 +49,7 @@ import com.google.inject.Module; public class QuerySignerTest { @SuppressWarnings({ "unchecked", "rawtypes" }) public static final RestContextSpec DUMMY_SPEC = new RestContextSpec("cloudstack", - "http://localhost:8080/client/api", "2.2", "", "apiKey", "secretKey", Map.class, List.class, + "http://localhost:8080/client/api", "2.2", "", "", "apiKey", "secretKey", Map.class, List.class, PropertiesBuilder.class, (Class) RestContextBuilder.class, ImmutableList. of(new MockModule(), new NullLoggingModule(), new AbstractModule() { @Override diff --git a/apis/cloudwatch/pom.xml b/apis/cloudwatch/pom.xml index d3d11f7a1e..559236a7f5 100644 --- a/apis/cloudwatch/pom.xml +++ b/apis/cloudwatch/pom.xml @@ -36,6 +36,7 @@ https://monitoring.us-east-1.amazonaws.com 2009-05-15 + ${test.aws.identity} ${test.aws.credential} @@ -87,6 +88,7 @@ ${test.cloudwatch.endpoint} ${test.cloudwatch.api-version} + ${test.cloudwatch.build-version} ${test.cloudwatch.identity} ${test.cloudwatch.credential} diff --git a/apis/deltacloud/pom.xml b/apis/deltacloud/pom.xml index e959bbb8eb..476c9cec8a 100644 --- a/apis/deltacloud/pom.xml +++ b/apis/deltacloud/pom.xml @@ -50,6 +50,7 @@ http://localhost:3001/api 0.3.0 + mockuser mockpassword @@ -108,6 +109,7 @@ ${test.deltacloud.endpoint} ${test.deltacloud.api-version} + ${test.deltacloud.build-version} ${test.deltacloud.identity} ${test.deltacloud.credential} ${test.deltacloud.image-id} diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml index b109122482..ae171c57e7 100644 --- a/apis/ec2/pom.xml +++ b/apis/ec2/pom.xml @@ -36,6 +36,7 @@ https://ec2.us-east-1.amazonaws.com 2010-06-15 + ${test.aws.identity} ${test.aws.credential} @@ -103,6 +104,7 @@ ${test.ec2.endpoint} ${test.ec2.api-version} + ${test.ec2.build-version} ${test.ec2.identity} ${test.ec2.credential} ${test.ec2.image-id} diff --git a/apis/elasticstack/pom.xml b/apis/elasticstack/pom.xml index e2c3472fa3..c51c5965d2 100644 --- a/apis/elasticstack/pom.xml +++ b/apis/elasticstack/pom.xml @@ -50,9 +50,10 @@ https://api.lon-p.elastichosts.com 1.0 + FIXME FIXME - + 38df0986-4d85-4b76-b502-3878ffc80161 @@ -108,6 +109,7 @@ ${test.elasticstack.endpoint} ${test.elasticstack.api-version} + ${test.elasticstack.build-version} ${test.elasticstack.identity} ${test.elasticstack.credential} ${test.elasticstack.image-id} diff --git a/apis/eucalyptus/pom.xml b/apis/eucalyptus/pom.xml index b23e47e2d0..272ab501ee 100644 --- a/apis/eucalyptus/pom.xml +++ b/apis/eucalyptus/pom.xml @@ -36,6 +36,7 @@ http://ecc.eucalyptus.com:8773/services/Eucalyptus 2010-06-15 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -103,6 +104,7 @@ ${test.eucalyptus.endpoint} ${test.eucalyptus.api-version} + ${test.eucalyptus.build-version} ${test.eucalyptus.identity} ${test.eucalyptus.credential} ${test.eucalyptus.image-id} diff --git a/apis/nova/pom.xml b/apis/nova/pom.xml index 8c4be91288..8699579abb 100644 --- a/apis/nova/pom.xml +++ b/apis/nova/pom.xml @@ -36,6 +36,7 @@ http://localhost:8773/services/Cloud 1.1 + FIXME_IDENTITY FIXME_CREDENTIALS @@ -116,6 +117,7 @@ ${test.nova.endpoint} ${test.nova.api-version} + ${test.nova.build-version} ${test.nova.identity} ${test.nova.credential} ${test.nova.image-id} diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml index 002d13e03e..0dd853328d 100644 --- a/apis/s3/pom.xml +++ b/apis/s3/pom.xml @@ -37,6 +37,7 @@ org.jclouds.s3.blobstore.integration.S3TestInitializer https://s3.amazonaws.com 2006-03-01 + ${test.aws.identity} ${test.aws.credential} @@ -109,6 +110,7 @@ ${jclouds.blobstore.httpstream.md5} ${test.s3.endpoint} ${test.s3.api-version} + ${test.s3.build-version} ${test.s3.identity} ${test.s3.credential} diff --git a/apis/swift/pom.xml b/apis/swift/pom.xml index 9c7fcb2a84..a998434613 100644 --- a/apis/swift/pom.xml +++ b/apis/swift/pom.xml @@ -37,6 +37,7 @@ org.jclouds.openstack.swift.blobstore.integration.SwiftTestInitializer http://localhost:11000 1.0 + test:tester testing @@ -109,6 +110,7 @@ ${jclouds.blobstore.httpstream.md5} ${test.swift.endpoint} ${test.swift.api-version} + ${test.swift.build-version} ${test.swift.identity} ${test.swift.credential} diff --git a/apis/vcloud/pom.xml b/apis/vcloud/pom.xml index 55daeae8fa..32e42bbe2b 100644 --- a/apis/vcloud/pom.xml +++ b/apis/vcloud/pom.xml @@ -36,6 +36,7 @@ FIXME 1.0 + FIXME FIXME @@ -106,6 +107,7 @@ ${test.vcloud.endpoint} ${test.vcloud.api-version} + ${test.vcloud.build-version} ${test.vcloud.identity} ${test.vcloud.credential} ${test.vcloud.image-id} diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudVersionsAsyncClientTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudVersionsAsyncClientTest.java index 5b58c08940..276261c87c 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudVersionsAsyncClientTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudVersionsAsyncClientTest.java @@ -81,7 +81,7 @@ public class VCloudVersionsAsyncClientTest extends RestClientTest createContextSpec() { - return contextSpec("test", "http://localhost:8080", "1", "", "identity", "credential", + return contextSpec("test", "http://localhost:8080", "1", "", "", "identity", "credential", VCloudVersionsClient.class, VCloudVersionsAsyncClient.class); } diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/VCloudLoginAsyncClientTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/VCloudLoginAsyncClientTest.java index 87bb807745..3cec0950eb 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/VCloudLoginAsyncClientTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/VCloudLoginAsyncClientTest.java @@ -107,7 +107,7 @@ public class VCloudLoginAsyncClientTest extends RestClientTest createContextSpec() { - return contextSpec("test", "http://localhost:8080/login", "1", "", "identity", "credential", + return contextSpec("test", "http://localhost:8080/login", "1", "", "", "identity", "credential", VCloudLoginClient.class, VCloudLoginAsyncClient.class); } } diff --git a/apis/walrus/pom.xml b/apis/walrus/pom.xml index 40b10b971a..0febe97041 100644 --- a/apis/walrus/pom.xml +++ b/apis/walrus/pom.xml @@ -37,6 +37,7 @@ org.jclouds.walrus.blobstore.WalrusTestInitializer http://ecc.eucalyptus.com:8773/services/Walrus 2006-03-01 + ${test.eucalyptus.identity} ${test.eucalyptus.credential} @@ -105,6 +106,7 @@ ${jclouds.blobstore.httpstream.md5} ${test.walrus.endpoint} ${test.walrus.api-version} + ${test.walrus.build-version} ${test.walrus.identity} ${test.walrus.credential} diff --git a/archetypes/rest-client-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/rest-client-archetype/src/main/resources/archetype-resources/pom.xml index d0ceb2a7ad..41cd0de642 100644 --- a/archetypes/rest-client-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/rest-client-archetype/src/main/resources/archetype-resources/pom.xml @@ -59,6 +59,7 @@ $symbol_dollar = '$' ) ${providerIdentity} ${providerCredential} ${providerApiVersion} + ${providerEndpoint} @@ -108,6 +109,7 @@ $symbol_dollar = '$' ) \$\{test.${lcaseProviderName}.credential\} \$\{test.${lcaseProviderName}.endpoint\} \$\{test.${lcaseProviderName}.api-version\} + \$\{test.${lcaseProviderName}.build-version\} diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java index 1082d5d8a8..d542079f0f 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java @@ -38,6 +38,7 @@ public abstract class BaseTestInitializer { String identity = System.getProperty("test." + provider + ".identity"); String credential = System.getProperty("test." + provider + ".credential"); String apiVersion = System.getProperty("test." + provider + ".api-version"); + String buildVersion = System.getProperty("test." + provider + ".build-version"); if (endpoint != null) testContext.setAttribute("test." + provider + ".endpoint", endpoint); if (app != null) @@ -46,16 +47,27 @@ public abstract class BaseTestInitializer { testContext.setAttribute("test." + provider + ".identity", identity); if (credential != null) testContext.setAttribute("test." + provider + ".credential", credential); - if (credential != null) + if (apiVersion != null) testContext.setAttribute("test." + provider + ".api-version", apiVersion); + if (buildVersion != null) + testContext.setAttribute("test." + provider + ".build-version", buildVersion); if (identity != null) { return createLiveContext(configurationModule, endpoint, apiVersion, app, identity, credential); } else { return createStubContext(); } } + + /** + * To be removed in jclouds 1.4 + */ + @Deprecated protected Properties setupProperties(String endpoint, String apiVersion, String identity, String credential) { + return setupProperties(endpoint, apiVersion, "", identity, credential); + } + + protected Properties setupProperties(String endpoint, String apiVersion, String buildVersion, String identity, String credential) { Properties overrides = new Properties(); overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true"); overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true"); @@ -65,6 +77,8 @@ public abstract class BaseTestInitializer { overrides.setProperty(provider + ".credential", credential); if (endpoint != null) overrides.setProperty(provider + ".endpoint", endpoint); + if (buildVersion != null) + overrides.setProperty(provider + ".build-version", buildVersion); if (apiVersion != null) overrides.setProperty(provider + ".api-version", apiVersion); return overrides; diff --git a/common/aws/src/test/java/org/jclouds/aws/filters/FormSignerTest.java b/common/aws/src/test/java/org/jclouds/aws/filters/FormSignerTest.java index e475aaf166..28c9dd952e 100644 --- a/common/aws/src/test/java/org/jclouds/aws/filters/FormSignerTest.java +++ b/common/aws/src/test/java/org/jclouds/aws/filters/FormSignerTest.java @@ -50,7 +50,7 @@ import com.google.inject.name.Names; public class FormSignerTest { @SuppressWarnings("unchecked") public static final RestContextSpec DUMMY_SPEC = new RestContextSpec("provider", "endpoint", - "apiVersion", "", "identity", "credential", Map.class, List.class, PropertiesBuilder.class, + "apiVersion", "buildVersion", "", "identity", "credential", Map.class, List.class, PropertiesBuilder.class, (Class) RestContextBuilder.class, ImmutableList. of(new MockModule(), new NullLoggingModule(), new AbstractModule() { @Override diff --git a/common/azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthenticationTest.java b/common/azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthenticationTest.java index 690c8add7f..5285e5c221 100644 --- a/common/azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthenticationTest.java +++ b/common/azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthenticationTest.java @@ -138,7 +138,7 @@ public class SharedKeyLiteAuthenticationTest { @SuppressWarnings("unchecked") public static final RestContextSpec DUMMY_SPEC = new RestContextSpec("provider", "endpoint", - "apiVersion", "", "identity", "credential", Map.class, List.class, PropertiesBuilder.class, + "apiVersion", "buildVersion", "", "identity", "credential", Map.class, List.class, PropertiesBuilder.class, (Class) RestContextBuilder.class, ImmutableList. of(new MockModule(), new NullLoggingModule(), new AzureStorageRestClientModule(Exception.class, RuntimeException.class))); diff --git a/common/openstack/src/test/java/org/jclouds/openstack/OpenStackAuthAsyncClientTest.java b/common/openstack/src/test/java/org/jclouds/openstack/OpenStackAuthAsyncClientTest.java index 61edf2c862..293174f2cc 100644 --- a/common/openstack/src/test/java/org/jclouds/openstack/OpenStackAuthAsyncClientTest.java +++ b/common/openstack/src/test/java/org/jclouds/openstack/OpenStackAuthAsyncClientTest.java @@ -76,7 +76,7 @@ public class OpenStackAuthAsyncClientTest extends RestClientTest createContextSpec() { - return contextSpec("test", "http://localhost:8080", "1.0", "", "identity", "credential", + return contextSpec("test", "http://localhost:8080", "1.0", "", "", "identity", "credential", OpenStackAuthClient.class, OpenStackAuthAsyncClient.class); } diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginAsyncClientTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginAsyncClientTest.java index 7b9df301dd..f728d20f98 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginAsyncClientTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginAsyncClientTest.java @@ -108,7 +108,7 @@ public class TerremarkVCloudLoginAsyncClientTest extends RestClientTest createContextSpec() { - return contextSpec("test", "http://localhost:8080/login", "1", "", "identity", "credential", + return contextSpec("test", "http://localhost:8080/login", "1", "", "", "identity", "credential", VCloudLoginClient.class, TerremarkVCloudLoginAsyncClient.class); } } diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsAsyncClientTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsAsyncClientTest.java index 49eeb94c81..1399a22476 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsAsyncClientTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsAsyncClientTest.java @@ -82,7 +82,7 @@ public class TerremarkVCloudVersionsAsyncClientTest extends RestClientTest createContextSpec() { - return contextSpec("test", "http://localhost:8080", "1", "", "identity", "credential", + return contextSpec("test", "http://localhost:8080", "1", "", "", "identity", "credential", VCloudVersionsClient.class, TerremarkVCloudVersionsAsyncClient.class); } diff --git a/compute/src/main/java/org/jclouds/compute/StandaloneComputeServiceContextSpec.java b/compute/src/main/java/org/jclouds/compute/StandaloneComputeServiceContextSpec.java index f508c04390..b22661071f 100644 --- a/compute/src/main/java/org/jclouds/compute/StandaloneComputeServiceContextSpec.java +++ b/compute/src/main/java/org/jclouds/compute/StandaloneComputeServiceContextSpec.java @@ -28,26 +28,26 @@ import com.google.inject.Module; * @author Adrian Cole */ public class StandaloneComputeServiceContextSpec extends RestContextSpec { - public StandaloneComputeServiceContextSpec(String provider, String endpoint, String apiVersion, String iso3166Codes, - String identity, String credential, Class driverClass, + public StandaloneComputeServiceContextSpec(String provider, String endpoint, String apiVersion, String buildVersion, + String iso3166Codes, String identity, String credential, Class driverClass, Class> contextBuilderClass) { - this(provider, endpoint, apiVersion, iso3166Codes, identity, credential, driverClass, contextBuilderClass, - ImmutableSet. of()); + this(provider, endpoint, apiVersion, buildVersion, iso3166Codes, identity, credential, driverClass, + contextBuilderClass, ImmutableSet. of()); } - public StandaloneComputeServiceContextSpec(String provider, String endpoint, String apiVersion, String iso3166Codes, - String identity, String credential, Class driverClass, + public StandaloneComputeServiceContextSpec(String provider, String endpoint, String apiVersion, String buildVersion, + String iso3166Codes, String identity, String credential, Class driverClass, Class> contextBuilderClass, Iterable modules) { - this(provider, endpoint, apiVersion, iso3166Codes, identity, credential, driverClass, PropertiesBuilder.class, - contextBuilderClass, modules); + this(provider, endpoint, apiVersion, buildVersion, iso3166Codes, identity, credential, driverClass, + PropertiesBuilder.class, contextBuilderClass, modules); } @SuppressWarnings( { "unchecked", "rawtypes" }) - public StandaloneComputeServiceContextSpec(String provider, String endpoint, String apiVersion, String iso3166Codes, - String identity, String credential, Class driverClass, + public StandaloneComputeServiceContextSpec(String provider, String endpoint, String apiVersion, String buildVersion, + String iso3166Codes, String identity, String credential, Class driverClass, Class propertiesBuilderClass, Class> contextBuilderClass, Iterable modules) { - super(provider, endpoint, apiVersion, iso3166Codes, identity, credential, driverClass, driverClass, + super(provider, endpoint, apiVersion, buildVersion, iso3166Codes, identity, credential, driverClass, driverClass, (Class) propertiesBuilderClass, (Class) contextBuilderClass, modules); } } \ No newline at end of file diff --git a/compute/src/test/java/org/jclouds/compute/ComputeServiceContextFactoryTest.java b/compute/src/test/java/org/jclouds/compute/ComputeServiceContextFactoryTest.java index fcc5ad38a4..af977d5d29 100644 --- a/compute/src/test/java/org/jclouds/compute/ComputeServiceContextFactoryTest.java +++ b/compute/src/test/java/org/jclouds/compute/ComputeServiceContextFactoryTest.java @@ -43,7 +43,7 @@ public class ComputeServiceContextFactoryTest { @SuppressWarnings("rawtypes") ComputeServiceContext context = new ComputeServiceContextFactory() .createContext(new StandaloneComputeServiceContextSpec( - "stub", "stub", "1", "", "identity", "credential", ConcurrentMap.class, + "stub", "stub", "1", "", "", "identity", "credential", ConcurrentMap.class, StubComputeServiceContextBuilder.class, ImmutableSet. of())); context.getComputeService().listNodes(); diff --git a/core/src/main/java/org/jclouds/Constants.java b/core/src/main/java/org/jclouds/Constants.java index 2052da0082..cc81d4df78 100644 --- a/core/src/main/java/org/jclouds/Constants.java +++ b/core/src/main/java/org/jclouds/Constants.java @@ -191,12 +191,23 @@ public interface Constants { public static final String PROPERTY_API = "jclouds.api"; /** - * String property. + * String property. default empty string *

* Explicitly identifies the version of an api. */ public static final String PROPERTY_API_VERSION = "jclouds.api-version"; + /** + * String property. + *

+ * Explicitly identifies the build that the server jclouds connects to is running. + * + * For example, for virtualbox, the api version may be {@code 4.1.8} while the build version is + * {@code 4.1.8r75467}. Or a vcloud endpoint may be api version {@code 1.0} while the build is + * {@code 1.5.0.0.124312} + */ + public static final String PROPERTY_BUILD_VERSION = "jclouds.build-version"; + /** * String property. *

diff --git a/core/src/main/java/org/jclouds/PropertiesBuilder.java b/core/src/main/java/org/jclouds/PropertiesBuilder.java index 3029a68c9e..f79a1cdfd6 100644 --- a/core/src/main/java/org/jclouds/PropertiesBuilder.java +++ b/core/src/main/java/org/jclouds/PropertiesBuilder.java @@ -19,6 +19,7 @@ package org.jclouds; import static org.jclouds.Constants.PROPERTY_API_VERSION; +import static org.jclouds.Constants.PROPERTY_BUILD_VERSION; import static org.jclouds.Constants.PROPERTY_CONNECTION_TIMEOUT; import static org.jclouds.Constants.PROPERTY_CREDENTIAL; import static org.jclouds.Constants.PROPERTY_ENDPOINT; @@ -218,6 +219,7 @@ public class PropertiesBuilder { props.setProperty(PROPERTY_CONNECTION_TIMEOUT, 60000 + ""); props.setProperty(PROPERTY_IO_WORKER_THREADS, 20 + ""); props.setProperty(PROPERTY_USER_THREADS, 0 + ""); + props.setProperty(PROPERTY_BUILD_VERSION, ""); props.setProperty(PROPERTY_MAX_CONNECTION_REUSE, 75 + ""); props.setProperty(PROPERTY_MAX_SESSION_FAILURES, 2 + ""); props.setProperty(PROPERTY_SESSION_INTERVAL, 60 + ""); @@ -249,6 +251,11 @@ public class PropertiesBuilder { return this; } + public PropertiesBuilder buildVersion(String buildVersion) { + properties.setProperty(PROPERTY_BUILD_VERSION, buildVersion); + return this; + } + public PropertiesBuilder credentials(String identity, @Nullable String credential) { properties.setProperty(PROPERTY_IDENTITY, identity); if (credential != null) diff --git a/core/src/main/java/org/jclouds/rest/RestContext.java b/core/src/main/java/org/jclouds/rest/RestContext.java index c07ab1cfc7..c03665d798 100644 --- a/core/src/main/java/org/jclouds/rest/RestContext.java +++ b/core/src/main/java/org/jclouds/rest/RestContext.java @@ -22,6 +22,7 @@ import java.net.URI; import java.util.Map; import java.util.concurrent.Future; +import org.jclouds.Constants; import org.jclouds.domain.Credentials; import org.jclouds.domain.Location; import org.jclouds.rest.internal.RestContextImpl; @@ -58,9 +59,19 @@ public interface RestContext extends Location { S getApi(); URI getEndpoint(); - + + /** + * @return version of the api presented by this service + * @see Constants#PROPERTY_API_VERSION + */ String getApiVersion(); + /** + * @return version of software this service is running + * @see Constants#PROPERTY_BUILD_VERSION + */ + String getBuildVersion(); + String getIdentity(); /** diff --git a/core/src/main/java/org/jclouds/rest/RestContextBuilder.java b/core/src/main/java/org/jclouds/rest/RestContextBuilder.java index 94894c6956..2c197cc2f4 100644 --- a/core/src/main/java/org/jclouds/rest/RestContextBuilder.java +++ b/core/src/main/java/org/jclouds/rest/RestContextBuilder.java @@ -31,6 +31,7 @@ import static com.google.inject.name.Names.bindProperties; import static com.google.inject.util.Types.newParameterizedType; import static org.jclouds.Constants.PROPERTY_API; import static org.jclouds.Constants.PROPERTY_API_VERSION; +import static org.jclouds.Constants.PROPERTY_BUILD_VERSION; import static org.jclouds.Constants.PROPERTY_CREDENTIAL; import static org.jclouds.Constants.PROPERTY_ENDPOINT; import static org.jclouds.Constants.PROPERTY_IDENTITY; @@ -39,14 +40,17 @@ import static org.jclouds.Constants.PROPERTY_PROVIDER; import static org.jclouds.Constants.PROPERTY_TIMEOUTS_PREFIX; import java.net.URI; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import java.util.Map.Entry; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; -import com.google.common.collect.*; import org.jclouds.concurrent.MoreExecutors; import org.jclouds.concurrent.SingleThreaded; import org.jclouds.concurrent.config.ConfiguresExecutorService; @@ -61,6 +65,7 @@ import org.jclouds.logging.config.LoggingModule; import org.jclouds.logging.jdk.config.JDKLoggingModule; import org.jclouds.rest.annotations.Api; import org.jclouds.rest.annotations.ApiVersion; +import org.jclouds.rest.annotations.BuildVersion; import org.jclouds.rest.annotations.Credential; import org.jclouds.rest.annotations.Identity; import org.jclouds.rest.config.CredentialStoreModule; @@ -70,6 +75,11 @@ import org.jclouds.rest.internal.RestContextImpl; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.LinkedHashMultimap; +import com.google.common.collect.Multimap; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; @@ -149,6 +159,8 @@ public class RestContextBuilder { bind(String.class).annotatedWith(Api.class).toInstance(toBind.getProperty(PROPERTY_API)); if (toBind.containsKey(PROPERTY_API_VERSION)) bind(String.class).annotatedWith(ApiVersion.class).toInstance(toBind.getProperty(PROPERTY_API_VERSION)); + if (toBind.containsKey(PROPERTY_BUILD_VERSION)) + bind(String.class).annotatedWith(BuildVersion.class).toInstance(toBind.getProperty(PROPERTY_BUILD_VERSION)); if (toBind.containsKey(PROPERTY_IDENTITY)) bind(String.class).annotatedWith(Identity.class).toInstance( checkNotNull(toBind.getProperty(PROPERTY_IDENTITY), PROPERTY_IDENTITY)); diff --git a/core/src/main/java/org/jclouds/rest/RestContextFactory.java b/core/src/main/java/org/jclouds/rest/RestContextFactory.java index 49efd3f825..4aacd74a28 100644 --- a/core/src/main/java/org/jclouds/rest/RestContextFactory.java +++ b/core/src/main/java/org/jclouds/rest/RestContextFactory.java @@ -30,10 +30,10 @@ import java.io.File; import java.io.IOException; import java.util.Properties; -import org.jclouds.javax.annotation.Nullable; import javax.inject.Inject; import org.jclouds.PropertiesBuilder; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.reference.LocationConstants; import org.jclouds.util.ClassLoadingUtils; import org.jclouds.util.Modules2; @@ -72,24 +72,24 @@ import com.google.inject.Module; public class RestContextFactory { public static RestContextSpec contextSpec(String provider, String endpoint, String apiVersion, - String iso3166Codes, String identity, String credential, Class sync, Class async, + String buildVersion, String iso3166Codes, String identity, String credential, Class sync, Class async, Class propertiesBuilderClass, Class> contextBuilderClass, Iterable modules) { - return new RestContextSpec(provider, endpoint, apiVersion, iso3166Codes, identity, credential, sync, async, - propertiesBuilderClass, contextBuilderClass, modules); + return new RestContextSpec(provider, endpoint, apiVersion, buildVersion, iso3166Codes, identity, + credential, sync, async, propertiesBuilderClass, contextBuilderClass, modules); } - public static RestContextSpec contextSpec(String provider, String endpoint, String apiVersion, + public static RestContextSpec contextSpec(String provider, String endpoint, String apiVersion,String buildVersion, String iso3166Codes, String identity, String credential, Class sync, Class async) { - return new RestContextSpec(provider, endpoint, apiVersion, iso3166Codes, identity, credential, sync, async); + return new RestContextSpec(provider, endpoint, apiVersion, buildVersion, iso3166Codes, identity, credential, sync, async); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings( { "unchecked", "rawtypes" }) public static RestContextSpec contextSpec(String provider, String endpoint, String apiVersion, - String iso3166Codes, String identity, String credential, Class sync, Class async, - Iterable modules) { - return new RestContextSpec(provider, endpoint, apiVersion, iso3166Codes, identity, credential, sync, async, - PropertiesBuilder.class, (Class) RestContextBuilder.class, modules); + String buildVersion, String iso3166Codes, String identity, String credential, Class sync, + Class async, Iterable modules) { + return new RestContextSpec(provider, endpoint, apiVersion, buildVersion, iso3166Codes, identity, + credential, sync, async, PropertiesBuilder.class, (Class) RestContextBuilder.class, modules); } private final static Properties NO_PROPERTIES = new Properties(); @@ -242,6 +242,7 @@ public class RestContextFactory { props.setProperty(contextSpec.provider + ".endpoint", contextSpec.endpoint); props.setProperty(contextSpec.provider + ".api-version", contextSpec.apiVersion); + props.setProperty(contextSpec.provider + ".build-version", contextSpec.buildVersion); props.setProperty(contextSpec.provider + "." + LocationConstants.ISO3166_CODES, contextSpec.iso3166Codes); props.setProperty(contextSpec.provider + ".identity", contextSpec.identity); if (contextSpec.credential != null) @@ -290,6 +291,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 + ".api-version", null); + String buildVersion = props.getProperty(providerName + ".build-version", null); identity = props.getProperty(providerName + ".identity", props.getProperty("jclouds.identity", identity)); credential = loadCredentialOrDefault(props, providerName + ".credential", loadCredentialOrDefault(props, "jclouds.credential", credential)); @@ -316,7 +318,7 @@ public class RestContextFactory { assert false : "exception should have propogated " + e; return null; } - RestContextSpec contextSpec = new RestContextSpec(providerName, endpoint, apiVersion, iso3166Codes, + RestContextSpec contextSpec = new RestContextSpec(providerName, endpoint, apiVersion, buildVersion, iso3166Codes, identity, credential, sync, async, propertiesBuilderClass, contextBuilderClass, modules); return contextSpec; } @@ -365,6 +367,8 @@ public class RestContextFactory { builder.provider(contextSpec.provider); if (contextSpec.apiVersion != null) builder.apiVersion(contextSpec.apiVersion); + if (contextSpec.buildVersion != null) + builder.buildVersion(contextSpec.buildVersion); if (contextSpec.iso3166Codes != null) builder.iso3166Codes(Splitter.on('.').split(contextSpec.iso3166Codes)); if (contextSpec.identity != null) diff --git a/core/src/main/java/org/jclouds/rest/RestContextSpec.java b/core/src/main/java/org/jclouds/rest/RestContextSpec.java index 7d92bf2d92..9cbea956e0 100644 --- a/core/src/main/java/org/jclouds/rest/RestContextSpec.java +++ b/core/src/main/java/org/jclouds/rest/RestContextSpec.java @@ -35,6 +35,7 @@ public class RestContextSpec { protected final String provider; protected final String endpoint; protected final String apiVersion; + protected final String buildVersion; protected final String iso3166Codes; protected final String identity; protected final String credential; @@ -44,12 +45,13 @@ public class RestContextSpec { protected final Class> contextBuilderClass; protected final Iterable modules; - public RestContextSpec(String provider, String endpoint, String apiVersion, String iso3166Codes, String identity, + public RestContextSpec(String provider, String endpoint, String apiVersion, String buildVersion, String iso3166Codes, String identity, String credential, Class sync, Class async, Class propertiesBuilderClass, Class> contextBuilderClass, Iterable modules) { this.provider = checkNotNull(provider, "provider"); this.endpoint = endpoint; this.apiVersion = apiVersion; + this.buildVersion = buildVersion; this.identity = identity; this.credential = credential; this.iso3166Codes = iso3166Codes; @@ -65,16 +67,16 @@ public class RestContextSpec { } @SuppressWarnings( { "unchecked", "rawtypes" }) - public RestContextSpec(String provider, String endpoint, String apiVersion, String iso3166Codes, String identity, + public RestContextSpec(String provider, String endpoint, String apiVersion, String buildVersion, String iso3166Codes, String identity, String credential, Class sync, Class async) { - this(provider, endpoint, apiVersion, iso3166Codes, identity, credential, sync, async, PropertiesBuilder.class, + this(provider, endpoint, apiVersion, buildVersion, iso3166Codes, identity, credential, sync, async, PropertiesBuilder.class, (Class) RestContextBuilder.class, EMPTY_LIST); } @Override public int hashCode() { - return Objects.hashCode(provider, endpoint, apiVersion, iso3166Codes, identity, credential, sync, async, + return Objects.hashCode(provider, endpoint, apiVersion, buildVersion, iso3166Codes, identity, credential, sync, async, propertiesBuilderClass, contextBuilderClass, modules); } @@ -88,9 +90,10 @@ public class RestContextSpec { @Override public String toString() { return Objects.toStringHelper(this).add("provider", provider).add("endpoint", endpoint).add("apiVersion", - apiVersion).add("iso3166Codes", iso3166Codes).add("identity", identity).add("sync", sync).add("async", - async).add("propertiesBuilderClass", propertiesBuilderClass).add("contextBuilderClass", - contextBuilderClass).add("modules", modules).toString(); + apiVersion).add("buildVersion", buildVersion).add("iso3166Codes", iso3166Codes) + .add("identity", identity).add("sync", sync).add("async", async).add("propertiesBuilderClass", + propertiesBuilderClass).add("contextBuilderClass", contextBuilderClass).add("modules", modules) + .toString(); } } \ No newline at end of file diff --git a/core/src/main/java/org/jclouds/rest/annotations/ApiVersion.java b/core/src/main/java/org/jclouds/rest/annotations/ApiVersion.java index 6f2aab0b2c..210a598133 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/ApiVersion.java +++ b/core/src/main/java/org/jclouds/rest/annotations/ApiVersion.java @@ -28,10 +28,13 @@ import java.lang.annotation.Target; import javax.inject.Qualifier; +import org.jclouds.Constants; + /** * Designates that this Resource qualifies an object to an api version. * * @author Adrian Cole + * @see Constants#PROPERTY_API_VERSION */ @Target( { ANNOTATION_TYPE, FIELD, PARAMETER }) @Retention(RUNTIME) diff --git a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java index 4b2133d04f..1a26d26d54 100644 --- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java +++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java @@ -47,13 +47,12 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.SortedSet; +import java.util.Map.Entry; import java.util.concurrent.ExecutionException; import javax.annotation.Resource; -import javax.inject.Named; import javax.inject.Provider; import javax.ws.rs.Consumes; import javax.ws.rs.FormParam; @@ -78,7 +77,6 @@ import org.jclouds.http.HttpUtils; import org.jclouds.http.functions.ParseFirstJsonValueNamed; import org.jclouds.http.functions.ParseJson; import org.jclouds.http.functions.ParseSax; -import org.jclouds.http.functions.ParseSax.HandlerWithResult; import org.jclouds.http.functions.ParseURIFromListOrLocationHeaderIf20x; import org.jclouds.http.functions.ParseXMLWithJAXB; import org.jclouds.http.functions.ReleasePayloadAndReturn; @@ -86,6 +84,7 @@ import org.jclouds.http.functions.ReturnInputStream; import org.jclouds.http.functions.ReturnStringIf2xx; import org.jclouds.http.functions.ReturnTrueIf2xx; import org.jclouds.http.functions.UnwrapOnlyJsonValue; +import org.jclouds.http.functions.ParseSax.HandlerWithResult; import org.jclouds.http.options.HttpRequestOptions; import org.jclouds.http.utils.ModifyRequest; import org.jclouds.internal.ClassMethodArgs; @@ -102,7 +101,9 @@ import org.jclouds.logging.Logger; import org.jclouds.rest.Binder; import org.jclouds.rest.InputParamValidator; import org.jclouds.rest.InvocationContext; +import org.jclouds.rest.annotations.ApiVersion; import org.jclouds.rest.annotations.BinderParam; +import org.jclouds.rest.annotations.BuildVersion; import org.jclouds.rest.annotations.Endpoint; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.ExceptionParser; @@ -145,12 +146,12 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSet.Builder; import com.google.common.collect.Iterables; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; +import com.google.common.collect.ImmutableSet.Builder; import com.google.common.util.concurrent.ListenableFuture; import com.google.inject.Inject; import com.google.inject.Injector; @@ -245,6 +246,7 @@ public class RestAnnotationProcessor { private final Provider uriBuilderProvider; private final LoadingCache, Boolean> seedAnnotationCache; private final String apiVersion; + private final String buildVersion; private char[] skips; @Inject @@ -306,8 +308,8 @@ public class RestAnnotationProcessor { @SuppressWarnings("unchecked") @Inject public RestAnnotationProcessor(Injector injector, LoadingCache, Boolean> seedAnnotationCache, - @Named(Constants.PROPERTY_API_VERSION) String apiVersion, ParseSax.Factory parserFactory, HttpUtils utils, - TypeLiteral typeLiteral) throws ExecutionException { + @ApiVersion String apiVersion, @BuildVersion String buildVersion, ParseSax.Factory parserFactory, + HttpUtils utils, TypeLiteral typeLiteral) throws ExecutionException { this.declaring = (Class) typeLiteral.getRawType(); this.injector = injector; this.parserFactory = parserFactory; @@ -321,6 +323,7 @@ public class RestAnnotationProcessor { skips = new char[] {}; } this.apiVersion = apiVersion; + this.buildVersion = buildVersion; } public Method getDelegateOrNull(Method in) { @@ -435,6 +438,7 @@ public class RestAnnotationProcessor { Multimap tokenValues = LinkedHashMultimap.create(); tokenValues.put(Constants.PROPERTY_API_VERSION, apiVersion); + tokenValues.put(Constants.PROPERTY_BUILD_VERSION, buildVersion); tokenValues.putAll(addPathAndGetTokens(declaring, method, args, builder)); diff --git a/core/src/main/java/org/jclouds/rest/internal/RestContextImpl.java b/core/src/main/java/org/jclouds/rest/internal/RestContextImpl.java index 2a83936d2c..5c8f2f3d3d 100644 --- a/core/src/main/java/org/jclouds/rest/internal/RestContextImpl.java +++ b/core/src/main/java/org/jclouds/rest/internal/RestContextImpl.java @@ -36,8 +36,10 @@ import org.jclouds.logging.Logger; import org.jclouds.rest.RestContext; import org.jclouds.rest.Utils; import org.jclouds.rest.annotations.ApiVersion; +import org.jclouds.rest.annotations.BuildVersion; import org.jclouds.rest.annotations.Identity; +import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; import com.google.inject.Injector; import com.google.inject.Key; @@ -59,6 +61,7 @@ public class RestContextImpl implements RestContext { private final String identity; private final String provider; private final String apiVersion; + private final String buildVersion; private final Utils utils; private final Map credentialStore; private final Set iso3166Codes; @@ -66,7 +69,8 @@ public class RestContextImpl implements RestContext { @Inject protected RestContextImpl(Closer closer, Map credentialStore, Utils utils, Injector injector, TypeLiteral syncApi, TypeLiteral asyncApi, @Provider URI endpoint, @Provider String provider, - @Identity String identity, @ApiVersion String apiVersion, @Iso3166 Set iso3166Codes) { + @Identity String identity, @ApiVersion String apiVersion, @BuildVersion String buildVersion, + @Iso3166 Set iso3166Codes) { this.credentialStore = credentialStore; this.utils = utils; this.asyncApi = injector.getInstance(Key.get(asyncApi)); @@ -76,6 +80,7 @@ public class RestContextImpl implements RestContext { this.identity = identity; this.provider = provider; this.apiVersion = apiVersion; + this.buildVersion = buildVersion; this.iso3166Codes = iso3166Codes; } @@ -127,16 +132,16 @@ public class RestContextImpl implements RestContext { public String getApiVersion() { return apiVersion; } + + @Override + public String getBuildVersion() { + return buildVersion; + } + @Override public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((apiVersion == null) ? 0 : apiVersion.hashCode()); - result = prime * result + ((endpoint == null) ? 0 : endpoint.hashCode()); - result = prime * result + ((identity == null) ? 0 : identity.hashCode()); - result = prime * result + ((provider == null) ? 0 : provider.hashCode()); - return result; + return Objects.hashCode(provider, endpoint, apiVersion, buildVersion, identity); } @Override @@ -147,34 +152,17 @@ public class RestContextImpl implements RestContext { return false; if (getClass() != obj.getClass()) return false; - RestContextImpl other = (RestContextImpl) obj; - if (apiVersion == null) { - if (other.apiVersion != null) - return false; - } else if (!apiVersion.equals(other.apiVersion)) - return false; - if (endpoint == null) { - if (other.endpoint != null) - return false; - } else if (!endpoint.equals(other.endpoint)) - return false; - if (identity == null) { - if (other.identity != null) - return false; - } else if (!identity.equals(other.identity)) - return false; - if (provider == null) { - if (other.provider != null) - return false; - } else if (!provider.equals(other.provider)) - return false; - return true; + RestContextImpl that = (RestContextImpl) obj; + return Objects.equal(this.provider, that.provider) && Objects.equal(this.endpoint, that.endpoint) + && Objects.equal(this.apiVersion, that.apiVersion) + && Objects.equal(this.buildVersion, that.buildVersion) && Objects.equal(this.identity, that.identity); } @Override public String toString() { - return " [id=" + provider + ", endpoint=" + endpoint + ", apiVersion=" + apiVersion + ", identity=" + identity - + ", iso3166Codes=" + iso3166Codes + "]"; + return Objects.toStringHelper("").add("provider", provider).add("endpoint", endpoint).add("apiVersion", + apiVersion).add("buildVersion", buildVersion).add("identity", identity) + .add("iso3166Codes", iso3166Codes).toString(); } @Override @@ -204,7 +192,8 @@ public class RestContextImpl implements RestContext { @Override public Map getMetadata() { - return ImmutableMap. of("endpoint", endpoint, "apiVersion", apiVersion, "identity", identity); + return ImmutableMap. of("endpoint", endpoint, "apiVersion", apiVersion, "buildVersion", + buildVersion, "identity", identity); } @Override diff --git a/core/src/test/java/org/jclouds/http/BaseJettyTest.java b/core/src/test/java/org/jclouds/http/BaseJettyTest.java index 90ba02b032..e0b4cbf592 100644 --- a/core/src/test/java/org/jclouds/http/BaseJettyTest.java +++ b/core/src/test/java/org/jclouds/http/BaseJettyTest.java @@ -282,7 +282,7 @@ public abstract class BaseJettyTest { properties.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true"); properties.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true"); RestContextSpec contextSpec = contextSpec("test", - "http://localhost:" + testPort, "1", "", "identity", null, IntegrationTestClient.class, + "http://localhost:" + testPort, "1", "", "", "identity", null, IntegrationTestClient.class, IntegrationTestAsyncClient.class, ImmutableSet. copyOf(connectionModules)); return createContextBuilder(contextSpec, properties); } diff --git a/core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java b/core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java index a4d57d4c6f..fd88562649 100644 --- a/core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java +++ b/core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java @@ -213,7 +213,7 @@ public abstract class BaseRestClientExpectTest { @SuppressWarnings("unchecked") private RestContextSpec makeContextSpec() { if (getClass().isAnnotationPresent(RegisterContext.class)) - return (RestContextSpec) contextSpec(provider, "http://mock", "1", "", "userfoo", null, getClass() + return (RestContextSpec) contextSpec(provider, "http://mock", "1", "", "", "userfoo", null, getClass() .getAnnotation(RegisterContext.class).sync(), getClass().getAnnotation(RegisterContext.class).async(), ImmutableSet. of()); else diff --git a/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java b/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java index 52bc1937ca..108f14ff45 100644 --- a/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java +++ b/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java @@ -141,7 +141,7 @@ public class InputParamValidatorTest { void setupFactory() { RestContextSpec contextSpec = contextSpec("test", - "http://localhost:9999", "1", "", "userFoo", null, IntegrationTestClient.class, + "http://localhost:9999", "1", "", "", "userFoo", null, IntegrationTestClient.class, IntegrationTestAsyncClient.class); injector = createContextBuilder(contextSpec).buildInjector(); diff --git a/core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java b/core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java index b53dff86a9..3dcfdd8ce5 100644 --- a/core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java +++ b/core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java @@ -53,7 +53,7 @@ public class RestContextFactoryTest { public void testBuilder() { RestContextSpec contextSpec = contextSpec(provider, - "http://localhost", "1", "", "dummy", null, IntegrationTestClient.class, + "http://localhost", "1", "", "", "dummy", null, IntegrationTestClient.class, IntegrationTestAsyncClient.class); createContextBuilder(contextSpec); @@ -61,12 +61,13 @@ public class RestContextFactoryTest { public void testBuilderPropertiesWithIso3166() { RestContextSpec contextSpec = contextSpec(provider, - "http://localhost", "1", "US-CA", "dummy", null, IntegrationTestClient.class, + "http://localhost", "1", "build-foo", "US-CA", "dummy", null, IntegrationTestClient.class, IntegrationTestAsyncClient.class); Properties props = RestContextFactory.toProperties(contextSpec); assertEquals(props.getProperty("test.endpoint"), "http://localhost"); assertEquals(props.getProperty("test.api-version"), "1"); + assertEquals(props.getProperty("test.build-version"), "build-foo"); assertEquals(props.getProperty("test.identity"), "dummy"); assertEquals(props.getProperty("test.iso3166-codes"), "US-CA"); assertEquals(props.getProperty("test.credential"), null); @@ -81,12 +82,13 @@ public class RestContextFactoryTest { public void testBuilderPropertiesWithCredential() { RestContextSpec contextSpec = contextSpec(provider, - "http://localhost", "1", "", "dummy", "credential", IntegrationTestClient.class, + "http://localhost", "1", "build-foo", "", "dummy", "credential", IntegrationTestClient.class, IntegrationTestAsyncClient.class); Properties props = RestContextFactory.toProperties(contextSpec); assertEquals(props.getProperty("test.endpoint"), "http://localhost"); assertEquals(props.getProperty("test.api-version"), "1"); + assertEquals(props.getProperty("test.build-version"), "build-foo"); assertEquals(props.getProperty("test.identity"), "dummy"); assertEquals(props.getProperty("test.credential"), "credential"); assertEquals(props.getProperty("test.sync"), IntegrationTestClient.class.getName()); @@ -102,12 +104,13 @@ public class RestContextFactoryTest { public void testBuilderPropertiesWithContextBuilder() { @SuppressWarnings("rawtypes") RestContextSpec contextSpec = contextSpec(provider, - "http://localhost", "1", "", "dummy", null, (Class) null, (Class) null, PropertiesBuilder.class, + "http://localhost", "1", "build-foo", "", "dummy", null, (Class) null, (Class) null, PropertiesBuilder.class, (Class) IntegrationTestContextBuilder.class, Collections.EMPTY_LIST); Properties props = RestContextFactory.toProperties(contextSpec); assertEquals(props.getProperty("test.endpoint"), "http://localhost"); assertEquals(props.getProperty("test.api-version"), "1"); + assertEquals(props.getProperty("test.build-version"), "build-foo"); assertEquals(props.getProperty("test.identity"), "dummy"); assertEquals(props.getProperty("test.credential"), null); assertEquals(props.getProperty("test.sync"), null); @@ -123,12 +126,13 @@ public class RestContextFactoryTest { public void testBuilderPropertiesWithModule() { @SuppressWarnings("rawtypes") RestContextSpec contextSpec = contextSpec(provider, - "http://localhost", "1", "", "dummy", null, (Class) null, (Class) null, PropertiesBuilder.class, + "http://localhost", "1", "build-foo", "", "dummy", null, (Class) null, (Class) null, PropertiesBuilder.class, (Class) IntegrationTestContextBuilder.class, Collections. singleton(new A())); Properties props = RestContextFactory.toProperties(contextSpec); assertEquals(props.getProperty("test.endpoint"), "http://localhost"); assertEquals(props.getProperty("test.api-version"), "1"); + assertEquals(props.getProperty("test.build-version"), "build-foo"); assertEquals(props.getProperty("test.identity"), "dummy"); assertEquals(props.getProperty("test.credential"), null); assertEquals(props.getProperty("test.sync"), null); @@ -144,12 +148,13 @@ public class RestContextFactoryTest { public void testBuilderPropertiesWithModules() { @SuppressWarnings("rawtypes") RestContextSpec contextSpec = contextSpec(provider, - "http://localhost", "1", "", "dummy", null, (Class) null, (Class) null, PropertiesBuilder.class, + "http://localhost", "1", "build-foo", "", "dummy", null, (Class) null, (Class) null, PropertiesBuilder.class, (Class) IntegrationTestContextBuilder.class, Arrays. asList(new A(), new B())); Properties props = RestContextFactory.toProperties(contextSpec); assertEquals(props.getProperty("test.endpoint"), "http://localhost"); assertEquals(props.getProperty("test.api-version"), "1"); + assertEquals(props.getProperty("test.build-version"), "build-foo"); assertEquals(props.getProperty("test.identity"), "dummy"); assertEquals(props.getProperty("test.credential"), null); assertEquals(props.getProperty("test.sync"), null); @@ -166,6 +171,7 @@ public class RestContextFactoryTest { Properties props = new Properties(); props.setProperty("test.endpoint", "http://localhost"); props.setProperty("test.api-version", "1"); + props.setProperty("test.build-version", "build-foo"); props.setProperty("test.iso3166-codes", "US"); props.setProperty("jclouds.identity", "foo"); props.setProperty("jclouds.credential", "bar"); @@ -186,6 +192,8 @@ public class RestContextFactoryTest { assertEquals(spec.iso3166Codes, "US"); assertEquals(spec.identity, "foo"); assertEquals(spec.credential, "bar"); + assertEquals(spec.apiVersion, "1"); + assertEquals(spec.buildVersion, "build-foo"); assertEquals(Iterables.size(spec.modules), 2); return spec; } @@ -201,6 +209,7 @@ public class RestContextFactoryTest { Properties props = new Properties(); props.setProperty("test.endpoint", "http://localhost"); props.setProperty("test.api-version", "1"); + props.setProperty("test.build-version", "build-foo"); props.setProperty("test.iso3166-codes", "US"); props.setProperty("test.identity", "foo"); props.setProperty("test.credential.file", file.getAbsolutePath()); @@ -221,6 +230,8 @@ public class RestContextFactoryTest { assertEquals(spec.iso3166Codes, "US"); assertEquals(spec.identity, "foo"); assertEquals(spec.credential, "bar"); + assertEquals(spec.apiVersion, "1"); + assertEquals(spec.buildVersion, "build-foo"); assertEquals(Iterables.size(spec.modules), 2); return spec; } @@ -251,7 +262,7 @@ public class RestContextFactoryTest { public void testBuilderPropertiesWithWrongConfig() { @SuppressWarnings( { "unused", "rawtypes" }) RestContextSpec contextSpec = contextSpec(provider, - "http://localhost", "1", "", "dummy", null, (Class) null, (Class) null, + "http://localhost", "1", "build-foo", "", "dummy", null, (Class) null, (Class) null, (Class) IntegrationTestContextBuilder.class, (Class) PropertiesBuilder.class, Collections.EMPTY_LIST); } diff --git a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java index e86d913917..d7159e5970 100644 --- a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java @@ -315,9 +315,9 @@ public class RestAnnotationProcessorTest extends BaseRestClientTest { private Injector injectorForCaller(HttpCommandExecutorService service) { - RestContextSpec contextSpec = contextSpec("test", "http://localhost:9999", "1", "", - "userfoo", null, Caller.class, AsyncCaller.class, - ImmutableSet. of(new MockModule(service), new NullLoggingModule(), new CallerModule())); + RestContextSpec contextSpec = contextSpec("test", "http://localhost:9999", "1", "", "", + "userfoo", null, Caller.class, AsyncCaller.class, ImmutableSet. of(new MockModule(service), + new NullLoggingModule(), new CallerModule())); return createContextBuilder(contextSpec).buildInjector(); @@ -2426,7 +2426,7 @@ public class RestAnnotationProcessorTest extends BaseRestClientTest { @BeforeClass void setupFactory() { - RestContextSpec contextSpec = contextSpec("test", "http://localhost:9999", "1", "", "userfoo", + RestContextSpec contextSpec = contextSpec("test", "http://localhost:9999", "1", "", "", "userfoo", null, String.class, Integer.class, ImmutableSet. of(new MockModule(), new NullLoggingModule(), new AbstractModule() { diff --git a/providers/aws-cloudwatch/pom.xml b/providers/aws-cloudwatch/pom.xml index 012eec8e14..d77927a5d4 100644 --- a/providers/aws-cloudwatch/pom.xml +++ b/providers/aws-cloudwatch/pom.xml @@ -36,6 +36,7 @@ https://monitoring.us-east-1.amazonaws.com 2009-05-15 + ${test.aws.identity} ${test.aws.credential} @@ -88,6 +89,7 @@ ${test.aws-cloudwatch.endpoint} ${test.aws-cloudwatch.api-version} + ${test.aws-cloudwatch.build-version} ${test.aws-cloudwatch.identity} ${test.aws-cloudwatch.credential} ${test.aws-cloudwatch.compute.provider} diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml index ae0e500268..5eefe3d98a 100644 --- a/providers/aws-ec2/pom.xml +++ b/providers/aws-ec2/pom.xml @@ -36,6 +36,7 @@ https://ec2.us-east-1.amazonaws.com 2011-05-15 + ${test.aws.identity} ${test.aws.credential} @@ -114,6 +115,7 @@ ${test.aws-ec2.endpoint} ${test.aws-ec2.api-version} + ${test.aws-ec2.build-version} ${test.aws-ec2.identity} ${test.aws-ec2.credential} ${test.aws-ec2.image-id} diff --git a/providers/aws-s3/pom.xml b/providers/aws-s3/pom.xml index f2e70c1ecf..2ffd814391 100644 --- a/providers/aws-s3/pom.xml +++ b/providers/aws-s3/pom.xml @@ -37,6 +37,7 @@ org.jclouds.aws.s3.blobstore.integration.AWSS3TestInitializer https://s3.amazonaws.com 2006-03-01 + ${test.aws.identity} ${test.aws.credential} 25 @@ -124,6 +125,7 @@ ${test.aws-s3.endpoint} ${test.aws-s3.api-version} + ${test.aws-s3.build-version} ${test.aws-s3.identity} ${test.aws-s3.credential} ${test.initializer} diff --git a/providers/azureblob/pom.xml b/providers/azureblob/pom.xml index fefd90f134..e573264dd6 100644 --- a/providers/azureblob/pom.xml +++ b/providers/azureblob/pom.xml @@ -37,6 +37,7 @@ org.jclouds.azureblob.blobstore.integration.AzureBlobTestInitializer https://{identity}.blob.core.windows.net 2009-09-19 + ${test.azure.identity} ${test.azure.credential} @@ -95,6 +96,7 @@ ${test.azureblob.endpoint} ${test.azureblob.api-version} + ${test.azureblob.build-version} ${test.azureblob.identity} ${test.azureblob.credential} ${test.initializer} diff --git a/providers/bluelock-vcloud-zone01/pom.xml b/providers/bluelock-vcloud-zone01/pom.xml index c4903d4f05..ccf8d2a942 100644 --- a/providers/bluelock-vcloud-zone01/pom.xml +++ b/providers/bluelock-vcloud-zone01/pom.xml @@ -36,6 +36,7 @@ https://zone01.bluelock.com/api 1.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -103,6 +104,7 @@ ${test.bluelock-vcloud-zone01.endpoint} ${test.bluelock-vcloud-zone01.api-version} + ${test.bluelock-vcloud-zone01.build-version} ${test.bluelock-vcloud-zone01.identity} ${test.bluelock-vcloud-zone01.credential} ${test.bluelock-vcloud-zone01.image-id} diff --git a/providers/cloudfiles-uk/pom.xml b/providers/cloudfiles-uk/pom.xml index a7eebb00b1..2afc2445a0 100644 --- a/providers/cloudfiles-uk/pom.xml +++ b/providers/cloudfiles-uk/pom.xml @@ -37,6 +37,7 @@ org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUKTestInitializer https://lon.auth.api.rackspacecloud.com 1.0 + ${test.rackspace-uk.identity} ${test.rackspace-uk.credential} @@ -110,6 +111,7 @@ ${test.cloudfiles-uk.endpoint} ${test.cloudfiles-uk.api-version} + ${test.cloudfiles-uk.build-version} ${test.cloudfiles-uk.identity} ${test.cloudfiles-uk.credential} ${test.initializer} diff --git a/providers/cloudfiles-us/pom.xml b/providers/cloudfiles-us/pom.xml index cc4461aa3c..c7df756ffd 100644 --- a/providers/cloudfiles-us/pom.xml +++ b/providers/cloudfiles-us/pom.xml @@ -37,6 +37,7 @@ org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUSTestInitializer https://auth.api.rackspacecloud.com 1.0 + ${test.rackspace-us.identity} ${test.rackspace-us.credential} @@ -110,6 +111,7 @@ ${test.cloudfiles-us.endpoint} ${test.cloudfiles-us.api-version} + ${test.cloudfiles-us.build-version} ${test.cloudfiles-us.identity} ${test.cloudfiles-us.credential} ${test.initializer} diff --git a/providers/cloudloadbalancers-uk/pom.xml b/providers/cloudloadbalancers-uk/pom.xml index 5ac5863bae..6ca7dbdd5d 100644 --- a/providers/cloudloadbalancers-uk/pom.xml +++ b/providers/cloudloadbalancers-uk/pom.xml @@ -36,6 +36,7 @@ https://lon.auth.api.rackspacecloud.com 1.0 + ${test.rackspace-uk.identity} ${test.rackspace-uk.credential} @@ -110,6 +111,7 @@ ${test.cloudloadbalancers-uk.endpoint} ${test.cloudloadbalancers-uk.api-version} + ${test.cloudloadbalancers-uk.build-version} ${test.cloudloadbalancers-uk.identity} ${test.cloudloadbalancers-uk.credential} diff --git a/providers/cloudloadbalancers-us/pom.xml b/providers/cloudloadbalancers-us/pom.xml index 20d3413c81..d702ea77d1 100644 --- a/providers/cloudloadbalancers-us/pom.xml +++ b/providers/cloudloadbalancers-us/pom.xml @@ -36,6 +36,7 @@ https://auth.api.rackspacecloud.com 1.0 + ${test.rackspace-us.identity} ${test.rackspace-us.credential} @@ -110,6 +111,7 @@ ${test.cloudloadbalancers-us.endpoint} ${test.cloudloadbalancers-us.api-version} + ${test.cloudloadbalancers-us.build-version} ${test.cloudloadbalancers-us.identity} ${test.cloudloadbalancers-us.credential} diff --git a/providers/cloudonestorage/pom.xml b/providers/cloudonestorage/pom.xml index 31c259e120..14a5fbda89 100644 --- a/providers/cloudonestorage/pom.xml +++ b/providers/cloudonestorage/pom.xml @@ -37,6 +37,7 @@ org.jclouds.cloudonestorage.blobstore.integration.CloudOneStorageTestInitializer https://cloudonestorage.peer1.com 1.3.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -103,6 +104,7 @@ ${test.cloudonestorage.endpoint} ${test.cloudonestorage.api-version} + ${test.cloudonestorage.build-version} ${test.cloudonestorage.identity} ${test.cloudonestorage.credential} ${test.initializer} diff --git a/providers/cloudservers-uk/pom.xml b/providers/cloudservers-uk/pom.xml index e793413c07..4469ea3596 100644 --- a/providers/cloudservers-uk/pom.xml +++ b/providers/cloudservers-uk/pom.xml @@ -36,6 +36,7 @@ https://lon.auth.api.rackspacecloud.com 1.0 + ${test.rackspace-uk.identity} ${test.rackspace-uk.credential} @@ -108,6 +109,7 @@ ${test.cloudservers-uk.endpoint} ${test.cloudservers-uk.api-version} + ${test.cloudservers-uk.build-version} ${test.cloudservers-uk.identity} ${test.cloudservers-uk.credential} ${test.cloudservers-uk.image-id} diff --git a/providers/cloudservers-us/pom.xml b/providers/cloudservers-us/pom.xml index 613a3c81bd..33bbf9f0b8 100644 --- a/providers/cloudservers-us/pom.xml +++ b/providers/cloudservers-us/pom.xml @@ -36,6 +36,7 @@ https://auth.api.rackspacecloud.com 1.0 + ${test.rackspace-us.identity} ${test.rackspace-us.credential} @@ -109,6 +110,7 @@ ${test.cloudservers-us.endpoint} ${test.cloudservers-us.api-version} + ${test.cloudservers-us.build-version} ${test.cloudservers-us.identity} ${test.cloudservers-us.credential} ${test.cloudservers-us.image-id} diff --git a/providers/cloudsigma-lvs/pom.xml b/providers/cloudsigma-lvs/pom.xml index d5b8737c71..05344a9ab9 100644 --- a/providers/cloudsigma-lvs/pom.xml +++ b/providers/cloudsigma-lvs/pom.xml @@ -36,6 +36,7 @@ https://api.lvs.cloudsigma.com 1.0 + FIXME FIXME @@ -103,6 +104,7 @@ ${test.cloudsigma-lvs.endpoint} ${test.cloudsigma-lvs.api-version} + ${test.cloudsigma-lvs.build-version} ${test.cloudsigma-lvs.identity} ${test.cloudsigma-lvs.credential} ${test.cloudsigma-lvs.image-id} diff --git a/providers/cloudsigma-zrh/pom.xml b/providers/cloudsigma-zrh/pom.xml index 508295a7db..937380d35d 100644 --- a/providers/cloudsigma-zrh/pom.xml +++ b/providers/cloudsigma-zrh/pom.xml @@ -36,6 +36,7 @@ https://api.zrh.cloudsigma.com 1.0 + FIXME FIXME @@ -103,6 +104,7 @@ ${test.cloudsigma-zrh.endpoint} ${test.cloudsigma-zrh.api-version} + ${test.cloudsigma-zrh.build-version} ${test.cloudsigma-zrh.identity} ${test.cloudsigma-zrh.credential} ${test.cloudsigma-zrh.image-id} diff --git a/providers/elastichosts-lax-p/pom.xml b/providers/elastichosts-lax-p/pom.xml index 50743009f1..226b63f40b 100644 --- a/providers/elastichosts-lax-p/pom.xml +++ b/providers/elastichosts-lax-p/pom.xml @@ -36,6 +36,7 @@ https://api.lax-p.elastichosts.com 2.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -101,6 +102,7 @@ ${test.elastichosts-lax-p.endpoint} ${test.elastichosts-lax-p.api-version} + ${test.elastichosts-lax-p.build-version} ${test.elastichosts-lax-p.identity} ${test.elastichosts-lax-p.credential} ${test.elastichosts-lax-p.image-id} diff --git a/providers/elastichosts-lon-b/pom.xml b/providers/elastichosts-lon-b/pom.xml index 7f8d3ec1b1..4f8cd50423 100644 --- a/providers/elastichosts-lon-b/pom.xml +++ b/providers/elastichosts-lon-b/pom.xml @@ -36,6 +36,7 @@ https://api.lon-b.elastichosts.com 2.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -101,6 +102,7 @@ ${test.elastichosts-lon-b.endpoint} ${test.elastichosts-lon-b.api-version} + ${test.elastichosts-lon-b.build-version} ${test.elastichosts-lon-b.identity} ${test.elastichosts-lon-b.credential} ${test.elastichosts-lon-b.image-id} diff --git a/providers/elastichosts-lon-p/pom.xml b/providers/elastichosts-lon-p/pom.xml index 46a1ad3e02..b3399fb906 100644 --- a/providers/elastichosts-lon-p/pom.xml +++ b/providers/elastichosts-lon-p/pom.xml @@ -36,6 +36,7 @@ https://api.lon-p.elastichosts.com 2.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -101,6 +102,7 @@ ${test.elastichosts-lon-p.endpoint} ${test.elastichosts-lon-p.api-version} + ${test.elastichosts-lon-p.build-version} ${test.elastichosts-lon-p.identity} ${test.elastichosts-lon-p.credential} ${test.elastichosts-lon-p.image-id} diff --git a/providers/elastichosts-sat-p/pom.xml b/providers/elastichosts-sat-p/pom.xml index 3fa3b40ce7..fbc60910fb 100644 --- a/providers/elastichosts-sat-p/pom.xml +++ b/providers/elastichosts-sat-p/pom.xml @@ -36,6 +36,7 @@ https://api.sat-p.elastichosts.com 2.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -101,6 +102,7 @@ ${test.elastichosts-sat-p.endpoint} ${test.elastichosts-sat-p.api-version} + ${test.elastichosts-sat-p.build-version} ${test.elastichosts-sat-p.identity} ${test.elastichosts-sat-p.credential} ${test.elastichosts-sat-p.image-id} diff --git a/providers/elastichosts-tor-p/pom.xml b/providers/elastichosts-tor-p/pom.xml index b04915b810..63dddbce97 100644 --- a/providers/elastichosts-tor-p/pom.xml +++ b/providers/elastichosts-tor-p/pom.xml @@ -36,6 +36,7 @@ https://api.tor-p.elastichosts.com 2.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -101,6 +102,7 @@ ${test.elastichosts-tor-p.endpoint} ${test.elastichosts-tor-p.api-version} + ${test.elastichosts-tor-p.build-version} ${test.elastichosts-tor-p.identity} ${test.elastichosts-tor-p.credential} ${test.elastichosts-tor-p.image-id} diff --git a/providers/eucalyptus-partnercloud-ec2/pom.xml b/providers/eucalyptus-partnercloud-ec2/pom.xml index 508a9f8473..aa65433cc4 100644 --- a/providers/eucalyptus-partnercloud-ec2/pom.xml +++ b/providers/eucalyptus-partnercloud-ec2/pom.xml @@ -36,6 +36,7 @@ http://partnercloud.eucalyptus.com:8773/services/Eucalyptus 2010-06-15 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -116,6 +117,7 @@ ${test.eucalyptus-partnercloud-ec2.endpoint} ${test.eucalyptus-partnercloud-ec2.api-version} + ${test.eucalyptus-partnercloud-ec2.build-version} ${test.eucalyptus-partnercloud-ec2.identity} ${test.eucalyptus-partnercloud-ec2.credential} ${test.eucalyptus-partnercloud-ec2.image-id} diff --git a/providers/eucalyptus-partnercloud-s3/pom.xml b/providers/eucalyptus-partnercloud-s3/pom.xml index bd3ed13691..40e57236ba 100644 --- a/providers/eucalyptus-partnercloud-s3/pom.xml +++ b/providers/eucalyptus-partnercloud-s3/pom.xml @@ -37,6 +37,7 @@ org.jclouds.epc.blobstore.EucalyptusPartnerCloudWalrusTestInitializer http://partnercloud.eucalyptus.com:8773/services/Walrus 2006-03-01 + FIXME_IDENTITY FIXME_CREDENTIAL 15 @@ -111,6 +112,7 @@ ${test.eucalyptus-partnercloud-s3.endpoint} ${test.eucalyptus-partnercloud-s3.api-version} + ${test.eucalyptus-partnercloud-s3.build-version} ${test.eucalyptus-partnercloud-s3.identity} ${test.eucalyptus-partnercloud-s3.credential} ${test.initializer} diff --git a/providers/go2cloud-jhb1/pom.xml b/providers/go2cloud-jhb1/pom.xml index eb5d14663c..a188534384 100644 --- a/providers/go2cloud-jhb1/pom.xml +++ b/providers/go2cloud-jhb1/pom.xml @@ -36,6 +36,7 @@ http://api.jhb1.go2cloud.co.za 2.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -101,6 +102,7 @@ ${test.go2cloud-jhb1.endpoint} ${test.go2cloud-jhb1.api-version} + ${test.go2cloud-jhb1.build-version} ${test.go2cloud-jhb1.identity} ${test.go2cloud-jhb1.credential} ${test.go2cloud-jhb1.image-id} diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml index 794cd4ccb4..8c4f6b17c1 100644 --- a/providers/gogrid/pom.xml +++ b/providers/gogrid/pom.xml @@ -36,6 +36,7 @@ https://api.gogrid.com/api 1.5 + FIXME FIXME @@ -94,6 +95,7 @@ ${test.gogrid.endpoint} ${test.gogrid.api-version} + ${test.gogrid.build-version} ${test.gogrid.identity} ${test.gogrid.credential} ${test.gogrid.image-id} diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java index 24f6418ef8..8648076e32 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java @@ -35,9 +35,7 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - -import org.jclouds.Constants; +import org.jclouds.compute.BaseVersionedServiceLiveTest; import org.jclouds.compute.ComputeServiceContextFactory; import org.jclouds.domain.Credentials; import org.jclouds.gogrid.domain.Ip; @@ -56,6 +54,7 @@ import org.jclouds.gogrid.options.GetImageListOptions; import org.jclouds.gogrid.predicates.LoadBalancerLatestJobCompleted; import org.jclouds.gogrid.predicates.ServerLatestJobCompleted; import org.jclouds.http.handlers.BackoffLimitedRetryHandler; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.logging.log4j.config.Log4JLoggingModule; import org.jclouds.net.IPSocket; import org.jclouds.predicates.InetSocketAddressConnect; @@ -81,9 +80,11 @@ import com.google.inject.Module; * * @author Oleksiy Yarmula */ -// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire -@Test(enabled = false, groups = "live", testName = "GoGridLiveTestDisabled") -public class GoGridLiveTestDisabled { +@Test(enabled = false, groups = "live", singleThreaded = true, testName = "GoGridLiveTestDisabled") +public class GoGridLiveTestDisabled extends BaseVersionedServiceLiveTest { + public GoGridLiveTestDisabled() { + provider = "gogrid"; + } private GoGridClient client; @@ -96,32 +97,6 @@ public class GoGridLiveTestDisabled { private List loadBalancersToDeleteAfterTest = new ArrayList(); private RestContext context; - protected String provider = "gogrid"; - protected String identity; - protected String credential; - protected String endpoint; - 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 + ".api-version"); - } - - protected Properties setupProperties() { - Properties overrides = new Properties(); - overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true"); - overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true"); - overrides.setProperty(provider + ".identity", identity); - overrides.setProperty(provider + ".credential", credential); - if (endpoint != null) - overrides.setProperty(provider + ".endpoint", endpoint); - if (apiVersion != null) - overrides.setProperty(provider + ".api-version", apiVersion); - return overrides; - } @BeforeGroups(groups = { "live" }) public void setupClient() { diff --git a/providers/greenhousedata-element-vcloud/pom.xml b/providers/greenhousedata-element-vcloud/pom.xml index b76a0aba8e..bfa5dbd11e 100644 --- a/providers/greenhousedata-element-vcloud/pom.xml +++ b/providers/greenhousedata-element-vcloud/pom.xml @@ -36,6 +36,7 @@ https://mycloud.greenhousedata.com/api 1.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -101,6 +102,7 @@ ${test.greenhousedata-element-vcloud.endpoint} ${test.greenhousedata-element-vcloud.api-version} + ${test.greenhousedata-element-vcloud.build-version} ${test.greenhousedata-element-vcloud.identity} ${test.greenhousedata-element-vcloud.credential} ${test.greenhousedata-element-vcloud.image-id} diff --git a/providers/hpcloud-objectstorage-lvs/pom.xml b/providers/hpcloud-objectstorage-lvs/pom.xml index d5b1e9d50f..b287a9412e 100644 --- a/providers/hpcloud-objectstorage-lvs/pom.xml +++ b/providers/hpcloud-objectstorage-lvs/pom.xml @@ -37,6 +37,7 @@ org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration.HPCloudObjectStorageLasVegasTestInitializer https://region-a.geo-1.objects.hpcloudsvc.com/auth 1.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -114,6 +115,10 @@ test.hpcloud-objectstorage-lvs.api-version ${test.hpcloud-objectstorage-lvs.api-version} + + test.hpcloud-objectstorage-lvs.build-version + ${test.hpcloud-objectstorage-lvs.build-version} + test.hpcloud-objectstorage-lvs.identity ${test.hpcloud-objectstorage-lvs.identity} diff --git a/providers/ninefold-compute/pom.xml b/providers/ninefold-compute/pom.xml index 6fdf31a23d..e033a333d0 100644 --- a/providers/ninefold-compute/pom.xml +++ b/providers/ninefold-compute/pom.xml @@ -36,6 +36,7 @@ https://api.ninefold.com/compute/v1.0/ 2.2.12 + FIXME_IDENTITY FIXME_CREDENTIAL 1215 @@ -104,6 +105,7 @@ ${test.ninefold-compute.endpoint} ${test.ninefold-compute.api-version} + ${test.ninefold-compute.build-version} ${test.ninefold-compute.identity} ${test.ninefold-compute.credential} ${test.ninefold-compute.image-id} diff --git a/providers/ninefold-storage/pom.xml b/providers/ninefold-storage/pom.xml index 1e7e9f80bb..4c5581b882 100644 --- a/providers/ninefold-storage/pom.xml +++ b/providers/ninefold-storage/pom.xml @@ -37,6 +37,7 @@ org.jclouds.ninefold.storage.blobstore.integration.NinefoldStorageTestInitializer http://onlinestorage.ninefold.com 1.4.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -102,6 +103,7 @@ ${test.ninefold-storage.endpoint} ${test.ninefold-storage.api-version} + ${test.ninefold-storage.build-version} ${test.ninefold-storage.identity} ${test.ninefold-storage.credential} ${test.initializer} diff --git a/providers/openhosting-east1/pom.xml b/providers/openhosting-east1/pom.xml index 2091caa175..d560257fe6 100644 --- a/providers/openhosting-east1/pom.xml +++ b/providers/openhosting-east1/pom.xml @@ -36,6 +36,7 @@ https://api.east1.openhosting.com 2.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -101,6 +102,7 @@ ${test.openhosting-east1.endpoint} ${test.openhosting-east1.api-version} + ${test.openhosting-east1.build-version} ${test.openhosting-east1.identity} ${test.openhosting-east1.credential} ${test.openhosting-east1.image-id} diff --git a/providers/rimuhosting/pom.xml b/providers/rimuhosting/pom.xml index f0dfd86ad5..9fd412da94 100644 --- a/providers/rimuhosting/pom.xml +++ b/providers/rimuhosting/pom.xml @@ -36,6 +36,7 @@ https://api.rimuhosting.com/r 1.0 + FIXME @@ -102,6 +103,7 @@ ${test.rimuhosting.endpoint} ${test.rimuhosting.api-version} + ${test.rimuhosting.build-version} ${test.rimuhosting.identity} ${test.rimuhosting.image-id} diff --git a/providers/savvis-symphonyvpdc/pom.xml b/providers/savvis-symphonyvpdc/pom.xml index 14044f29f9..5bab196a44 100644 --- a/providers/savvis-symphonyvpdc/pom.xml +++ b/providers/savvis-symphonyvpdc/pom.xml @@ -50,6 +50,7 @@ https://api.symphonyvpdc.savvis.net/vpdc 1.0 + FIXME FIXME @@ -115,6 +116,7 @@ ${test.savvis-symphonyvpdc.endpoint} ${test.savvis-symphonyvpdc.api-version} + ${test.savvis-symphonyvpdc.build-version} ${test.savvis-symphonyvpdc.identity} ${test.savvis-symphonyvpdc.credential} ${test.savvis-symphonyvpdc.image-id} diff --git a/providers/serverlove-z1-man/pom.xml b/providers/serverlove-z1-man/pom.xml index 019824a30b..25cfd13251 100644 --- a/providers/serverlove-z1-man/pom.xml +++ b/providers/serverlove-z1-man/pom.xml @@ -36,6 +36,7 @@ https://api.z1-man.serverlove.com 1.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -101,6 +102,7 @@ ${test.serverlove-z1-man.endpoint} ${test.serverlove-z1-man.api-version} + ${test.serverlove-z1-man.build-version} ${test.serverlove-z1-man.identity} ${test.serverlove-z1-man.credential} ${test.serverlove-z1-man.image-id} diff --git a/providers/skalicloud-sdg-my/pom.xml b/providers/skalicloud-sdg-my/pom.xml index 4e30c6a453..d63a715d76 100644 --- a/providers/skalicloud-sdg-my/pom.xml +++ b/providers/skalicloud-sdg-my/pom.xml @@ -36,6 +36,7 @@ https://api.sdg-my.skalicloud.com 1.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -101,6 +102,7 @@ ${test.skalicloud-sdg-my.endpoint} ${test.skalicloud-sdg-my.api-version} + ${test.skalicloud-sdg-my.build-version} ${test.skalicloud-sdg-my.identity} ${test.skalicloud-sdg-my.credential} ${test.skalicloud-sdg-my.image-id} diff --git a/providers/slicehost/pom.xml b/providers/slicehost/pom.xml index 39af4e313c..82e2827d15 100644 --- a/providers/slicehost/pom.xml +++ b/providers/slicehost/pom.xml @@ -36,6 +36,7 @@ https://api.slicehost.com 1.4.1.1 + FIXME @@ -94,6 +95,7 @@ ${test.slicehost.endpoint} ${test.slicehost.api-version} + ${test.slicehost.build-version} ${test.slicehost.identity} ${test.slicehost.image-id} diff --git a/providers/softlayer/pom.xml b/providers/softlayer/pom.xml index e230fd32d1..b60caf54f4 100644 --- a/providers/softlayer/pom.xml +++ b/providers/softlayer/pom.xml @@ -50,6 +50,7 @@ https://api.softlayer.com/rest 3 + FIXME FIXME @@ -108,6 +109,7 @@ ${test.softlayer.endpoint} ${test.softlayer.api-version} + ${test.softlayer.build-version} ${test.softlayer.identity} ${test.softlayer.credential} ${test.softlayer.image-id} diff --git a/providers/stratogen-vcloud-mycloud/pom.xml b/providers/stratogen-vcloud-mycloud/pom.xml index ea263fc6b5..39e17a87af 100644 --- a/providers/stratogen-vcloud-mycloud/pom.xml +++ b/providers/stratogen-vcloud-mycloud/pom.xml @@ -36,6 +36,7 @@ https://vcd.stratogen.net/api 1.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -101,6 +102,7 @@ ${test.stratogen-vcloud-mycloud.endpoint} ${test.stratogen-vcloud-mycloud.api-version} + ${test.stratogen-vcloud-mycloud.build-version} ${test.stratogen-vcloud-mycloud.identity} ${test.stratogen-vcloud-mycloud.credential} ${test.stratogen-vcloud-mycloud.image-id} diff --git a/providers/synaptic-storage/pom.xml b/providers/synaptic-storage/pom.xml index 229d6179ca..8edeaa646d 100644 --- a/providers/synaptic-storage/pom.xml +++ b/providers/synaptic-storage/pom.xml @@ -37,6 +37,7 @@ org.jclouds.synaptic.storage.blobstore.integration.SynapticStorageTestInitializer https://storage.synaptic.att.com 1.3.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -102,6 +103,7 @@ ${test.synaptic-storage.endpoint} ${test.synaptic-storage.api-version} + ${test.synaptic-storage.build-version} ${test.synaptic-storage.identity} ${test.synaptic-storage.credential} ${test.initializer} diff --git a/providers/trmk-ecloud/pom.xml b/providers/trmk-ecloud/pom.xml index ee80cb1886..b50ba6bc08 100644 --- a/providers/trmk-ecloud/pom.xml +++ b/providers/trmk-ecloud/pom.xml @@ -37,6 +37,7 @@ https://services.enterprisecloud.terremark.com/api MIA 0.8b-ext2.8 + FIXME FIXME @@ -103,6 +104,7 @@ ${test.trmk-ecloud.endpoint} ${test.trmk-ecloud.api-version} + ${test.trmk-ecloud.build-version} ${test.trmk-ecloud.identity} ${test.trmk-ecloud.credential} ${test.trmk-ecloud.datacenter} diff --git a/providers/trmk-vcloudexpress/pom.xml b/providers/trmk-vcloudexpress/pom.xml index ead19e53c2..18835cdf37 100644 --- a/providers/trmk-vcloudexpress/pom.xml +++ b/providers/trmk-vcloudexpress/pom.xml @@ -36,6 +36,7 @@ https://services.vcloudexpress.terremark.com/api 0.8a-ext1.6 + FIXME FIXME @@ -102,6 +103,7 @@ ${test.trmk-vcloudexpress.endpoint} ${test.trmk-vcloudexpress.api-version} + ${test.trmk-vcloudexpress.build-version} ${test.trmk-vcloudexpress.identity} ${test.trmk-vcloudexpress.credential} ${test.trmk-vcloudexpress.image-id} diff --git a/sandbox-apis/elb/pom.xml b/sandbox-apis/elb/pom.xml index 3ad5a4c9e3..f1fdd1c192 100644 --- a/sandbox-apis/elb/pom.xml +++ b/sandbox-apis/elb/pom.xml @@ -37,11 +37,13 @@ us-east-1a https://elasticloadbalancing.us-east-1.amazonaws.com 2010-07-01 + ${test.aws.identity} ${test.aws.credential} ec2 https://ec2.us-east-1.amazonaws.com 2010-06-15 + ${test.aws.identity} ${test.aws.credential} @@ -114,11 +116,13 @@ ${test.elb.zone} ${test.elb.endpoint} ${test.elb.api-version} + ${test.elb.build-version} ${test.elb.identity} ${test.elb.credential} ${test.elb.compute.provider} ${test.elb.compute.endpoint} ${test.elb.compute.api-version} + ${test.elb.compute.build-version} ${test.elb.compute.identity} ${test.elb.compute.credential} ${test.elb.compute.image-id} diff --git a/sandbox-apis/libvirt/pom.xml b/sandbox-apis/libvirt/pom.xml index 43d5747052..398cf61273 100644 --- a/sandbox-apis/libvirt/pom.xml +++ b/sandbox-apis/libvirt/pom.xml @@ -37,6 +37,7 @@ trmkrun-ccc,test.trmk-924 test:///default 1.0 + FIXME FIXME @@ -127,6 +128,7 @@ ${test.libvirt.endpoint} ${test.libvirt.api-version} + ${test.libvirt.build-version} ${test.libvirt.identity} ${test.libvirt.credential} ${test.libvirt.image-id} diff --git a/sandbox-apis/nirvanix/pom.xml b/sandbox-apis/nirvanix/pom.xml index b31dea4676..85063ba449 100644 --- a/sandbox-apis/nirvanix/pom.xml +++ b/sandbox-apis/nirvanix/pom.xml @@ -47,6 +47,7 @@ http://services.nirvanix.com 2.5.6 + FIXME FIXME @@ -107,6 +108,7 @@ ${test.nirvanix.endpoint} ${test.nirvanix.api-version} + ${test.nirvanix.build-version} ${test.nirvanix.identity} ${test.nirvanix.credential} diff --git a/sandbox-apis/openstack-nova/pom.xml b/sandbox-apis/openstack-nova/pom.xml index 1b89c59356..9660cb2a28 100644 --- a/sandbox-apis/openstack-nova/pom.xml +++ b/sandbox-apis/openstack-nova/pom.xml @@ -36,6 +36,7 @@ http://localhost:8774/v1.1/ v1.1 + FIXME_IDENTITY FIXME_CREDENTIALS @@ -116,6 +117,7 @@ ${test.openstack-nova.endpoint} ${test.openstack-nova.api-version} + ${test.openstack-nova.build-version} ${test.openstack-nova.identity} ${test.openstack-nova.credential} ${test.openstack-nova.image-id} diff --git a/sandbox-apis/pcs/pom.xml b/sandbox-apis/pcs/pom.xml index cac6fc268b..dc5ecbd077 100644 --- a/sandbox-apis/pcs/pom.xml +++ b/sandbox-apis/pcs/pom.xml @@ -47,6 +47,7 @@ FIXME 2 + FIXME FIXME @@ -107,6 +108,7 @@ ${test.pcs.endpoint} ${test.pcs.api-version} + ${test.pcs.build-version} ${test.pcs.identity} ${test.pcs.credential} diff --git a/sandbox-apis/scality-rs2/pom.xml b/sandbox-apis/scality-rs2/pom.xml index b6f02ca8f1..d11e695083 100644 --- a/sandbox-apis/scality-rs2/pom.xml +++ b/sandbox-apis/scality-rs2/pom.xml @@ -37,6 +37,7 @@ org.jclouds.scality.rs2.blobstore.ScalityRS2TestInitializer FIXME_ENDPOINT 2006-03-01 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -102,6 +103,7 @@ ${test.scality-rs2.endpoint} ${test.scality-rs2.api-version} + ${test.scality-rs2.build-version} ${test.scality-rs2.identity} ${test.scality-rs2.credential} ${test.initializer} diff --git a/sandbox-apis/simpledb/pom.xml b/sandbox-apis/simpledb/pom.xml index d9b330b19c..d0ffb06d72 100644 --- a/sandbox-apis/simpledb/pom.xml +++ b/sandbox-apis/simpledb/pom.xml @@ -36,6 +36,7 @@ https://sdb.amazonaws.com 2009-04-15 + ${test.aws.identity} ${test.aws.credential} @@ -80,6 +81,7 @@ ${test.simpledb.endpoint} ${test.simpledb.api-version} + ${test.simpledb.build-version} ${test.simpledb.identity} ${test.simpledb.credential} diff --git a/sandbox-apis/sqs/pom.xml b/sandbox-apis/sqs/pom.xml index ae9c6039bc..bad642f647 100644 --- a/sandbox-apis/sqs/pom.xml +++ b/sandbox-apis/sqs/pom.xml @@ -36,6 +36,7 @@ https://sqs.us-east-1.amazonaws.com 2009-02-01 + ${test.aws.identity} ${test.aws.credential} @@ -80,6 +81,7 @@ ${test.sqs.endpoint} ${test.sqs.api-version} + ${test.sqs.build-version} ${test.sqs.identity} ${test.sqs.credential} diff --git a/sandbox-apis/virtualbox/pom.xml b/sandbox-apis/virtualbox/pom.xml index 25473b0fd8..5d3706ca4c 100644 --- a/sandbox-apis/virtualbox/pom.xml +++ b/sandbox-apis/virtualbox/pom.xml @@ -36,6 +36,7 @@ http://localhost:18083/ 4.1.4 + 4.1.8r75467 administrator 12345 @@ -130,6 +131,7 @@ ${test.virtualbox.endpoint} ${test.virtualbox.api-version} + ${test.virtualbox.build-version} ${test.virtualbox.identity} ${test.virtualbox.credential} ${test.virtualbox.image-id} diff --git a/sandbox-providers/aws-elb/pom.xml b/sandbox-providers/aws-elb/pom.xml index 613eb4d830..673d042902 100644 --- a/sandbox-providers/aws-elb/pom.xml +++ b/sandbox-providers/aws-elb/pom.xml @@ -36,11 +36,13 @@ https://elasticloadbalancing.us-east-1.amazonaws.com 2010-07-01 + ${test.aws.identity} ${test.aws.credential} aws-ec2 https://ec2.us-east-1.amazonaws.com 2010-06-15 + ${test.aws.identity} ${test.aws.credential} @@ -120,10 +122,12 @@ ${test.aws-elb.endpoint} ${test.aws-elb.api-version} + ${test.aws-elb.build-version} ${test.aws-elb.identity} ${test.aws-elb.credential} ${test.aws-elb.compute.provider} ${test.aws-elb.compute.endpoint} + ${test.aws-elb.compute.build-version} ${test.aws-elb.compute.api-version} ${test.aws-elb.compute.identity} ${test.aws-elb.compute.credential} diff --git a/sandbox-providers/aws-simpledb/pom.xml b/sandbox-providers/aws-simpledb/pom.xml index 10e27ce7f5..8060295005 100644 --- a/sandbox-providers/aws-simpledb/pom.xml +++ b/sandbox-providers/aws-simpledb/pom.xml @@ -36,6 +36,7 @@ https://sdb.amazonaws.com 2009-04-15 + ${test.aws.identity} ${test.aws.credential} @@ -94,6 +95,7 @@ ${test.aws-simpledb.endpoint} ${test.aws-simpledb.api-version} + ${test.aws-simpledb.build-version} ${test.aws-simpledb.identity} ${test.aws-simpledb.credential} diff --git a/sandbox-providers/azurequeue/pom.xml b/sandbox-providers/azurequeue/pom.xml index 35db768afc..195da18806 100644 --- a/sandbox-providers/azurequeue/pom.xml +++ b/sandbox-providers/azurequeue/pom.xml @@ -36,6 +36,7 @@ https://{identity}.queue.core.windows.net 2009-09-19 + ${test.azure.identity} ${test.azure.credential} @@ -87,6 +88,7 @@ ${test.azurequeue.endpoint} ${test.azurequeue.api-version} + ${test.azurequeue.build-version} ${test.azurequeue.identity} ${test.azurequeue.credential} diff --git a/sandbox-providers/boxdotnet/pom.xml b/sandbox-providers/boxdotnet/pom.xml index 80b325609c..e36166e047 100644 --- a/sandbox-providers/boxdotnet/pom.xml +++ b/sandbox-providers/boxdotnet/pom.xml @@ -50,6 +50,7 @@ https://www.box.net/api/1.0/rest 1.0 + FIXME FIXME @@ -98,6 +99,7 @@ ${test.boxdotnet.endpoint} ${test.boxdotnet.api-version} + ${test.boxdotnet.build-version} ${test.boxdotnet.identity} ${test.boxdotnet.credential} diff --git a/sandbox-providers/dunkel-vcd/pom.xml b/sandbox-providers/dunkel-vcd/pom.xml index 493608c6e4..71d887b0d9 100644 --- a/sandbox-providers/dunkel-vcd/pom.xml +++ b/sandbox-providers/dunkel-vcd/pom.xml @@ -35,6 +35,7 @@ https://vcd.dunkel.de/api 1.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -100,6 +101,7 @@ ${test.dunkel-vcd.endpoint} ${test.dunkel-vcd.api-version} + ${test.dunkel-vcd.build-version} ${test.dunkel-vcd.identity} ${test.dunkel-vcd.credential} ${test.dunkel-vcd.image-id} diff --git a/sandbox-providers/glesys/pom.xml b/sandbox-providers/glesys/pom.xml index e66f0ee7e0..3a03d0d3ec 100644 --- a/sandbox-providers/glesys/pom.xml +++ b/sandbox-providers/glesys/pom.xml @@ -50,6 +50,7 @@ https://api.glesys.com 1 + FIXME FIXME @@ -108,6 +109,7 @@ ${test.glesys.endpoint} ${test.glesys.api-version} + ${test.glesys.build-version} ${test.glesys.identity} ${test.glesys.credential} ${test.glesys.image-id} diff --git a/sandbox-providers/googlestorage/pom.xml b/sandbox-providers/googlestorage/pom.xml index 1ae0934890..c42aab0d71 100644 --- a/sandbox-providers/googlestorage/pom.xml +++ b/sandbox-providers/googlestorage/pom.xml @@ -37,6 +37,7 @@ org.jclouds.googlestorage.blobstore.GoogleStorageTestInitializer https://commondatastorage.googleapis.com 2006-03-01 + FIX_ME FIX_ME @@ -102,6 +103,7 @@ ${test.googlestorage.endpoint} ${test.googlestorage.api-version} + ${test.googlestorage.build-version} ${test.googlestorage.identity} ${test.googlestorage.credential} ${test.initializer} diff --git a/sandbox-providers/hosteurope-storage/pom.xml b/sandbox-providers/hosteurope-storage/pom.xml index 9ff491182b..2b51626972 100644 --- a/sandbox-providers/hosteurope-storage/pom.xml +++ b/sandbox-providers/hosteurope-storage/pom.xml @@ -37,6 +37,7 @@ org.jclouds.hosteurope.storage.blobstore.HostEuropeStorageTestInitializer https://cs.hosteurope.de 2006-03-01 + FIX_ME FIX_ME @@ -109,6 +110,7 @@ ${test.hosteurope-storage.endpoint} ${test.hosteurope-storage.api-version} + ${test.hosteurope-storage.build-version} ${test.hosteurope-storage.identity} ${test.hosteurope-storage.credential} ${test.initializer} diff --git a/sandbox-providers/ibm-smartcloud/pom.xml b/sandbox-providers/ibm-smartcloud/pom.xml index c6c5d59e0b..c8ea4dd28f 100644 --- a/sandbox-providers/ibm-smartcloud/pom.xml +++ b/sandbox-providers/ibm-smartcloud/pom.xml @@ -50,6 +50,7 @@ https://www-147.ibm.com/computecloud/enterprise/api/rest 20100331 + FIXME FIXME @@ -111,6 +112,7 @@ ${test.ibm-smartcloud.endpoint} ${test.ibm-smartcloud.api-version} + ${test.ibm-smartcloud.build-version} ${test.ibm-smartcloud.identity} ${test.ibm-smartcloud.credential} ${test.ibm-smartcloud.image-id} diff --git a/sandbox-providers/scaleup-storage/pom.xml b/sandbox-providers/scaleup-storage/pom.xml index 7b6e12f9ff..9840623221 100644 --- a/sandbox-providers/scaleup-storage/pom.xml +++ b/sandbox-providers/scaleup-storage/pom.xml @@ -37,6 +37,7 @@ org.jclouds.scaleup.storage.blobstore.ScaleUpStorageTestInitializer https://scs.scaleupstorage.com 2006-03-01 + FIX_ME FIX_ME @@ -109,6 +110,7 @@ ${test.scaleup-storage.endpoint} ${test.scaleup-storage.api-version} + ${test.scaleup-storage.build-version} ${test.scaleup-storage.identity} ${test.scaleup-storage.credential} ${test.initializer} diff --git a/sandbox-providers/tiscali-storage/pom.xml b/sandbox-providers/tiscali-storage/pom.xml index 162874a801..2deac1f95f 100644 --- a/sandbox-providers/tiscali-storage/pom.xml +++ b/sandbox-providers/tiscali-storage/pom.xml @@ -37,6 +37,7 @@ org.jclouds.tiscali.storage.blobstore.TiscaliStorageTestInitializer https://storage.tiscali.it 2006-03-01 + FIX_ME FIX_ME @@ -110,6 +111,7 @@ ${test.tiscali-storage.endpoint} ${test.tiscali-storage.api-version} + ${test.tiscali-storage.build-version} ${test.tiscali-storage.identity} ${test.tiscali-storage.credential} ${test.initializer} diff --git a/sandbox-providers/twitter/pom.xml b/sandbox-providers/twitter/pom.xml index d3450cc782..cdfcb46c2a 100644 --- a/sandbox-providers/twitter/pom.xml +++ b/sandbox-providers/twitter/pom.xml @@ -51,6 +51,7 @@ http://api.twitter.com 1.0 + FIXME FIXME @@ -99,6 +100,7 @@ ${test.twitter.endpoint} ${test.twitter.api-version} + ${test.twitter.build-version} ${test.twitter.identity} ${test.twitter.credential} diff --git a/sandbox-providers/virtacore-vcloudexpress/pom.xml b/sandbox-providers/virtacore-vcloudexpress/pom.xml index 4f7eae25cc..a2a0d29e75 100644 --- a/sandbox-providers/virtacore-vcloudexpress/pom.xml +++ b/sandbox-providers/virtacore-vcloudexpress/pom.xml @@ -35,6 +35,7 @@ https://vcloud.virtacore.com/api 1.0 + FIXME_IDENTITY FIXME_CREDENTIAL @@ -100,6 +101,7 @@ ${test.virtacore-vcloudexpress.endpoint} ${test.virtacore-vcloudexpress.api-version} + ${test.virtacore-vcloudexpress.build-version} ${test.virtacore-vcloudexpress.identity} ${test.virtacore-vcloudexpress.credential} ${test.virtacore-vcloudexpress.image-id} diff --git a/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml index ca2919fd67..e3dd9b9fc1 100644 --- a/skeletons/standalone-compute/pom.xml +++ b/skeletons/standalone-compute/pom.xml @@ -38,6 +38,7 @@ FIXME https://servermanager.com 1.0 + FIXME @@ -99,6 +100,7 @@ ${test.servermanager.endpoint} ${test.servermanager.api-version} + ${test.servermanager.build-version} ${test.servermanager.identity} ${jclouds.compute.blacklist-nodes} diff --git a/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceContextBuilderTest.java b/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceContextBuilderTest.java index 70d2543ae2..9992f1a530 100644 --- a/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceContextBuilderTest.java +++ b/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceContextBuilderTest.java @@ -55,7 +55,7 @@ public class ServerManagerComputeServiceContextBuilderTest { public void testCanBuildWithContextSpec() { ComputeServiceContext context = new ComputeServiceContextFactory() .createContext(new StandaloneComputeServiceContextSpec( - "servermanager", "http://host", "1", "", "identity", "credential", ServerManager.class, + "servermanager", "http://host", "1", "", "", "identity", "credential", ServerManager.class, ServerManagerComputeServiceContextBuilder.class, ImmutableSet. of())); context.close();