Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 800:introduce property for build version

This commit is contained in:
Adrian Cole 2012-01-05 17:51:55 -08:00
parent 99fb37f6cf
commit f06e6982eb
105 changed files with 339 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/atmos/pom.xml
View File

@ -37,6 +37,7 @@
<test.initializer>org.jclouds.atmos.blobstore.integration.AtmosStorageTestInitializer</test.initializer>
<test.atmos.endpoint>https://accesspoint.atmos.com</test.atmos.endpoint>
<test.atmos.api-version>1.3.0</test.atmos.api-version>
<test.atmos.build-version></test.atmos.build-version>
<test.atmos.identity>FIXME</test.atmos.identity>
<test.atmos.credential>FIXME</test.atmos.credential>
</properties>
@ -96,6 +97,7 @@
<jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5>
<test.atmos.endpoint>${test.atmos.endpoint}</test.atmos.endpoint>
<test.atmos.api-version>${test.atmos.api-version}</test.atmos.api-version>
<test.atmos.build-version>${test.atmos.build-version}</test.atmos.build-version>
<test.atmos.identity>${test.atmos.identity}</test.atmos.identity>
<test.atmos.credential>${test.atmos.credential}</test.atmos.credential>
</systemPropertyVariables>

2
apis/cloudfiles/pom.xml
View File

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

2
apis/cloudloadbalancers/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.cloudloadbalancers.endpoint>https://auth.api.rackspacecloud.com</test.cloudloadbalancers.endpoint>
<test.cloudloadbalancers.api-version>1.0</test.cloudloadbalancers.api-version>
<test.cloudloadbalancers.build-version></test.cloudloadbalancers.build-version>
<test.cloudloadbalancers.identity>${test.rackspace.identity}</test.cloudloadbalancers.identity>
<test.cloudloadbalancers.credential>${test.rackspace.credential}</test.cloudloadbalancers.credential>
</properties>
@ -97,6 +98,7 @@
<systemPropertyVariables>
<test.cloudloadbalancers.endpoint>${test.cloudloadbalancers.endpoint}</test.cloudloadbalancers.endpoint>
<test.cloudloadbalancers.api-version>${test.cloudloadbalancers.api-version}</test.cloudloadbalancers.api-version>
<test.cloudloadbalancers.build-version>${test.cloudloadbalancers.build-version}</test.cloudloadbalancers.build-version>
<test.cloudloadbalancers.identity>${test.cloudloadbalancers.identity}</test.cloudloadbalancers.identity>
<test.cloudloadbalancers.credential>${test.cloudloadbalancers.credential}</test.cloudloadbalancers.credential>
</systemPropertyVariables>

2
apis/cloudservers/pom.xml
View File

@ -37,6 +37,7 @@
<properties>
<test.cloudservers.endpoint>https://auth.api.rackspacecloud.com</test.cloudservers.endpoint>
<test.cloudservers.api-version>1.0</test.cloudservers.api-version>
<test.cloudservers.build-version></test.cloudservers.build-version>
<test.cloudservers.identity>${test.rackspace.identity}</test.cloudservers.identity>
<test.cloudservers.credential>${test.rackspace.credential}</test.cloudservers.credential>
<test.cloudservers.image-id></test.cloudservers.image-id>
@ -109,6 +110,7 @@
<systemPropertyVariables>
<test.cloudstack.endpoint>${test.cloudstack.endpoint}</test.cloudstack.endpoint>
<test.cloudstack.api-version>${test.cloudstack.api-version}</test.cloudstack.api-version>
<test.cloudstack.build-version>${test.cloudstack.build-version}</test.cloudstack.build-version>
<test.cloudstack.identity>${test.cloudstack.identity}</test.cloudstack.identity>
<test.cloudstack.credential>${test.cloudstack.credential}</test.cloudstack.credential>
<test.cloudstack.image-id>${test.cloudstack.image-id}</test.cloudstack.image-id>

4
apis/cloudsigma/pom.xml
View File

@ -36,9 +36,10 @@
<properties>
<test.cloudsigma.endpoint>https://api.cloudsigma.com</test.cloudsigma.endpoint>
<test.cloudsigma.api-version>1.0</test.cloudsigma.api-version>
<test.cloudsigma.build-version></test.cloudsigma.build-version>
<test.cloudsigma.identity>FIXME</test.cloudsigma.identity>
<test.cloudsigma.credential>FIXME</test.cloudsigma.credential>
<test.cloudsigma.image-id></test.cloudsigma.image-id>
<test.cloudsigma.image-id>f3c7c665-cd54-4a78-8fd2-7ec2f028cf29</test.cloudsigma.image-id>
<test.cloudsigma.image.login-user></test.cloudsigma.image.login-user>
<test.cloudsigma.image.authenticate-sudo></test.cloudsigma.image.authenticate-sudo>
</properties>
@ -95,6 +96,7 @@
<systemPropertyVariables>
<test.cloudsigma.endpoint>${test.cloudsigma.endpoint}</test.cloudsigma.endpoint>
<test.cloudsigma.api-version>${test.cloudsigma.api-version}</test.cloudsigma.api-version>
<test.cloudsigma.build-version>${test.cloudsigma.build-version}</test.cloudsigma.build-version>
<test.cloudsigma.identity>${test.cloudsigma.identity}</test.cloudsigma.identity>
<test.cloudsigma.credential>${test.cloudsigma.credential}</test.cloudsigma.credential>
<test.cloudsigma.image-id>${test.cloudsigma.image-id}</test.cloudsigma.image-id>

2
apis/cloudstack/pom.xml
View File

@ -50,6 +50,7 @@
<properties>
<test.cloudstack.endpoint>http://localhost:8080/client/api</test.cloudstack.endpoint>
<test.cloudstack.api-version>2.2.12</test.cloudstack.api-version>
<test.cloudstack.build-version></test.cloudstack.build-version>
<test.cloudstack.identity>FIXME_apiKey</test.cloudstack.identity>
<test.cloudstack.credential>FIXME_secretKey</test.cloudstack.credential>
<test.cloudstack.domainAdminIdentity></test.cloudstack.domainAdminIdentity>
@ -117,6 +118,7 @@
<systemPropertyVariables>
<test.cloudstack.endpoint>${test.cloudstack.endpoint}</test.cloudstack.endpoint>
<test.cloudstack.api-version>${test.cloudstack.api-version}</test.cloudstack.api-version>
<test.cloudstack.build-version>${test.cloudstack.build-version}</test.cloudstack.build-version>
<test.cloudstack.identity>${test.cloudstack.identity}</test.cloudstack.identity>
<test.cloudstack.credential>${test.cloudstack.credential}</test.cloudstack.credential>
<test.cloudstack.image-id>${test.cloudstack.image-id}</test.cloudstack.image-id>

2
apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java
View File

@ -49,7 +49,7 @@ import com.google.inject.Module;
public class QuerySignerTest {
@SuppressWarnings({ "unchecked", "rawtypes" })
public static final RestContextSpec<Map, List> DUMMY_SPEC = new RestContextSpec<Map, List>("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.<Module> of(new MockModule(),
new NullLoggingModule(), new AbstractModule() {
@Override

2
apis/cloudwatch/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.cloudwatch.endpoint>https://monitoring.us-east-1.amazonaws.com</test.cloudwatch.endpoint>
<test.cloudwatch.api-version>2009-05-15</test.cloudwatch.api-version>
<test.cloudwatch.build-version></test.cloudwatch.build-version>
<test.cloudwatch.identity>${test.aws.identity}</test.cloudwatch.identity>
<test.cloudwatch.credential>${test.aws.credential}</test.cloudwatch.credential>
</properties>
@ -87,6 +88,7 @@
<systemPropertyVariables>
<test.cloudwatch.endpoint>${test.cloudwatch.endpoint}</test.cloudwatch.endpoint>
<test.cloudwatch.api-version>${test.cloudwatch.api-version}</test.cloudwatch.api-version>
<test.cloudwatch.build-version>${test.cloudwatch.build-version}</test.cloudwatch.build-version>
<test.cloudwatch.identity>${test.cloudwatch.identity}</test.cloudwatch.identity>
<test.cloudwatch.credential>${test.cloudwatch.credential}</test.cloudwatch.credential>
</systemPropertyVariables>

2
apis/deltacloud/pom.xml
View File

@ -50,6 +50,7 @@
<properties>
<test.deltacloud.endpoint>http://localhost:3001/api</test.deltacloud.endpoint>
<test.deltacloud.api-version>0.3.0</test.deltacloud.api-version>
<test.deltacloud.build-version></test.deltacloud.build-version>
<test.deltacloud.identity>mockuser</test.deltacloud.identity>
<test.deltacloud.credential>mockpassword</test.deltacloud.credential>
<test.deltacloud.image-id></test.deltacloud.image-id>
@ -108,6 +109,7 @@
<systemPropertyVariables>
<test.deltacloud.endpoint>${test.deltacloud.endpoint}</test.deltacloud.endpoint>
<test.deltacloud.api-version>${test.deltacloud.api-version}</test.deltacloud.api-version>
<test.deltacloud.build-version>${test.deltacloud.build-version}</test.deltacloud.build-version>
<test.deltacloud.identity>${test.deltacloud.identity}</test.deltacloud.identity>
<test.deltacloud.credential>${test.deltacloud.credential}</test.deltacloud.credential>
<test.deltacloud.image-id>${test.deltacloud.image-id}</test.deltacloud.image-id>

2
apis/ec2/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.ec2.endpoint>https://ec2.us-east-1.amazonaws.com</test.ec2.endpoint>
<test.ec2.api-version>2010-06-15</test.ec2.api-version>
<test.ec2.build-version></test.ec2.build-version>
<test.ec2.identity>${test.aws.identity}</test.ec2.identity>
<test.ec2.credential>${test.aws.credential}</test.ec2.credential>
<test.ec2.image-id></test.ec2.image-id>
@ -103,6 +104,7 @@
<systemPropertyVariables>
<test.ec2.endpoint>${test.ec2.endpoint}</test.ec2.endpoint>
<test.ec2.api-version>${test.ec2.api-version}</test.ec2.api-version>
<test.ec2.build-version>${test.ec2.build-version}</test.ec2.build-version>
<test.ec2.identity>${test.ec2.identity}</test.ec2.identity>
<test.ec2.credential>${test.ec2.credential}</test.ec2.credential>
<test.ec2.image-id>${test.ec2.image-id}</test.ec2.image-id>

4
apis/elasticstack/pom.xml
View File

@ -50,9 +50,10 @@
<properties>
<test.elasticstack.endpoint>https://api.lon-p.elastichosts.com</test.elasticstack.endpoint>
<test.elasticstack.api-version>1.0</test.elasticstack.api-version>
<test.elasticstack.build-version></test.elasticstack.build-version>
<test.elasticstack.identity>FIXME</test.elasticstack.identity>
<test.elasticstack.credential>FIXME</test.elasticstack.credential>
<test.elasticstack.image-id></test.elasticstack.image-id>
<test.elasticstack.image-id>38df0986-4d85-4b76-b502-3878ffc80161</test.elasticstack.image-id>
<test.elasticstack.image.login-user></test.elasticstack.image.login-user>
<test.elasticstack.image.authenticate-sudo></test.elasticstack.image.authenticate-sudo>
</properties>
@ -108,6 +109,7 @@
<systemPropertyVariables>
<test.elasticstack.endpoint>${test.elasticstack.endpoint}</test.elasticstack.endpoint>
<test.elasticstack.api-version>${test.elasticstack.api-version}</test.elasticstack.api-version>
<test.elasticstack.build-version>${test.elasticstack.build-version}</test.elasticstack.build-version>
<test.elasticstack.identity>${test.elasticstack.identity}</test.elasticstack.identity>
<test.elasticstack.credential>${test.elasticstack.credential}</test.elasticstack.credential>
<test.elasticstack.image-id>${test.elasticstack.image-id}</test.elasticstack.image-id>

2
apis/eucalyptus/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.eucalyptus.endpoint>http://ecc.eucalyptus.com:8773/services/Eucalyptus</test.eucalyptus.endpoint>
<test.eucalyptus.api-version>2010-06-15</test.eucalyptus.api-version>
<test.eucalyptus.build-version></test.eucalyptus.build-version>
<test.eucalyptus.identity>FIXME_IDENTITY</test.eucalyptus.identity>
<test.eucalyptus.credential>FIXME_CREDENTIAL</test.eucalyptus.credential>
<test.eucalyptus.image-id></test.eucalyptus.image-id>
@ -103,6 +104,7 @@
<systemPropertyVariables>
<test.eucalyptus.endpoint>${test.eucalyptus.endpoint}</test.eucalyptus.endpoint>
<test.eucalyptus.api-version>${test.eucalyptus.api-version}</test.eucalyptus.api-version>
<test.eucalyptus.build-version>${test.eucalyptus.build-version}</test.eucalyptus.build-version>
<test.eucalyptus.identity>${test.eucalyptus.identity}</test.eucalyptus.identity>
<test.eucalyptus.credential>${test.eucalyptus.credential}</test.eucalyptus.credential>
<test.eucalyptus.image-id>${test.eucalyptus.image-id}</test.eucalyptus.image-id>

2
apis/nova/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.nova.endpoint>http://localhost:8773/services/Cloud</test.nova.endpoint>
<test.nova.api-version>1.1</test.nova.api-version>
<test.nova.build-version></test.nova.build-version>
<test.nova.identity>FIXME_IDENTITY</test.nova.identity>
<test.nova.credential>FIXME_CREDENTIALS</test.nova.credential>
<test.nova.image-id></test.nova.image-id>
@ -116,6 +117,7 @@
<systemPropertyVariables>
<test.nova.endpoint>${test.nova.endpoint}</test.nova.endpoint>
<test.nova.api-version>${test.nova.api-version}</test.nova.api-version>
<test.nova.build-version>${test.nova.build-version}</test.nova.build-version>
<test.nova.identity>${test.nova.identity}</test.nova.identity>
<test.nova.credential>${test.nova.credential}</test.nova.credential>
<test.nova.image-id>${test.nova.image-id}</test.nova.image-id>

2
apis/s3/pom.xml
View File

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

2
apis/swift/pom.xml
View File

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

2
apis/vcloud/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.vcloud.endpoint>FIXME</test.vcloud.endpoint>
<test.vcloud.api-version>1.0</test.vcloud.api-version>
<test.vcloud.build-version></test.vcloud.build-version>
<test.vcloud.identity>FIXME</test.vcloud.identity>
<test.vcloud.credential>FIXME</test.vcloud.credential>
<test.vcloud.image-id></test.vcloud.image-id>
@ -106,6 +107,7 @@
<systemPropertyVariables>
<test.vcloud.endpoint>${test.vcloud.endpoint}</test.vcloud.endpoint>
<test.vcloud.api-version>${test.vcloud.api-version}</test.vcloud.api-version>
<test.vcloud.build-version>${test.vcloud.build-version}</test.vcloud.build-version>
<test.vcloud.identity>${test.vcloud.identity}</test.vcloud.identity>
<test.vcloud.credential>${test.vcloud.credential}</test.vcloud.credential>
<test.vcloud.image-id>${test.vcloud.image-id}</test.vcloud.image-id>

2
apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudVersionsAsyncClientTest.java
View File

@ -81,7 +81,7 @@ public class VCloudVersionsAsyncClientTest extends RestClientTest<VCloudVersions
@Override
public RestContextSpec<VCloudVersionsClient, VCloudVersionsAsyncClient> createContextSpec() {
return contextSpec("test", "http://localhost:8080", "1", "", "identity", "credential",
return contextSpec("test", "http://localhost:8080", "1", "", "", "identity", "credential",
VCloudVersionsClient.class, VCloudVersionsAsyncClient.class);
}

2
apis/vcloud/src/test/java/org/jclouds/vcloud/internal/VCloudLoginAsyncClientTest.java
View File

@ -107,7 +107,7 @@ public class VCloudLoginAsyncClientTest extends RestClientTest<VCloudLoginAsyncC
@Override
public RestContextSpec<VCloudLoginClient, VCloudLoginAsyncClient> 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);
}
}

2
apis/walrus/pom.xml
View File

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

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

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

16
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java
View File

@ -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,8 +47,10 @@ 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 {
@ -55,7 +58,16 @@ public abstract class BaseTestInitializer {
}
}
/**
* 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;

2
common/aws/src/test/java/org/jclouds/aws/filters/FormSignerTest.java
View File

@ -50,7 +50,7 @@ import com.google.inject.name.Names;
public class FormSignerTest {
@SuppressWarnings("unchecked")
public static final RestContextSpec<Map, List> DUMMY_SPEC = new RestContextSpec<Map, List>("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.<Module> of(new MockModule(), new NullLoggingModule(),
new AbstractModule() {
@Override

2
common/azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthenticationTest.java
View File

@ -138,7 +138,7 @@ public class SharedKeyLiteAuthenticationTest {
@SuppressWarnings("unchecked")
public static final RestContextSpec<Map, List> DUMMY_SPEC = new RestContextSpec<Map, List>("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.<Module> of(new MockModule(), new NullLoggingModule(),
new AzureStorageRestClientModule<Exception, RuntimeException>(Exception.class,
RuntimeException.class)));

2
common/openstack/src/test/java/org/jclouds/openstack/OpenStackAuthAsyncClientTest.java
View File

@ -76,7 +76,7 @@ public class OpenStackAuthAsyncClientTest extends RestClientTest<OpenStackAuthAs
@Override
public RestContextSpec<OpenStackAuthClient, OpenStackAuthAsyncClient> 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);
}

2
common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudLoginAsyncClientTest.java
View File

@ -108,7 +108,7 @@ public class TerremarkVCloudLoginAsyncClientTest extends RestClientTest<Terremar
@Override
public RestContextSpec<VCloudLoginClient, TerremarkVCloudLoginAsyncClient> 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);
}
}

2
common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudVersionsAsyncClientTest.java
View File

@ -82,7 +82,7 @@ public class TerremarkVCloudVersionsAsyncClientTest extends RestClientTest<Terre
@Override
public RestContextSpec<VCloudVersionsClient, TerremarkVCloudVersionsAsyncClient> createContextSpec() {
return contextSpec("test", "http://localhost:8080", "1", "", "identity", "credential",
return contextSpec("test", "http://localhost:8080", "1", "", "", "identity", "credential",
VCloudVersionsClient.class, TerremarkVCloudVersionsAsyncClient.class);
}

22
compute/src/main/java/org/jclouds/compute/StandaloneComputeServiceContextSpec.java
View File

@ -28,26 +28,26 @@ import com.google.inject.Module;
* @author Adrian Cole
*/
public class StandaloneComputeServiceContextSpec<D, N, H, I, L> extends RestContextSpec<D, D> {
public StandaloneComputeServiceContextSpec(String provider, String endpoint, String apiVersion, String iso3166Codes,
String identity, String credential, Class<D> driverClass,
public StandaloneComputeServiceContextSpec(String provider, String endpoint, String apiVersion, String buildVersion,
String iso3166Codes, String identity, String credential, Class<D> driverClass,
Class<? extends StandaloneComputeServiceContextBuilder<D>> contextBuilderClass) {
this(provider, endpoint, apiVersion, iso3166Codes, identity, credential, driverClass, contextBuilderClass,
ImmutableSet.<Module> of());
this(provider, endpoint, apiVersion, buildVersion, iso3166Codes, identity, credential, driverClass,
contextBuilderClass, ImmutableSet.<Module> of());
}
public StandaloneComputeServiceContextSpec(String provider, String endpoint, String apiVersion, String iso3166Codes,
String identity, String credential, Class<D> driverClass,
public StandaloneComputeServiceContextSpec(String provider, String endpoint, String apiVersion, String buildVersion,
String iso3166Codes, String identity, String credential, Class<D> driverClass,
Class<? extends StandaloneComputeServiceContextBuilder<D>> contextBuilderClass, Iterable<Module> 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<D> driverClass,
public StandaloneComputeServiceContextSpec(String provider, String endpoint, String apiVersion, String buildVersion,
String iso3166Codes, String identity, String credential, Class<D> driverClass,
Class<? extends PropertiesBuilder> propertiesBuilderClass,
Class<? extends StandaloneComputeServiceContextBuilder<D>> contextBuilderClass, Iterable<Module> 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);
}
}

2
compute/src/test/java/org/jclouds/compute/ComputeServiceContextFactoryTest.java
View File

@ -43,7 +43,7 @@ public class ComputeServiceContextFactoryTest {
@SuppressWarnings("rawtypes")
ComputeServiceContext context = new ComputeServiceContextFactory()
.createContext(new StandaloneComputeServiceContextSpec<ConcurrentMap, NodeMetadata, Hardware, Image, Location>(
"stub", "stub", "1", "", "identity", "credential", ConcurrentMap.class,
"stub", "stub", "1", "", "", "identity", "credential", ConcurrentMap.class,
StubComputeServiceContextBuilder.class, ImmutableSet.<Module> of()));
context.getComputeService().listNodes();

13
core/src/main/java/org/jclouds/Constants.java
View File

@ -191,12 +191,23 @@ public interface Constants {
public static final String PROPERTY_API = "jclouds.api";
/**
* String property.
* String property. default empty string
* <p/>
* Explicitly identifies the version of an api.
*/
public static final String PROPERTY_API_VERSION = "jclouds.api-version";
/**
* String property.
* <p/>
* 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.
* <p/>

7
core/src/main/java/org/jclouds/PropertiesBuilder.java
View File

@ -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)

11
core/src/main/java/org/jclouds/rest/RestContext.java
View File

@ -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;
@ -59,8 +60,18 @@ public interface RestContext<S, A> extends Location {
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();
/**

16
core/src/main/java/org/jclouds/rest/RestContextBuilder.java
View File

@ -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<S, A> {
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));

26
core/src/main/java/org/jclouds/rest/RestContextFactory.java
View File

@ -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 <S, A> RestContextSpec<S, A> contextSpec(String provider, String endpoint, String apiVersion,
String iso3166Codes, String identity, String credential, Class<S> sync, Class<A> async,
String buildVersion, String iso3166Codes, String identity, String credential, Class<S> sync, Class<A> async,
Class<PropertiesBuilder> propertiesBuilderClass, Class<RestContextBuilder<S, A>> contextBuilderClass,
Iterable<Module> modules) {
return new RestContextSpec<S, A>(provider, endpoint, apiVersion, iso3166Codes, identity, credential, sync, async,
propertiesBuilderClass, contextBuilderClass, modules);
return new RestContextSpec<S, A>(provider, endpoint, apiVersion, buildVersion, iso3166Codes, identity,
credential, sync, async, propertiesBuilderClass, contextBuilderClass, modules);
}
public static <S, A> RestContextSpec<S, A> contextSpec(String provider, String endpoint, String apiVersion,
public static <S, A> RestContextSpec<S, A> contextSpec(String provider, String endpoint, String apiVersion,String buildVersion,
String iso3166Codes, String identity, String credential, Class<S> sync, Class<A> async) {
return new RestContextSpec<S, A>(provider, endpoint, apiVersion, iso3166Codes, identity, credential, sync, async);
return new RestContextSpec<S, A>(provider, endpoint, apiVersion, buildVersion, iso3166Codes, identity, credential, sync, async);
}
@SuppressWarnings( { "unchecked", "rawtypes" })
public static <S, A> RestContextSpec<S, A> contextSpec(String provider, String endpoint, String apiVersion,
String iso3166Codes, String identity, String credential, Class<S> sync, Class<A> async,
Iterable<Module> modules) {
return new RestContextSpec<S, A>(provider, endpoint, apiVersion, iso3166Codes, identity, credential, sync, async,
PropertiesBuilder.class, (Class) RestContextBuilder.class, modules);
String buildVersion, String iso3166Codes, String identity, String credential, Class<S> sync,
Class<A> async, Iterable<Module> modules) {
return new RestContextSpec<S, A>(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<S, A> contextSpec = new RestContextSpec<S, A>(providerName, endpoint, apiVersion, iso3166Codes,
RestContextSpec<S, A> contextSpec = new RestContextSpec<S, A>(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)

17
core/src/main/java/org/jclouds/rest/RestContextSpec.java
View File

@ -35,6 +35,7 @@ public class RestContextSpec<S, A> {
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<S, A> {
protected final Class<RestContextBuilder<S, A>> contextBuilderClass;
protected final Iterable<Module> 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<S> sync, Class<A> async, Class<PropertiesBuilder> propertiesBuilderClass,
Class<RestContextBuilder<S, A>> contextBuilderClass, Iterable<Module> 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<S, A> {
}
@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<S> sync, Class<A> 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<S, A> {
@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();
}
}

3
core/src/main/java/org/jclouds/rest/annotations/ApiVersion.java
View File

@ -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)

16
core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
View File

@ -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<T> {
private final Provider<UriBuilder> uriBuilderProvider;
private final LoadingCache<Class<?>, Boolean> seedAnnotationCache;
private final String apiVersion;
private final String buildVersion;
private char[] skips;
@Inject
@ -306,8 +308,8 @@ public class RestAnnotationProcessor<T> {
@SuppressWarnings("unchecked")
@Inject
public RestAnnotationProcessor(Injector injector, LoadingCache<Class<?>, Boolean> seedAnnotationCache,
@Named(Constants.PROPERTY_API_VERSION) String apiVersion, ParseSax.Factory parserFactory, HttpUtils utils,
TypeLiteral<T> typeLiteral) throws ExecutionException {
@ApiVersion String apiVersion, @BuildVersion String buildVersion, ParseSax.Factory parserFactory,
HttpUtils utils, TypeLiteral<T> typeLiteral) throws ExecutionException {
this.declaring = (Class<T>) typeLiteral.getRawType();
this.injector = injector;
this.parserFactory = parserFactory;
@ -321,6 +323,7 @@ public class RestAnnotationProcessor<T> {
skips = new char[] {};
}
this.apiVersion = apiVersion;
this.buildVersion = buildVersion;
}
public Method getDelegateOrNull(Method in) {
@ -435,6 +438,7 @@ public class RestAnnotationProcessor<T> {
Multimap<String, String> tokenValues = LinkedHashMultimap.create();
tokenValues.put(Constants.PROPERTY_API_VERSION, apiVersion);
tokenValues.put(Constants.PROPERTY_BUILD_VERSION, buildVersion);
tokenValues.putAll(addPathAndGetTokens(declaring, method, args, builder));

55
core/src/main/java/org/jclouds/rest/internal/RestContextImpl.java
View File

@ -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<S, A> implements RestContext<S, A> {
private final String identity;
private final String provider;
private final String apiVersion;
private final String buildVersion;
private final Utils utils;
private final Map<String, Credentials> credentialStore;
private final Set<String> iso3166Codes;
@ -66,7 +69,8 @@ public class RestContextImpl<S, A> implements RestContext<S, A> {
@Inject
protected RestContextImpl(Closer closer, Map<String, Credentials> credentialStore, Utils utils, Injector injector,
TypeLiteral<S> syncApi, TypeLiteral<A> asyncApi, @Provider URI endpoint, @Provider String provider,
@Identity String identity, @ApiVersion String apiVersion, @Iso3166 Set<String> iso3166Codes) {
@Identity String identity, @ApiVersion String apiVersion, @BuildVersion String buildVersion,
@Iso3166 Set<String> iso3166Codes) {
this.credentialStore = credentialStore;
this.utils = utils;
this.asyncApi = injector.getInstance(Key.get(asyncApi));
@ -76,6 +80,7 @@ public class RestContextImpl<S, A> implements RestContext<S, A> {
this.identity = identity;
this.provider = provider;
this.apiVersion = apiVersion;
this.buildVersion = buildVersion;
this.iso3166Codes = iso3166Codes;
}
@ -128,15 +133,15 @@ public class RestContextImpl<S, A> implements RestContext<S, A> {
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<S, A> implements RestContext<S, A> {
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<S, A> implements RestContext<S, A> {
@Override
public Map<String, Object> getMetadata() {
return ImmutableMap.<String, Object> of("endpoint", endpoint, "apiVersion", apiVersion, "identity", identity);
return ImmutableMap.<String, Object> of("endpoint", endpoint, "apiVersion", apiVersion, "buildVersion",
buildVersion, "identity", identity);
}
@Override

2
core/src/test/java/org/jclouds/http/BaseJettyTest.java
View File

@ -282,7 +282,7 @@ public abstract class BaseJettyTest {
properties.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
properties.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
RestContextSpec<IntegrationTestClient, IntegrationTestAsyncClient> contextSpec = contextSpec("test",
"http://localhost:" + testPort, "1", "", "identity", null, IntegrationTestClient.class,
"http://localhost:" + testPort, "1", "", "", "identity", null, IntegrationTestClient.class,
IntegrationTestAsyncClient.class, ImmutableSet.<Module> copyOf(connectionModules));
return createContextBuilder(contextSpec, properties);
}

2
core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java
View File

@ -213,7 +213,7 @@ public abstract class BaseRestClientExpectTest<S> {
@SuppressWarnings("unchecked")
private RestContextSpec<S, ?> makeContextSpec() {
if (getClass().isAnnotationPresent(RegisterContext.class))
return (RestContextSpec<S, ?>) contextSpec(provider, "http://mock", "1", "", "userfoo", null, getClass()
return (RestContextSpec<S, ?>) contextSpec(provider, "http://mock", "1", "", "", "userfoo", null, getClass()
.getAnnotation(RegisterContext.class).sync(),
getClass().getAnnotation(RegisterContext.class).async(), ImmutableSet.<Module> of());
else

2
core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java
View File

@ -141,7 +141,7 @@ public class InputParamValidatorTest {
void setupFactory() {
RestContextSpec<IntegrationTestClient, IntegrationTestAsyncClient> 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();

25
core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java
View File

@ -53,7 +53,7 @@ public class RestContextFactoryTest {
public void testBuilder() {
RestContextSpec<IntegrationTestClient, IntegrationTestAsyncClient> 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<IntegrationTestClient, IntegrationTestAsyncClient> 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<IntegrationTestClient, IntegrationTestAsyncClient> 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<IntegrationTestClient, IntegrationTestAsyncClient> 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<IntegrationTestClient, IntegrationTestAsyncClient> 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.<Module> 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<IntegrationTestClient, IntegrationTestAsyncClient> 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.<Module> 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<IntegrationTestClient, IntegrationTestAsyncClient> 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);
}

8
core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
View File

@ -315,9 +315,9 @@ public class RestAnnotationProcessorTest extends BaseRestClientTest {
private Injector injectorForCaller(HttpCommandExecutorService service) {
RestContextSpec<Caller, AsyncCaller> contextSpec = contextSpec("test", "http://localhost:9999", "1", "",
"userfoo", null, Caller.class, AsyncCaller.class,
ImmutableSet.<Module> of(new MockModule(service), new NullLoggingModule(), new CallerModule()));
RestContextSpec<Caller, AsyncCaller> contextSpec = contextSpec("test", "http://localhost:9999", "1", "", "",
"userfoo", null, Caller.class, AsyncCaller.class, ImmutableSet.<Module> 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<String, Integer> contextSpec = contextSpec("test", "http://localhost:9999", "1", "", "userfoo",
RestContextSpec<String, Integer> contextSpec = contextSpec("test", "http://localhost:9999", "1", "", "", "userfoo",
null, String.class, Integer.class,
ImmutableSet.<Module> of(new MockModule(), new NullLoggingModule(), new AbstractModule() {

2
providers/aws-cloudwatch/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.aws-cloudwatch.endpoint>https://monitoring.us-east-1.amazonaws.com</test.aws-cloudwatch.endpoint>
<test.aws-cloudwatch.api-version>2009-05-15</test.aws-cloudwatch.api-version>
<test.aws-cloudwatch.build-version></test.aws-cloudwatch.build-version>
<test.aws-cloudwatch.identity>${test.aws.identity}</test.aws-cloudwatch.identity>
<test.aws-cloudwatch.credential>${test.aws.credential}</test.aws-cloudwatch.credential>
</properties>
@ -88,6 +89,7 @@
<systemPropertyVariables>
<test.aws-cloudwatch.endpoint>${test.aws-cloudwatch.endpoint}</test.aws-cloudwatch.endpoint>
<test.aws-cloudwatch.api-version>${test.aws-cloudwatch.api-version}</test.aws-cloudwatch.api-version>
<test.aws-cloudwatch.build-version>${test.aws-cloudwatch.build-version}</test.aws-cloudwatch.build-version>
<test.aws-cloudwatch.identity>${test.aws-cloudwatch.identity}</test.aws-cloudwatch.identity>
<test.aws-cloudwatch.credential>${test.aws-cloudwatch.credential}</test.aws-cloudwatch.credential>
<test.aws-cloudwatch.compute.provider>${test.aws-cloudwatch.compute.provider}</test.aws-cloudwatch.compute.provider>

2
providers/aws-ec2/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.aws-ec2.endpoint>https://ec2.us-east-1.amazonaws.com</test.aws-ec2.endpoint>
<test.aws-ec2.api-version>2011-05-15</test.aws-ec2.api-version>
<test.aws-ec2.build-version></test.aws-ec2.build-version>
<test.aws-ec2.identity>${test.aws.identity}</test.aws-ec2.identity>
<test.aws-ec2.credential>${test.aws.credential}</test.aws-ec2.credential>
<test.aws-ec2.image-id></test.aws-ec2.image-id>
@ -114,6 +115,7 @@
<systemPropertyVariables>
<test.aws-ec2.endpoint>${test.aws-ec2.endpoint}</test.aws-ec2.endpoint>
<test.aws-ec2.api-version>${test.aws-ec2.api-version}</test.aws-ec2.api-version>
<test.aws-ec2.build-version>${test.aws-ec2.build-version}</test.aws-ec2.build-version>
<test.aws-ec2.identity>${test.aws-ec2.identity}</test.aws-ec2.identity>
<test.aws-ec2.credential>${test.aws-ec2.credential}</test.aws-ec2.credential>
<test.aws-ec2.image-id>${test.aws-ec2.image-id}</test.aws-ec2.image-id>

2
providers/aws-s3/pom.xml
View File

@ -37,6 +37,7 @@
<test.initializer>org.jclouds.aws.s3.blobstore.integration.AWSS3TestInitializer</test.initializer>
<test.aws-s3.endpoint>https://s3.amazonaws.com</test.aws-s3.endpoint>
<test.aws-s3.api-version>2006-03-01</test.aws-s3.api-version>
<test.aws-s3.build-version></test.aws-s3.build-version>
<test.aws-s3.identity>${test.aws.identity}</test.aws-s3.identity>
<test.aws-s3.credential>${test.aws.credential}</test.aws-s3.credential>
<test.blobstore.container-count>25</test.blobstore.container-count>
@ -124,6 +125,7 @@
<systemPropertyVariables>
<test.aws-s3.endpoint>${test.aws-s3.endpoint}</test.aws-s3.endpoint>
<test.aws-s3.api-version>${test.aws-s3.api-version}</test.aws-s3.api-version>
<test.aws-s3.build-version>${test.aws-s3.build-version}</test.aws-s3.build-version>
<test.aws-s3.identity>${test.aws-s3.identity}</test.aws-s3.identity>
<test.aws-s3.credential>${test.aws-s3.credential}</test.aws-s3.credential>
<test.initializer>${test.initializer}</test.initializer>

2
providers/azureblob/pom.xml
View File

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

2
providers/bluelock-vcloud-zone01/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.bluelock-vcloud-zone01.endpoint>https://zone01.bluelock.com/api</test.bluelock-vcloud-zone01.endpoint>
<test.bluelock-vcloud-zone01.api-version>1.0</test.bluelock-vcloud-zone01.api-version>
<test.bluelock-vcloud-zone01.build-version></test.bluelock-vcloud-zone01.build-version>
<test.bluelock-vcloud-zone01.identity>FIXME_IDENTITY</test.bluelock-vcloud-zone01.identity>
<test.bluelock-vcloud-zone01.credential>FIXME_CREDENTIAL</test.bluelock-vcloud-zone01.credential>
<test.bluelock-vcloud-zone01.image-id></test.bluelock-vcloud-zone01.image-id>
@ -103,6 +104,7 @@
<systemPropertyVariables>
<test.bluelock-vcloud-zone01.endpoint>${test.bluelock-vcloud-zone01.endpoint}</test.bluelock-vcloud-zone01.endpoint>
<test.bluelock-vcloud-zone01.api-version>${test.bluelock-vcloud-zone01.api-version}</test.bluelock-vcloud-zone01.api-version>
<test.bluelock-vcloud-zone01.build-version>${test.bluelock-vcloud-zone01.build-version}</test.bluelock-vcloud-zone01.build-version>
<test.bluelock-vcloud-zone01.identity>${test.bluelock-vcloud-zone01.identity}</test.bluelock-vcloud-zone01.identity>
<test.bluelock-vcloud-zone01.credential>${test.bluelock-vcloud-zone01.credential}</test.bluelock-vcloud-zone01.credential>
<test.bluelock-vcloud-zone01.image-id>${test.bluelock-vcloud-zone01.image-id}</test.bluelock-vcloud-zone01.image-id>

2
providers/cloudfiles-uk/pom.xml
View File

@ -37,6 +37,7 @@
<test.initializer>org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUKTestInitializer</test.initializer>
<test.cloudfiles-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudfiles-uk.endpoint>
<test.cloudfiles-uk.api-version>1.0</test.cloudfiles-uk.api-version>
<test.cloudfiles-uk.build-version></test.cloudfiles-uk.build-version>
<test.cloudfiles-uk.identity>${test.rackspace-uk.identity}</test.cloudfiles-uk.identity>
<test.cloudfiles-uk.credential>${test.rackspace-uk.credential}</test.cloudfiles-uk.credential>
</properties>
@ -110,6 +111,7 @@
<systemPropertyVariables>
<test.cloudfiles-uk.endpoint>${test.cloudfiles-uk.endpoint}</test.cloudfiles-uk.endpoint>
<test.cloudfiles-uk.api-version>${test.cloudfiles-uk.api-version}</test.cloudfiles-uk.api-version>
<test.cloudfiles-uk.build-version>${test.cloudfiles-uk.build-version}</test.cloudfiles-uk.build-version>
<test.cloudfiles-uk.identity>${test.cloudfiles-uk.identity}</test.cloudfiles-uk.identity>
<test.cloudfiles-uk.credential>${test.cloudfiles-uk.credential}</test.cloudfiles-uk.credential>
<test.initializer>${test.initializer}</test.initializer>

2
providers/cloudfiles-us/pom.xml
View File

@ -37,6 +37,7 @@
<test.initializer>org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUSTestInitializer</test.initializer>
<test.cloudfiles-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudfiles-us.endpoint>
<test.cloudfiles-us.api-version>1.0</test.cloudfiles-us.api-version>
<test.cloudfiles-us.build-version></test.cloudfiles-us.build-version>
<test.cloudfiles-us.identity>${test.rackspace-us.identity}</test.cloudfiles-us.identity>
<test.cloudfiles-us.credential>${test.rackspace-us.credential}</test.cloudfiles-us.credential>
</properties>
@ -110,6 +111,7 @@
<systemPropertyVariables>
<test.cloudfiles-us.endpoint>${test.cloudfiles-us.endpoint}</test.cloudfiles-us.endpoint>
<test.cloudfiles-us.api-version>${test.cloudfiles-us.api-version}</test.cloudfiles-us.api-version>
<test.cloudfiles-us.build-version>${test.cloudfiles-us.build-version}</test.cloudfiles-us.build-version>
<test.cloudfiles-us.identity>${test.cloudfiles-us.identity}</test.cloudfiles-us.identity>
<test.cloudfiles-us.credential>${test.cloudfiles-us.credential}</test.cloudfiles-us.credential>
<test.initializer>${test.initializer}</test.initializer>

2
providers/cloudloadbalancers-uk/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.cloudloadbalancers-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudloadbalancers-uk.endpoint>
<test.cloudloadbalancers-uk.api-version>1.0</test.cloudloadbalancers-uk.api-version>
<test.cloudloadbalancers-uk.build-version></test.cloudloadbalancers-uk.build-version>
<test.cloudloadbalancers-uk.identity>${test.rackspace-uk.identity}</test.cloudloadbalancers-uk.identity>
<test.cloudloadbalancers-uk.credential>${test.rackspace-uk.credential}</test.cloudloadbalancers-uk.credential>
</properties>
@ -110,6 +111,7 @@
<systemPropertyVariables>
<test.cloudloadbalancers-uk.endpoint>${test.cloudloadbalancers-uk.endpoint}</test.cloudloadbalancers-uk.endpoint>
<test.cloudloadbalancers-uk.api-version>${test.cloudloadbalancers-uk.api-version}</test.cloudloadbalancers-uk.api-version>
<test.cloudloadbalancers-uk.build-version>${test.cloudloadbalancers-uk.build-version}</test.cloudloadbalancers-uk.build-version>
<test.cloudloadbalancers-uk.identity>${test.cloudloadbalancers-uk.identity}</test.cloudloadbalancers-uk.identity>
<test.cloudloadbalancers-uk.credential>${test.cloudloadbalancers-uk.credential}</test.cloudloadbalancers-uk.credential>
</systemPropertyVariables>

2
providers/cloudloadbalancers-us/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.cloudloadbalancers-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudloadbalancers-us.endpoint>
<test.cloudloadbalancers-us.api-version>1.0</test.cloudloadbalancers-us.api-version>
<test.cloudloadbalancers-us.build-version></test.cloudloadbalancers-us.build-version>
<test.cloudloadbalancers-us.identity>${test.rackspace-us.identity}</test.cloudloadbalancers-us.identity>
<test.cloudloadbalancers-us.credential>${test.rackspace-us.credential}</test.cloudloadbalancers-us.credential>
</properties>
@ -110,6 +111,7 @@
<systemPropertyVariables>
<test.cloudloadbalancers-us.endpoint>${test.cloudloadbalancers-us.endpoint}</test.cloudloadbalancers-us.endpoint>
<test.cloudloadbalancers-us.api-version>${test.cloudloadbalancers-us.api-version}</test.cloudloadbalancers-us.api-version>
<test.cloudloadbalancers-us.build-version>${test.cloudloadbalancers-us.build-version}</test.cloudloadbalancers-us.build-version>
<test.cloudloadbalancers-us.identity>${test.cloudloadbalancers-us.identity}</test.cloudloadbalancers-us.identity>
<test.cloudloadbalancers-us.credential>${test.cloudloadbalancers-us.credential}</test.cloudloadbalancers-us.credential>
</systemPropertyVariables>

2
providers/cloudonestorage/pom.xml
View File

@ -37,6 +37,7 @@
<test.initializer>org.jclouds.cloudonestorage.blobstore.integration.CloudOneStorageTestInitializer</test.initializer>
<test.cloudonestorage.endpoint>https://cloudonestorage.peer1.com</test.cloudonestorage.endpoint>
<test.cloudonestorage.api-version>1.3.0</test.cloudonestorage.api-version>
<test.cloudonestorage.build-version></test.cloudonestorage.build-version>
<test.cloudonestorage.identity>FIXME_IDENTITY</test.cloudonestorage.identity>
<test.cloudonestorage.credential>FIXME_CREDENTIAL</test.cloudonestorage.credential>
</properties>
@ -103,6 +104,7 @@
<systemPropertyVariables>
<test.cloudonestorage.endpoint>${test.cloudonestorage.endpoint}</test.cloudonestorage.endpoint>
<test.cloudonestorage.api-version>${test.cloudonestorage.api-version}</test.cloudonestorage.api-version>
<test.cloudonestorage.build-version>${test.cloudonestorage.build-version}</test.cloudonestorage.build-version>
<test.cloudonestorage.identity>${test.cloudonestorage.identity}</test.cloudonestorage.identity>
<test.cloudonestorage.credential>${test.cloudonestorage.credential}</test.cloudonestorage.credential>
<test.initializer>${test.initializer}</test.initializer>

2
providers/cloudservers-uk/pom.xml
View File

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

2
providers/cloudservers-us/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.cloudservers-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudservers-us.endpoint>
<test.cloudservers-us.api-version>1.0</test.cloudservers-us.api-version>
<test.cloudservers-us.build-version></test.cloudservers-us.build-version>
<test.cloudservers-us.identity>${test.rackspace-us.identity}</test.cloudservers-us.identity>
<test.cloudservers-us.credential>${test.rackspace-us.credential}</test.cloudservers-us.credential>
<test.cloudservers-us.image-id></test.cloudservers-us.image-id>
@ -109,6 +110,7 @@
<systemPropertyVariables>
<test.cloudservers-us.endpoint>${test.cloudservers-us.endpoint}</test.cloudservers-us.endpoint>
<test.cloudservers-us.api-version>${test.cloudservers-us.api-version}</test.cloudservers-us.api-version>
<test.cloudservers-us.build-version>${test.cloudservers-us.build-version}</test.cloudservers-us.build-version>
<test.cloudservers-us.identity>${test.cloudservers-us.identity}</test.cloudservers-us.identity>
<test.cloudservers-us.credential>${test.cloudservers-us.credential}</test.cloudservers-us.credential>
<test.cloudservers-us.image-id>${test.cloudservers-us.image-id}</test.cloudservers-us.image-id>

2
providers/cloudsigma-lvs/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.cloudsigma-lvs.endpoint>https://api.lvs.cloudsigma.com</test.cloudsigma-lvs.endpoint>
<test.cloudsigma-lvs.api-version>1.0</test.cloudsigma-lvs.api-version>
<test.cloudsigma-lvs.build-version></test.cloudsigma-lvs.build-version>
<test.cloudsigma-lvs.identity>FIXME</test.cloudsigma-lvs.identity>
<test.cloudsigma-lvs.credential>FIXME</test.cloudsigma-lvs.credential>
<test.cloudsigma-lvs.image-id></test.cloudsigma-lvs.image-id>
@ -103,6 +104,7 @@
<systemPropertyVariables>
<test.cloudsigma-lvs.endpoint>${test.cloudsigma-lvs.endpoint}</test.cloudsigma-lvs.endpoint>
<test.cloudsigma-lvs.api-version>${test.cloudsigma-lvs.api-version}</test.cloudsigma-lvs.api-version>
<test.cloudsigma-lvs.build-version>${test.cloudsigma-lvs.build-version}</test.cloudsigma-lvs.build-version>
<test.cloudsigma-lvs.identity>${test.cloudsigma-lvs.identity}</test.cloudsigma-lvs.identity>
<test.cloudsigma-lvs.credential>${test.cloudsigma-lvs.credential}</test.cloudsigma-lvs.credential>
<test.cloudsigma-lvs.image-id>${test.cloudsigma-lvs.image-id}</test.cloudsigma-lvs.image-id>

2
providers/cloudsigma-zrh/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.cloudsigma-zrh.endpoint>https://api.zrh.cloudsigma.com</test.cloudsigma-zrh.endpoint>
<test.cloudsigma-zrh.api-version>1.0</test.cloudsigma-zrh.api-version>
<test.cloudsigma-zrh.build-version></test.cloudsigma-zrh.build-version>
<test.cloudsigma-zrh.identity>FIXME</test.cloudsigma-zrh.identity>
<test.cloudsigma-zrh.credential>FIXME</test.cloudsigma-zrh.credential>
<test.cloudsigma-zrh.image-id></test.cloudsigma-zrh.image-id>
@ -103,6 +104,7 @@
<systemPropertyVariables>
<test.cloudsigma-zrh.endpoint>${test.cloudsigma-zrh.endpoint}</test.cloudsigma-zrh.endpoint>
<test.cloudsigma-zrh.api-version>${test.cloudsigma-zrh.api-version}</test.cloudsigma-zrh.api-version>
<test.cloudsigma-zrh.build-version>${test.cloudsigma-zrh.build-version}</test.cloudsigma-zrh.build-version>
<test.cloudsigma-zrh.identity>${test.cloudsigma-zrh.identity}</test.cloudsigma-zrh.identity>
<test.cloudsigma-zrh.credential>${test.cloudsigma-zrh.credential}</test.cloudsigma-zrh.credential>
<test.cloudsigma-zrh.image-id>${test.cloudsigma-zrh.image-id}</test.cloudsigma-zrh.image-id>

2
providers/elastichosts-lax-p/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.elastichosts-lax-p.endpoint>https://api.lax-p.elastichosts.com</test.elastichosts-lax-p.endpoint>
<test.elastichosts-lax-p.api-version>2.0</test.elastichosts-lax-p.api-version>
<test.elastichosts-lax-p.build-version></test.elastichosts-lax-p.build-version>
<test.elastichosts-lax-p.identity>FIXME_IDENTITY</test.elastichosts-lax-p.identity>
<test.elastichosts-lax-p.credential>FIXME_CREDENTIAL</test.elastichosts-lax-p.credential>
<test.elastichosts-lax-p.image-id></test.elastichosts-lax-p.image-id>
@ -101,6 +102,7 @@
<systemPropertyVariables>
<test.elastichosts-lax-p.endpoint>${test.elastichosts-lax-p.endpoint}</test.elastichosts-lax-p.endpoint>
<test.elastichosts-lax-p.api-version>${test.elastichosts-lax-p.api-version}</test.elastichosts-lax-p.api-version>
<test.elastichosts-lax-p.build-version>${test.elastichosts-lax-p.build-version}</test.elastichosts-lax-p.build-version>
<test.elastichosts-lax-p.identity>${test.elastichosts-lax-p.identity}</test.elastichosts-lax-p.identity>
<test.elastichosts-lax-p.credential>${test.elastichosts-lax-p.credential}</test.elastichosts-lax-p.credential>
<test.elastichosts-lax-p.image-id>${test.elastichosts-lax-p.image-id}</test.elastichosts-lax-p.image-id>

2
providers/elastichosts-lon-b/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.elastichosts-lon-b.endpoint>https://api.lon-b.elastichosts.com</test.elastichosts-lon-b.endpoint>
<test.elastichosts-lon-b.api-version>2.0</test.elastichosts-lon-b.api-version>
<test.elastichosts-lon-b.build-version></test.elastichosts-lon-b.build-version>
<test.elastichosts-lon-b.identity>FIXME_IDENTITY</test.elastichosts-lon-b.identity>
<test.elastichosts-lon-b.credential>FIXME_CREDENTIAL</test.elastichosts-lon-b.credential>
<test.elastichosts-lon-b.image-id></test.elastichosts-lon-b.image-id>
@ -101,6 +102,7 @@
<systemPropertyVariables>
<test.elastichosts-lon-b.endpoint>${test.elastichosts-lon-b.endpoint}</test.elastichosts-lon-b.endpoint>
<test.elastichosts-lon-b.api-version>${test.elastichosts-lon-b.api-version}</test.elastichosts-lon-b.api-version>
<test.elastichosts-lon-b.build-version>${test.elastichosts-lon-b.build-version}</test.elastichosts-lon-b.build-version>
<test.elastichosts-lon-b.identity>${test.elastichosts-lon-b.identity}</test.elastichosts-lon-b.identity>
<test.elastichosts-lon-b.credential>${test.elastichosts-lon-b.credential}</test.elastichosts-lon-b.credential>
<test.elastichosts-lon-b.image-id>${test.elastichosts-lon-b.image-id}</test.elastichosts-lon-b.image-id>

2
providers/elastichosts-lon-p/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.elastichosts-lon-p.endpoint>https://api.lon-p.elastichosts.com</test.elastichosts-lon-p.endpoint>
<test.elastichosts-lon-p.api-version>2.0</test.elastichosts-lon-p.api-version>
<test.elastichosts-lon-p.build-version></test.elastichosts-lon-p.build-version>
<test.elastichosts-lon-p.identity>FIXME_IDENTITY</test.elastichosts-lon-p.identity>
<test.elastichosts-lon-p.credential>FIXME_CREDENTIAL</test.elastichosts-lon-p.credential>
<test.elastichosts-lon-p.image-id></test.elastichosts-lon-p.image-id>
@ -101,6 +102,7 @@
<systemPropertyVariables>
<test.elastichosts-lon-p.endpoint>${test.elastichosts-lon-p.endpoint}</test.elastichosts-lon-p.endpoint>
<test.elastichosts-lon-p.api-version>${test.elastichosts-lon-p.api-version}</test.elastichosts-lon-p.api-version>
<test.elastichosts-lon-p.build-version>${test.elastichosts-lon-p.build-version}</test.elastichosts-lon-p.build-version>
<test.elastichosts-lon-p.identity>${test.elastichosts-lon-p.identity}</test.elastichosts-lon-p.identity>
<test.elastichosts-lon-p.credential>${test.elastichosts-lon-p.credential}</test.elastichosts-lon-p.credential>
<test.elastichosts-lon-p.image-id>${test.elastichosts-lon-p.image-id}</test.elastichosts-lon-p.image-id>

2
providers/elastichosts-sat-p/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.elastichosts-sat-p.endpoint>https://api.sat-p.elastichosts.com</test.elastichosts-sat-p.endpoint>
<test.elastichosts-sat-p.api-version>2.0</test.elastichosts-sat-p.api-version>
<test.elastichosts-sat-p.build-version></test.elastichosts-sat-p.build-version>
<test.elastichosts-sat-p.identity>FIXME_IDENTITY</test.elastichosts-sat-p.identity>
<test.elastichosts-sat-p.credential>FIXME_CREDENTIAL</test.elastichosts-sat-p.credential>
<test.elastichosts-sat-p.image-id></test.elastichosts-sat-p.image-id>
@ -101,6 +102,7 @@
<systemPropertyVariables>
<test.elastichosts-sat-p.endpoint>${test.elastichosts-sat-p.endpoint}</test.elastichosts-sat-p.endpoint>
<test.elastichosts-sat-p.api-version>${test.elastichosts-sat-p.api-version}</test.elastichosts-sat-p.api-version>
<test.elastichosts-sat-p.build-version>${test.elastichosts-sat-p.build-version}</test.elastichosts-sat-p.build-version>
<test.elastichosts-sat-p.identity>${test.elastichosts-sat-p.identity}</test.elastichosts-sat-p.identity>
<test.elastichosts-sat-p.credential>${test.elastichosts-sat-p.credential}</test.elastichosts-sat-p.credential>
<test.elastichosts-sat-p.image-id>${test.elastichosts-sat-p.image-id}</test.elastichosts-sat-p.image-id>

2
providers/elastichosts-tor-p/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.elastichosts-tor-p.endpoint>https://api.tor-p.elastichosts.com</test.elastichosts-tor-p.endpoint>
<test.elastichosts-tor-p.api-version>2.0</test.elastichosts-tor-p.api-version>
<test.elastichosts-tor-p.build-version></test.elastichosts-tor-p.build-version>
<test.elastichosts-tor-p.identity>FIXME_IDENTITY</test.elastichosts-tor-p.identity>
<test.elastichosts-tor-p.credential>FIXME_CREDENTIAL</test.elastichosts-tor-p.credential>
<test.elastichosts-tor-p.image-id></test.elastichosts-tor-p.image-id>
@ -101,6 +102,7 @@
<systemPropertyVariables>
<test.elastichosts-tor-p.endpoint>${test.elastichosts-tor-p.endpoint}</test.elastichosts-tor-p.endpoint>
<test.elastichosts-tor-p.api-version>${test.elastichosts-tor-p.api-version}</test.elastichosts-tor-p.api-version>
<test.elastichosts-tor-p.build-version>${test.elastichosts-tor-p.build-version}</test.elastichosts-tor-p.build-version>
<test.elastichosts-tor-p.identity>${test.elastichosts-tor-p.identity}</test.elastichosts-tor-p.identity>
<test.elastichosts-tor-p.credential>${test.elastichosts-tor-p.credential}</test.elastichosts-tor-p.credential>
<test.elastichosts-tor-p.image-id>${test.elastichosts-tor-p.image-id}</test.elastichosts-tor-p.image-id>

2
providers/eucalyptus-partnercloud-ec2/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.eucalyptus-partnercloud-ec2.endpoint>http://partnercloud.eucalyptus.com:8773/services/Eucalyptus</test.eucalyptus-partnercloud-ec2.endpoint>
<test.eucalyptus-partnercloud-ec2.api-version>2010-06-15</test.eucalyptus-partnercloud-ec2.api-version>
<test.eucalyptus-partnercloud-ec2.build-version></test.eucalyptus-partnercloud-ec2.build-version>
<test.eucalyptus-partnercloud-ec2.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-ec2.identity>
<test.eucalyptus-partnercloud-ec2.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-ec2.credential>
<test.eucalyptus-partnercloud-ec2.image-id></test.eucalyptus-partnercloud-ec2.image-id>
@ -116,6 +117,7 @@
<systemPropertyVariables>
<test.eucalyptus-partnercloud-ec2.endpoint>${test.eucalyptus-partnercloud-ec2.endpoint}</test.eucalyptus-partnercloud-ec2.endpoint>
<test.eucalyptus-partnercloud-ec2.api-version>${test.eucalyptus-partnercloud-ec2.api-version}</test.eucalyptus-partnercloud-ec2.api-version>
<test.eucalyptus-partnercloud-ec2.build-version>${test.eucalyptus-partnercloud-ec2.build-version}</test.eucalyptus-partnercloud-ec2.build-version>
<test.eucalyptus-partnercloud-ec2.identity>${test.eucalyptus-partnercloud-ec2.identity}</test.eucalyptus-partnercloud-ec2.identity>
<test.eucalyptus-partnercloud-ec2.credential>${test.eucalyptus-partnercloud-ec2.credential}</test.eucalyptus-partnercloud-ec2.credential>
<test.eucalyptus-partnercloud-ec2.image-id>${test.eucalyptus-partnercloud-ec2.image-id}</test.eucalyptus-partnercloud-ec2.image-id>

2
providers/eucalyptus-partnercloud-s3/pom.xml
View File

@ -37,6 +37,7 @@
<test.initializer>org.jclouds.epc.blobstore.EucalyptusPartnerCloudWalrusTestInitializer</test.initializer>
<test.eucalyptus-partnercloud-s3.endpoint>http://partnercloud.eucalyptus.com:8773/services/Walrus</test.eucalyptus-partnercloud-s3.endpoint>
<test.eucalyptus-partnercloud-s3.api-version>2006-03-01</test.eucalyptus-partnercloud-s3.api-version>
<test.eucalyptus-partnercloud-s3.build-version></test.eucalyptus-partnercloud-s3.build-version>
<test.eucalyptus-partnercloud-s3.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-s3.identity>
<test.eucalyptus-partnercloud-s3.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-s3.credential>
<test.blobstore.container-count>15</test.blobstore.container-count>
@ -111,6 +112,7 @@
<systemPropertyVariables>
<test.eucalyptus-partnercloud-s3.endpoint>${test.eucalyptus-partnercloud-s3.endpoint}</test.eucalyptus-partnercloud-s3.endpoint>
<test.eucalyptus-partnercloud-s3.api-version>${test.eucalyptus-partnercloud-s3.api-version}</test.eucalyptus-partnercloud-s3.api-version>
<test.eucalyptus-partnercloud-s3.build-version>${test.eucalyptus-partnercloud-s3.build-version}</test.eucalyptus-partnercloud-s3.build-version>
<test.eucalyptus-partnercloud-s3.identity>${test.eucalyptus-partnercloud-s3.identity}</test.eucalyptus-partnercloud-s3.identity>
<test.eucalyptus-partnercloud-s3.credential>${test.eucalyptus-partnercloud-s3.credential}</test.eucalyptus-partnercloud-s3.credential>
<test.initializer>${test.initializer}</test.initializer>

2
providers/go2cloud-jhb1/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.go2cloud-jhb1.endpoint>http://api.jhb1.go2cloud.co.za</test.go2cloud-jhb1.endpoint>
<test.go2cloud-jhb1.api-version>2.0</test.go2cloud-jhb1.api-version>
<test.go2cloud-jhb1.build-version></test.go2cloud-jhb1.build-version>
<test.go2cloud-jhb1.identity>FIXME_IDENTITY</test.go2cloud-jhb1.identity>
<test.go2cloud-jhb1.credential>FIXME_CREDENTIAL</test.go2cloud-jhb1.credential>
<test.go2cloud-jhb1.image-id></test.go2cloud-jhb1.image-id>
@ -101,6 +102,7 @@
<systemPropertyVariables>
<test.go2cloud-jhb1.endpoint>${test.go2cloud-jhb1.endpoint}</test.go2cloud-jhb1.endpoint>
<test.go2cloud-jhb1.api-version>${test.go2cloud-jhb1.api-version}</test.go2cloud-jhb1.api-version>
<test.go2cloud-jhb1.build-version>${test.go2cloud-jhb1.build-version}</test.go2cloud-jhb1.build-version>
<test.go2cloud-jhb1.identity>${test.go2cloud-jhb1.identity}</test.go2cloud-jhb1.identity>
<test.go2cloud-jhb1.credential>${test.go2cloud-jhb1.credential}</test.go2cloud-jhb1.credential>
<test.go2cloud-jhb1.image-id>${test.go2cloud-jhb1.image-id}</test.go2cloud-jhb1.image-id>

2
providers/gogrid/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.gogrid.endpoint>https://api.gogrid.com/api</test.gogrid.endpoint>
<test.gogrid.api-version>1.5</test.gogrid.api-version>
<test.gogrid.build-version></test.gogrid.build-version>
<test.gogrid.identity>FIXME</test.gogrid.identity>
<test.gogrid.credential>FIXME</test.gogrid.credential>
<test.gogrid.image-id></test.gogrid.image-id>
@ -94,6 +95,7 @@
<systemPropertyVariables>
<test.gogrid.endpoint>${test.gogrid.endpoint}</test.gogrid.endpoint>
<test.gogrid.api-version>${test.gogrid.api-version}</test.gogrid.api-version>
<test.gogrid.build-version>${test.gogrid.build-version}</test.gogrid.build-version>
<test.gogrid.identity>${test.gogrid.identity}</test.gogrid.identity>
<test.gogrid.credential>${test.gogrid.credential}</test.gogrid.credential>
<test.gogrid.image-id>${test.gogrid.image-id}</test.gogrid.image-id>

39
providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java
View File

@ -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<String> loadBalancersToDeleteAfterTest = new ArrayList<String>();
private RestContext<GoGridClient, GoGridAsyncClient> 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() {

2
providers/greenhousedata-element-vcloud/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.greenhousedata-element-vcloud.endpoint>https://mycloud.greenhousedata.com/api</test.greenhousedata-element-vcloud.endpoint>
<test.greenhousedata-element-vcloud.api-version>1.0</test.greenhousedata-element-vcloud.api-version>
<test.greenhousedata-element-vcloud.build-version></test.greenhousedata-element-vcloud.build-version>
<test.greenhousedata-element-vcloud.identity>FIXME_IDENTITY</test.greenhousedata-element-vcloud.identity>
<test.greenhousedata-element-vcloud.credential>FIXME_CREDENTIAL</test.greenhousedata-element-vcloud.credential>
<test.greenhousedata-element-vcloud.image-id></test.greenhousedata-element-vcloud.image-id>
@ -101,6 +102,7 @@
<systemPropertyVariables>
<test.greenhousedata-element-vcloud.endpoint>${test.greenhousedata-element-vcloud.endpoint}</test.greenhousedata-element-vcloud.endpoint>
<test.greenhousedata-element-vcloud.api-version>${test.greenhousedata-element-vcloud.api-version}</test.greenhousedata-element-vcloud.api-version>
<test.greenhousedata-element-vcloud.build-version>${test.greenhousedata-element-vcloud.build-version}</test.greenhousedata-element-vcloud.build-version>
<test.greenhousedata-element-vcloud.identity>${test.greenhousedata-element-vcloud.identity}</test.greenhousedata-element-vcloud.identity>
<test.greenhousedata-element-vcloud.credential>${test.greenhousedata-element-vcloud.credential}</test.greenhousedata-element-vcloud.credential>
<test.greenhousedata-element-vcloud.image-id>${test.greenhousedata-element-vcloud.image-id}</test.greenhousedata-element-vcloud.image-id>

5
providers/hpcloud-objectstorage-lvs/pom.xml
View File

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

2
providers/ninefold-compute/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.ninefold-compute.endpoint>https://api.ninefold.com/compute/v1.0/</test.ninefold-compute.endpoint>
<test.ninefold-compute.api-version>2.2.12</test.ninefold-compute.api-version>
<test.ninefold-compute.build-version></test.ninefold-compute.build-version>
<test.ninefold-compute.identity>FIXME_IDENTITY</test.ninefold-compute.identity>
<test.ninefold-compute.credential>FIXME_CREDENTIAL</test.ninefold-compute.credential>
<test.ninefold-compute.image-id>1215</test.ninefold-compute.image-id>
@ -104,6 +105,7 @@
<systemPropertyVariables>
<test.ninefold-compute.endpoint>${test.ninefold-compute.endpoint}</test.ninefold-compute.endpoint>
<test.ninefold-compute.api-version>${test.ninefold-compute.api-version}</test.ninefold-compute.api-version>
<test.ninefold-compute.build-version>${test.ninefold-compute.build-version}</test.ninefold-compute.build-version>
<test.ninefold-compute.identity>${test.ninefold-compute.identity}</test.ninefold-compute.identity>
<test.ninefold-compute.credential>${test.ninefold-compute.credential}</test.ninefold-compute.credential>
<test.ninefold-compute.image-id>${test.ninefold-compute.image-id}</test.ninefold-compute.image-id>

2
providers/ninefold-storage/pom.xml
View File

@ -37,6 +37,7 @@
<test.initializer>org.jclouds.ninefold.storage.blobstore.integration.NinefoldStorageTestInitializer</test.initializer>
<test.ninefold-storage.endpoint>http://onlinestorage.ninefold.com</test.ninefold-storage.endpoint>
<test.ninefold-storage.api-version>1.4.0</test.ninefold-storage.api-version>
<test.ninefold-storage.build-version></test.ninefold-storage.build-version>
<test.ninefold-storage.identity>FIXME_IDENTITY</test.ninefold-storage.identity>
<test.ninefold-storage.credential>FIXME_CREDENTIAL</test.ninefold-storage.credential>
</properties>
@ -102,6 +103,7 @@
<systemPropertyVariables>
<test.ninefold-storage.endpoint>${test.ninefold-storage.endpoint}</test.ninefold-storage.endpoint>
<test.ninefold-storage.api-version>${test.ninefold-storage.api-version}</test.ninefold-storage.api-version>
<test.ninefold-storage.build-version>${test.ninefold-storage.build-version}</test.ninefold-storage.build-version>
<test.ninefold-storage.identity>${test.ninefold-storage.identity}</test.ninefold-storage.identity>
<test.ninefold-storage.credential>${test.ninefold-storage.credential}</test.ninefold-storage.credential>
<test.initializer>${test.initializer}</test.initializer>

2
providers/openhosting-east1/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.openhosting-east1.endpoint>https://api.east1.openhosting.com</test.openhosting-east1.endpoint>
<test.openhosting-east1.api-version>2.0</test.openhosting-east1.api-version>
<test.openhosting-east1.build-version></test.openhosting-east1.build-version>
<test.openhosting-east1.identity>FIXME_IDENTITY</test.openhosting-east1.identity>
<test.openhosting-east1.credential>FIXME_CREDENTIAL</test.openhosting-east1.credential>
<test.openhosting-east1.image-id></test.openhosting-east1.image-id>
@ -101,6 +102,7 @@
<systemPropertyVariables>
<test.openhosting-east1.endpoint>${test.openhosting-east1.endpoint}</test.openhosting-east1.endpoint>
<test.openhosting-east1.api-version>${test.openhosting-east1.api-version}</test.openhosting-east1.api-version>
<test.openhosting-east1.build-version>${test.openhosting-east1.build-version}</test.openhosting-east1.build-version>
<test.openhosting-east1.identity>${test.openhosting-east1.identity}</test.openhosting-east1.identity>
<test.openhosting-east1.credential>${test.openhosting-east1.credential}</test.openhosting-east1.credential>
<test.openhosting-east1.image-id>${test.openhosting-east1.image-id}</test.openhosting-east1.image-id>

2
providers/rimuhosting/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.rimuhosting.endpoint>https://api.rimuhosting.com/r</test.rimuhosting.endpoint>
<test.rimuhosting.api-version>1.0</test.rimuhosting.api-version>
<test.rimuhosting.build-version></test.rimuhosting.build-version>
<test.rimuhosting.identity>FIXME</test.rimuhosting.identity>
<test.rimuhosting.image-id></test.rimuhosting.image-id>
</properties>
@ -102,6 +103,7 @@
<systemPropertyVariables>
<test.rimuhosting.endpoint>${test.rimuhosting.endpoint}</test.rimuhosting.endpoint>
<test.rimuhosting.api-version>${test.rimuhosting.api-version}</test.rimuhosting.api-version>
<test.rimuhosting.build-version>${test.rimuhosting.build-version}</test.rimuhosting.build-version>
<test.rimuhosting.identity>${test.rimuhosting.identity}</test.rimuhosting.identity>
<test.rimuhosting.image-id>${test.rimuhosting.image-id}</test.rimuhosting.image-id>
</systemPropertyVariables>

2
providers/savvis-symphonyvpdc/pom.xml
View File

@ -50,6 +50,7 @@
<properties>
<test.savvis-symphonyvpdc.endpoint>https://api.symphonyvpdc.savvis.net/vpdc</test.savvis-symphonyvpdc.endpoint>
<test.savvis-symphonyvpdc.api-version>1.0</test.savvis-symphonyvpdc.api-version>
<test.savvis-symphonyvpdc.build-version></test.savvis-symphonyvpdc.build-version>
<test.savvis-symphonyvpdc.identity>FIXME</test.savvis-symphonyvpdc.identity>
<test.savvis-symphonyvpdc.credential>FIXME</test.savvis-symphonyvpdc.credential>
<test.savvis-symphonyvpdc.image-id></test.savvis-symphonyvpdc.image-id>
@ -115,6 +116,7 @@
<systemPropertyVariables>
<test.savvis-symphonyvpdc.endpoint>${test.savvis-symphonyvpdc.endpoint}</test.savvis-symphonyvpdc.endpoint>
<test.savvis-symphonyvpdc.api-version>${test.savvis-symphonyvpdc.api-version}</test.savvis-symphonyvpdc.api-version>
<test.savvis-symphonyvpdc.build-version>${test.savvis-symphonyvpdc.build-version}</test.savvis-symphonyvpdc.build-version>
<test.savvis-symphonyvpdc.identity>${test.savvis-symphonyvpdc.identity}</test.savvis-symphonyvpdc.identity>
<test.savvis-symphonyvpdc.credential>${test.savvis-symphonyvpdc.credential}</test.savvis-symphonyvpdc.credential>
<test.savvis-symphonyvpdc.image-id>${test.savvis-symphonyvpdc.image-id}</test.savvis-symphonyvpdc.image-id>

2
providers/serverlove-z1-man/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.serverlove-z1-man.endpoint>https://api.z1-man.serverlove.com</test.serverlove-z1-man.endpoint>
<test.serverlove-z1-man.api-version>1.0</test.serverlove-z1-man.api-version>
<test.serverlove-z1-man.build-version></test.serverlove-z1-man.build-version>
<test.serverlove-z1-man.identity>FIXME_IDENTITY</test.serverlove-z1-man.identity>
<test.serverlove-z1-man.credential>FIXME_CREDENTIAL</test.serverlove-z1-man.credential>
<test.serverlove-z1-man.image-id></test.serverlove-z1-man.image-id>
@ -101,6 +102,7 @@
<systemPropertyVariables>
<test.serverlove-z1-man.endpoint>${test.serverlove-z1-man.endpoint}</test.serverlove-z1-man.endpoint>
<test.serverlove-z1-man.api-version>${test.serverlove-z1-man.api-version}</test.serverlove-z1-man.api-version>
<test.serverlove-z1-man.build-version>${test.serverlove-z1-man.build-version}</test.serverlove-z1-man.build-version>
<test.serverlove-z1-man.identity>${test.serverlove-z1-man.identity}</test.serverlove-z1-man.identity>
<test.serverlove-z1-man.credential>${test.serverlove-z1-man.credential}</test.serverlove-z1-man.credential>
<test.serverlove-z1-man.image-id>${test.serverlove-z1-man.image-id}</test.serverlove-z1-man.image-id>

2
providers/skalicloud-sdg-my/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.skalicloud-sdg-my.endpoint>https://api.sdg-my.skalicloud.com</test.skalicloud-sdg-my.endpoint>
<test.skalicloud-sdg-my.api-version>1.0</test.skalicloud-sdg-my.api-version>
<test.skalicloud-sdg-my.build-version></test.skalicloud-sdg-my.build-version>
<test.skalicloud-sdg-my.identity>FIXME_IDENTITY</test.skalicloud-sdg-my.identity>
<test.skalicloud-sdg-my.credential>FIXME_CREDENTIAL</test.skalicloud-sdg-my.credential>
<test.skalicloud-sdg-my.image-id></test.skalicloud-sdg-my.image-id>
@ -101,6 +102,7 @@
<systemPropertyVariables>
<test.skalicloud-sdg-my.endpoint>${test.skalicloud-sdg-my.endpoint}</test.skalicloud-sdg-my.endpoint>
<test.skalicloud-sdg-my.api-version>${test.skalicloud-sdg-my.api-version}</test.skalicloud-sdg-my.api-version>
<test.skalicloud-sdg-my.build-version>${test.skalicloud-sdg-my.build-version}</test.skalicloud-sdg-my.build-version>
<test.skalicloud-sdg-my.identity>${test.skalicloud-sdg-my.identity}</test.skalicloud-sdg-my.identity>
<test.skalicloud-sdg-my.credential>${test.skalicloud-sdg-my.credential}</test.skalicloud-sdg-my.credential>
<test.skalicloud-sdg-my.image-id>${test.skalicloud-sdg-my.image-id}</test.skalicloud-sdg-my.image-id>

2
providers/slicehost/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.slicehost.endpoint>https://api.slicehost.com</test.slicehost.endpoint>
<test.slicehost.api-version>1.4.1.1</test.slicehost.api-version>
<test.slicehost.build-version></test.slicehost.build-version>
<test.slicehost.identity>FIXME</test.slicehost.identity>
<test.slicehost.image-id></test.slicehost.image-id>
</properties>
@ -94,6 +95,7 @@
<systemPropertyVariables>
<test.slicehost.endpoint>${test.slicehost.endpoint}</test.slicehost.endpoint>
<test.slicehost.api-version>${test.slicehost.api-version}</test.slicehost.api-version>
<test.slicehost.build-version>${test.slicehost.build-version}</test.slicehost.build-version>
<test.slicehost.identity>${test.slicehost.identity}</test.slicehost.identity>
<test.slicehost.image-id>${test.slicehost.image-id}</test.slicehost.image-id>
</systemPropertyVariables>

2
providers/softlayer/pom.xml
View File

@ -50,6 +50,7 @@
<properties>
<test.softlayer.endpoint>https://api.softlayer.com/rest</test.softlayer.endpoint>
<test.softlayer.api-version>3</test.softlayer.api-version>
<test.softlayer.build-version></test.softlayer.build-version>
<test.softlayer.identity>FIXME</test.softlayer.identity>
<test.softlayer.credential>FIXME</test.softlayer.credential>
<test.softlayer.image-id></test.softlayer.image-id>
@ -108,6 +109,7 @@
<systemPropertyVariables>
<test.softlayer.endpoint>${test.softlayer.endpoint}</test.softlayer.endpoint>
<test.softlayer.api-version>${test.softlayer.api-version}</test.softlayer.api-version>
<test.softlayer.build-version>${test.softlayer.build-version}</test.softlayer.build-version>
<test.softlayer.identity>${test.softlayer.identity}</test.softlayer.identity>
<test.softlayer.credential>${test.softlayer.credential}</test.softlayer.credential>
<test.softlayer.image-id>${test.softlayer.image-id}</test.softlayer.image-id>

2
providers/stratogen-vcloud-mycloud/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.stratogen-vcloud-mycloud.endpoint>https://vcd.stratogen.net/api</test.stratogen-vcloud-mycloud.endpoint>
<test.stratogen-vcloud-mycloud.api-version>1.0</test.stratogen-vcloud-mycloud.api-version>
<test.stratogen-vcloud-mycloud.build-version></test.stratogen-vcloud-mycloud.build-version>
<test.stratogen-vcloud-mycloud.identity>FIXME_IDENTITY</test.stratogen-vcloud-mycloud.identity>
<test.stratogen-vcloud-mycloud.credential>FIXME_CREDENTIAL</test.stratogen-vcloud-mycloud.credential>
<test.stratogen-vcloud-mycloud.image-id></test.stratogen-vcloud-mycloud.image-id>
@ -101,6 +102,7 @@
<systemPropertyVariables>
<test.stratogen-vcloud-mycloud.endpoint>${test.stratogen-vcloud-mycloud.endpoint}</test.stratogen-vcloud-mycloud.endpoint>
<test.stratogen-vcloud-mycloud.api-version>${test.stratogen-vcloud-mycloud.api-version}</test.stratogen-vcloud-mycloud.api-version>
<test.stratogen-vcloud-mycloud.build-version>${test.stratogen-vcloud-mycloud.build-version}</test.stratogen-vcloud-mycloud.build-version>
<test.stratogen-vcloud-mycloud.identity>${test.stratogen-vcloud-mycloud.identity}</test.stratogen-vcloud-mycloud.identity>
<test.stratogen-vcloud-mycloud.credential>${test.stratogen-vcloud-mycloud.credential}</test.stratogen-vcloud-mycloud.credential>
<test.stratogen-vcloud-mycloud.image-id>${test.stratogen-vcloud-mycloud.image-id}</test.stratogen-vcloud-mycloud.image-id>

2
providers/synaptic-storage/pom.xml
View File

@ -37,6 +37,7 @@
<test.initializer>org.jclouds.synaptic.storage.blobstore.integration.SynapticStorageTestInitializer</test.initializer>
<test.synaptic-storage.endpoint>https://storage.synaptic.att.com</test.synaptic-storage.endpoint>
<test.synaptic-storage.api-version>1.3.0</test.synaptic-storage.api-version>
<test.synaptic-storage.build-version></test.synaptic-storage.build-version>
<test.synaptic-storage.identity>FIXME_IDENTITY</test.synaptic-storage.identity>
<test.synaptic-storage.credential>FIXME_CREDENTIAL</test.synaptic-storage.credential>
</properties>
@ -102,6 +103,7 @@
<systemPropertyVariables>
<test.synaptic-storage.endpoint>${test.synaptic-storage.endpoint}</test.synaptic-storage.endpoint>
<test.synaptic-storage.api-version>${test.synaptic-storage.api-version}</test.synaptic-storage.api-version>
<test.synaptic-storage.build-version>${test.synaptic-storage.build-version}</test.synaptic-storage.build-version>
<test.synaptic-storage.identity>${test.synaptic-storage.identity}</test.synaptic-storage.identity>
<test.synaptic-storage.credential>${test.synaptic-storage.credential}</test.synaptic-storage.credential>
<test.initializer>${test.initializer}</test.initializer>

2
providers/trmk-ecloud/pom.xml
View File

@ -37,6 +37,7 @@
<test.trmk-ecloud.endpoint>https://services.enterprisecloud.terremark.com/api</test.trmk-ecloud.endpoint>
<test.trmk-ecloud.datacenter>MIA</test.trmk-ecloud.datacenter>
<test.trmk-ecloud.api-version>0.8b-ext2.8</test.trmk-ecloud.api-version>
<test.trmk-ecloud.build-version></test.trmk-ecloud.build-version>
<test.trmk-ecloud.identity>FIXME</test.trmk-ecloud.identity>
<test.trmk-ecloud.credential>FIXME</test.trmk-ecloud.credential>
<test.trmk-ecloud.image-id></test.trmk-ecloud.image-id>
@ -103,6 +104,7 @@
<systemPropertyVariables>
<test.trmk-ecloud.endpoint>${test.trmk-ecloud.endpoint}</test.trmk-ecloud.endpoint>
<test.trmk-ecloud.api-version>${test.trmk-ecloud.api-version}</test.trmk-ecloud.api-version>
<test.trmk-ecloud.build-version>${test.trmk-ecloud.build-version}</test.trmk-ecloud.build-version>
<test.trmk-ecloud.identity>${test.trmk-ecloud.identity}</test.trmk-ecloud.identity>
<test.trmk-ecloud.credential>${test.trmk-ecloud.credential}</test.trmk-ecloud.credential>
<test.trmk-ecloud.datacenter>${test.trmk-ecloud.datacenter}</test.trmk-ecloud.datacenter>

2
providers/trmk-vcloudexpress/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.trmk-vcloudexpress.endpoint>https://services.vcloudexpress.terremark.com/api</test.trmk-vcloudexpress.endpoint>
<test.trmk-vcloudexpress.api-version>0.8a-ext1.6</test.trmk-vcloudexpress.api-version>
<test.trmk-vcloudexpress.build-version></test.trmk-vcloudexpress.build-version>
<test.trmk-vcloudexpress.identity>FIXME</test.trmk-vcloudexpress.identity>
<test.trmk-vcloudexpress.credential>FIXME</test.trmk-vcloudexpress.credential>
<test.trmk-vcloudexpress.image-id></test.trmk-vcloudexpress.image-id>
@ -102,6 +103,7 @@
<systemPropertyVariables>
<test.trmk-vcloudexpress.endpoint>${test.trmk-vcloudexpress.endpoint}</test.trmk-vcloudexpress.endpoint>
<test.trmk-vcloudexpress.api-version>${test.trmk-vcloudexpress.api-version}</test.trmk-vcloudexpress.api-version>
<test.trmk-vcloudexpress.build-version>${test.trmk-vcloudexpress.build-version}</test.trmk-vcloudexpress.build-version>
<test.trmk-vcloudexpress.identity>${test.trmk-vcloudexpress.identity}</test.trmk-vcloudexpress.identity>
<test.trmk-vcloudexpress.credential>${test.trmk-vcloudexpress.credential}</test.trmk-vcloudexpress.credential>
<test.trmk-vcloudexpress.image-id>${test.trmk-vcloudexpress.image-id}</test.trmk-vcloudexpress.image-id>

4
sandbox-apis/elb/pom.xml
View File

@ -37,11 +37,13 @@
<test.elb.zone>us-east-1a</test.elb.zone>
<test.elb.endpoint>https://elasticloadbalancing.us-east-1.amazonaws.com</test.elb.endpoint>
<test.elb.api-version>2010-07-01</test.elb.api-version>
<test.elb.build-version></test.elb.build-version>
<test.elb.identity>${test.aws.identity}</test.elb.identity>
<test.elb.credential>${test.aws.credential}</test.elb.credential>
<test.elb.compute.provider>ec2</test.elb.compute.provider>
<test.elb.compute.endpoint>https://ec2.us-east-1.amazonaws.com</test.elb.compute.endpoint>
<test.elb.compute.api-version>2010-06-15</test.elb.compute.api-version>
<test.elb.compute.build-version></test.elb.compute.build-version>
<test.elb.compute.identity>${test.aws.identity}</test.elb.compute.identity>
<test.elb.compute.credential>${test.aws.credential}</test.elb.compute.credential>
<test.elb.compute.image-id></test.elb.compute.image-id>
@ -114,11 +116,13 @@
<test.elb.zone>${test.elb.zone}</test.elb.zone>
<test.elb.endpoint>${test.elb.endpoint}</test.elb.endpoint>
<test.elb.api-version>${test.elb.api-version}</test.elb.api-version>
<test.elb.build-version>${test.elb.build-version}</test.elb.build-version>
<test.elb.identity>${test.elb.identity}</test.elb.identity>
<test.elb.credential>${test.elb.credential}</test.elb.credential>
<test.elb.compute.provider>${test.elb.compute.provider}</test.elb.compute.provider>
<test.elb.compute.endpoint>${test.elb.compute.endpoint}</test.elb.compute.endpoint>
<test.elb.compute.api-version>${test.elb.compute.api-version}</test.elb.compute.api-version>
<test.elb.compute.build-version>${test.elb.compute.build-version}</test.elb.compute.build-version>
<test.elb.compute.identity>${test.elb.compute.identity}</test.elb.compute.identity>
<test.elb.compute.credential>${test.elb.compute.credential}</test.elb.compute.credential>
<test.elb.compute.image-id>${test.elb.compute.image-id}</test.elb.compute.image-id>

2
sandbox-apis/libvirt/pom.xml
View File

@ -37,6 +37,7 @@
<jclouds.compute.blacklist.nodes>trmkrun-ccc,test.trmk-924</jclouds.compute.blacklist.nodes>
<test.libvirt.endpoint>test:///default</test.libvirt.endpoint>
<test.libvirt.api-version>1.0</test.libvirt.api-version>
<test.libvirt.build-version></test.libvirt.build-version>
<test.libvirt.identity>FIXME</test.libvirt.identity>
<test.libvirt.credential>FIXME</test.libvirt.credential>
<test.libvirt.image-id></test.libvirt.image-id>
@ -127,6 +128,7 @@
<systemPropertyVariables>
<test.libvirt.endpoint>${test.libvirt.endpoint}</test.libvirt.endpoint>
<test.libvirt.api-version>${test.libvirt.api-version}</test.libvirt.api-version>
<test.libvirt.build-version>${test.libvirt.build-version}</test.libvirt.build-version>
<test.libvirt.identity>${test.libvirt.identity}</test.libvirt.identity>
<test.libvirt.credential>${test.libvirt.credential}</test.libvirt.credential>
<test.libvirt.image-id>${test.libvirt.image-id}</test.libvirt.image-id>

2
sandbox-apis/nirvanix/pom.xml
View File

@ -47,6 +47,7 @@
<properties>
<test.nirvanix.endpoint>http://services.nirvanix.com</test.nirvanix.endpoint>
<test.nirvanix.api-version>2.5.6</test.nirvanix.api-version>
<test.nirvanix.build-version></test.nirvanix.build-version>
<test.nirvanix.identity>FIXME</test.nirvanix.identity>
<test.nirvanix.credential> FIXME </test.nirvanix.credential>
</properties>
@ -107,6 +108,7 @@
<systemPropertyVariables>
<test.nirvanix.endpoint>${test.nirvanix.endpoint}</test.nirvanix.endpoint>
<test.nirvanix.api-version>${test.nirvanix.api-version}</test.nirvanix.api-version>
<test.nirvanix.build-version>${test.nirvanix.build-version}</test.nirvanix.build-version>
<test.nirvanix.identity>${test.nirvanix.identity}</test.nirvanix.identity>
<test.nirvanix.credential>${test.nirvanix.credential}</test.nirvanix.credential>
</systemPropertyVariables>

2
sandbox-apis/openstack-nova/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.openstack-nova.endpoint>http://localhost:8774/v1.1/</test.openstack-nova.endpoint>
<test.openstack-nova.api-version>v1.1</test.openstack-nova.api-version>
<test.openstack-nova.build-version></test.openstack-nova.build-version>
<test.openstack-nova.identity>FIXME_IDENTITY</test.openstack-nova.identity>
<test.openstack-nova.credential>FIXME_CREDENTIALS</test.openstack-nova.credential>
<test.openstack-nova.image-id></test.openstack-nova.image-id>
@ -116,6 +117,7 @@
<systemPropertyVariables>
<test.openstack-nova.endpoint>${test.openstack-nova.endpoint}</test.openstack-nova.endpoint>
<test.openstack-nova.api-version>${test.openstack-nova.api-version}</test.openstack-nova.api-version>
<test.openstack-nova.build-version>${test.openstack-nova.build-version}</test.openstack-nova.build-version>
<test.openstack-nova.identity>${test.openstack-nova.identity}</test.openstack-nova.identity>
<test.openstack-nova.credential>${test.openstack-nova.credential}</test.openstack-nova.credential>
<test.openstack-nova.image-id>${test.openstack-nova.image-id}</test.openstack-nova.image-id>

2
sandbox-apis/pcs/pom.xml
View File

@ -47,6 +47,7 @@
<properties>
<test.pcs.endpoint>FIXME</test.pcs.endpoint>
<test.pcs.api-version>2</test.pcs.api-version>
<test.pcs.build-version></test.pcs.build-version>
<test.pcs.identity>FIXME</test.pcs.identity>
<test.pcs.credential>FIXME</test.pcs.credential>
</properties>
@ -107,6 +108,7 @@
<systemPropertyVariables>
<test.pcs.endpoint>${test.pcs.endpoint}</test.pcs.endpoint>
<test.pcs.api-version>${test.pcs.api-version}</test.pcs.api-version>
<test.pcs.build-version>${test.pcs.build-version}</test.pcs.build-version>
<test.pcs.identity>${test.pcs.identity}</test.pcs.identity>
<test.pcs.credential>${test.pcs.credential}</test.pcs.credential>
</systemPropertyVariables>

2
sandbox-apis/scality-rs2/pom.xml
View File

@ -37,6 +37,7 @@
<test.initializer>org.jclouds.scality.rs2.blobstore.ScalityRS2TestInitializer</test.initializer>
<test.scality-rs2.endpoint>FIXME_ENDPOINT</test.scality-rs2.endpoint>
<test.scality-rs2.api-version>2006-03-01</test.scality-rs2.api-version>
<test.scality-rs2.build-version></test.scality-rs2.build-version>
<test.scality-rs2.identity>FIXME_IDENTITY</test.scality-rs2.identity>
<test.scality-rs2.credential>FIXME_CREDENTIAL</test.scality-rs2.credential>
</properties>
@ -102,6 +103,7 @@
<systemPropertyVariables>
<test.scality-rs2.endpoint>${test.scality-rs2.endpoint}</test.scality-rs2.endpoint>
<test.scality-rs2.api-version>${test.scality-rs2.api-version}</test.scality-rs2.api-version>
<test.scality-rs2.build-version>${test.scality-rs2.build-version}</test.scality-rs2.build-version>
<test.scality-rs2.identity>${test.scality-rs2.identity}</test.scality-rs2.identity>
<test.scality-rs2.credential>${test.scality-rs2.credential}</test.scality-rs2.credential>
<test.initializer>${test.initializer}</test.initializer>

2
sandbox-apis/simpledb/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.simpledb.endpoint>https://sdb.amazonaws.com</test.simpledb.endpoint>
<test.simpledb.api-version>2009-04-15</test.simpledb.api-version>
<test.simpledb.build-version></test.simpledb.build-version>
<test.simpledb.identity>${test.aws.identity}</test.simpledb.identity>
<test.simpledb.credential>${test.aws.credential}</test.simpledb.credential>
</properties>
@ -80,6 +81,7 @@
<systemPropertyVariables>
<test.simpledb.endpoint>${test.simpledb.endpoint}</test.simpledb.endpoint>
<test.simpledb.api-version>${test.simpledb.api-version}</test.simpledb.api-version>
<test.simpledb.build-version>${test.simpledb.build-version}</test.simpledb.build-version>
<test.simpledb.identity>${test.simpledb.identity}</test.simpledb.identity>
<test.simpledb.credential>${test.simpledb.credential}</test.simpledb.credential>
</systemPropertyVariables>

2
sandbox-apis/sqs/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.sqs.endpoint>https://sqs.us-east-1.amazonaws.com</test.sqs.endpoint>
<test.sqs.api-version>2009-02-01</test.sqs.api-version>
<test.sqs.build-version></test.sqs.build-version>
<test.sqs.identity>${test.aws.identity}</test.sqs.identity>
<test.sqs.credential>${test.aws.credential}</test.sqs.credential>
</properties>
@ -80,6 +81,7 @@
<systemPropertyVariables>
<test.sqs.endpoint>${test.sqs.endpoint}</test.sqs.endpoint>
<test.sqs.api-version>${test.sqs.api-version}</test.sqs.api-version>
<test.sqs.build-version>${test.sqs.build-version}</test.sqs.build-version>
<test.sqs.identity>${test.sqs.identity}</test.sqs.identity>
<test.sqs.credential>${test.sqs.credential}</test.sqs.credential>
</systemPropertyVariables>

2
sandbox-apis/virtualbox/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.virtualbox.endpoint>http://localhost:18083/</test.virtualbox.endpoint>
<test.virtualbox.api-version>4.1.4</test.virtualbox.api-version>
<test.virtualbox.build-version>4.1.8r75467</test.virtualbox.build-version>
<test.virtualbox.identity>administrator</test.virtualbox.identity>
<test.virtualbox.credential>12345</test.virtualbox.credential>
<test.virtualbox.image-id></test.virtualbox.image-id>
@ -130,6 +131,7 @@
<systemPropertyVariables>
<test.virtualbox.endpoint>${test.virtualbox.endpoint}</test.virtualbox.endpoint>
<test.virtualbox.api-version>${test.virtualbox.api-version}</test.virtualbox.api-version>
<test.virtualbox.build-version>${test.virtualbox.build-version}</test.virtualbox.build-version>
<test.virtualbox.identity>${test.virtualbox.identity}</test.virtualbox.identity>
<test.virtualbox.credential>${test.virtualbox.credential}</test.virtualbox.credential>
<test.virtualbox.image-id>${test.virtualbox.image-id}</test.virtualbox.image-id>

4
sandbox-providers/aws-elb/pom.xml
View File

@ -36,11 +36,13 @@
<properties>
<test.aws-elb.endpoint>https://elasticloadbalancing.us-east-1.amazonaws.com</test.aws-elb.endpoint>
<test.aws-elb.api-version>2010-07-01</test.aws-elb.api-version>
<test.aws-elb.build-version></test.aws-elb.build-version>
<test.aws-elb.identity>${test.aws.identity}</test.aws-elb.identity>
<test.aws-elb.credential>${test.aws.credential}</test.aws-elb.credential>
<test.aws-elb.compute.provider>aws-ec2</test.aws-elb.compute.provider>
<test.aws-elb.compute.endpoint>https://ec2.us-east-1.amazonaws.com</test.aws-elb.compute.endpoint>
<test.aws-elb.compute.api-version>2010-06-15</test.aws-elb.compute.api-version>
<test.aws-elb.compute.build-version></test.aws-elb.compute.build-version>
<test.aws-elb.compute.identity>${test.aws.identity}</test.aws-elb.compute.identity>
<test.aws-elb.compute.credential>${test.aws.credential}</test.aws-elb.compute.credential>
<test.aws-elb.compute.image-id></test.aws-elb.compute.image-id>
@ -120,10 +122,12 @@
<systemPropertyVariables>
<test.aws-elb.endpoint>${test.aws-elb.endpoint}</test.aws-elb.endpoint>
<test.aws-elb.api-version>${test.aws-elb.api-version}</test.aws-elb.api-version>
<test.aws-elb.build-version>${test.aws-elb.build-version}</test.aws-elb.build-version>
<test.aws-elb.identity>${test.aws-elb.identity}</test.aws-elb.identity>
<test.aws-elb.credential>${test.aws-elb.credential}</test.aws-elb.credential>
<test.aws-elb.compute.provider>${test.aws-elb.compute.provider}</test.aws-elb.compute.provider>
<test.aws-elb.compute.endpoint>${test.aws-elb.compute.endpoint}</test.aws-elb.compute.endpoint>
<test.aws-elb.compute.build-version>${test.aws-elb.compute.build-version}</test.aws-elb.compute.build-version>
<test.aws-elb.compute.api-version>${test.aws-elb.compute.api-version}</test.aws-elb.compute.api-version>
<test.aws-elb.compute.identity>${test.aws-elb.compute.identity}</test.aws-elb.compute.identity>
<test.aws-elb.compute.credential>${test.aws-elb.compute.credential}</test.aws-elb.compute.credential>

2
sandbox-providers/aws-simpledb/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.aws-simpledb.endpoint>https://sdb.amazonaws.com</test.aws-simpledb.endpoint>
<test.aws-simpledb.api-version>2009-04-15</test.aws-simpledb.api-version>
<test.aws-simpledb.build-version></test.aws-simpledb.build-version>
<test.aws-simpledb.identity>${test.aws.identity}</test.aws-simpledb.identity>
<test.aws-simpledb.credential>${test.aws.credential}</test.aws-simpledb.credential>
</properties>
@ -94,6 +95,7 @@
<systemPropertyVariables>
<test.aws-simpledb.endpoint>${test.aws-simpledb.endpoint}</test.aws-simpledb.endpoint>
<test.aws-simpledb.api-version>${test.aws-simpledb.api-version}</test.aws-simpledb.api-version>
<test.aws-simpledb.build-version>${test.aws-simpledb.build-version}</test.aws-simpledb.build-version>
<test.aws-simpledb.identity>${test.aws-simpledb.identity}</test.aws-simpledb.identity>
<test.aws-simpledb.credential>${test.aws-simpledb.credential}</test.aws-simpledb.credential>
</systemPropertyVariables>

2
sandbox-providers/azurequeue/pom.xml
View File

@ -36,6 +36,7 @@
<properties>
<test.azurequeue.endpoint>https://{identity}.queue.core.windows.net</test.azurequeue.endpoint>
<test.azurequeue.api-version>2009-09-19</test.azurequeue.api-version>
<test.azurequeue.build-version></test.azurequeue.build-version>
<test.azurequeue.identity>${test.azure.identity}</test.azurequeue.identity>
<test.azurequeue.credential>${test.azure.credential}</test.azurequeue.credential>
</properties>
@ -87,6 +88,7 @@
<systemPropertyVariables>
<test.azurequeue.endpoint>${test.azurequeue.endpoint}</test.azurequeue.endpoint>
<test.azurequeue.api-version>${test.azurequeue.api-version}</test.azurequeue.api-version>
<test.azurequeue.build-version>${test.azurequeue.build-version}</test.azurequeue.build-version>
<test.azurequeue.identity>${test.azurequeue.identity}</test.azurequeue.identity>
<test.azurequeue.credential>${test.azurequeue.credential}</test.azurequeue.credential>
</systemPropertyVariables>

2
sandbox-providers/boxdotnet/pom.xml
View File

@ -50,6 +50,7 @@
<properties>
<test.boxdotnet.endpoint>https://www.box.net/api/1.0/rest</test.boxdotnet.endpoint>
<test.boxdotnet.api-version>1.0</test.boxdotnet.api-version>
<test.boxdotnet.build-version></test.boxdotnet.build-version>
<test.boxdotnet.identity>FIXME</test.boxdotnet.identity>
<test.boxdotnet.credential>FIXME</test.boxdotnet.credential>
</properties>
@ -98,6 +99,7 @@
<systemPropertyVariables>
<test.boxdotnet.endpoint>${test.boxdotnet.endpoint}</test.boxdotnet.endpoint>
<test.boxdotnet.api-version>${test.boxdotnet.api-version}</test.boxdotnet.api-version>
<test.boxdotnet.build-version>${test.boxdotnet.build-version}</test.boxdotnet.build-version>
<test.boxdotnet.identity>${test.boxdotnet.identity}</test.boxdotnet.identity>
<test.boxdotnet.credential>${test.boxdotnet.credential}</test.boxdotnet.credential>
</systemPropertyVariables>

2
sandbox-providers/dunkel-vcd/pom.xml
View File

@ -35,6 +35,7 @@
<properties>
<test.dunkel-vcd.endpoint>https://vcd.dunkel.de/api</test.dunkel-vcd.endpoint>
<test.dunkel-vcd.api-version>1.0</test.dunkel-vcd.api-version>
<test.dunkel-vcd.build-version></test.dunkel-vcd.build-version>
<test.dunkel-vcd.identity>FIXME_IDENTITY</test.dunkel-vcd.identity>
<test.dunkel-vcd.credential>FIXME_CREDENTIAL</test.dunkel-vcd.credential>
<test.dunkel-vcd.image-id></test.dunkel-vcd.image-id>
@ -100,6 +101,7 @@
<systemPropertyVariables>
<test.dunkel-vcd.endpoint>${test.dunkel-vcd.endpoint}</test.dunkel-vcd.endpoint>
<test.dunkel-vcd.api-version>${test.dunkel-vcd.api-version}</test.dunkel-vcd.api-version>
<test.dunkel-vcd.build-version>${test.dunkel-vcd.build-version}</test.dunkel-vcd.build-version>
<test.dunkel-vcd.identity>${test.dunkel-vcd.identity}</test.dunkel-vcd.identity>
<test.dunkel-vcd.credential>${test.dunkel-vcd.credential}</test.dunkel-vcd.credential>
<test.dunkel-vcd.image-id>${test.dunkel-vcd.image-id}</test.dunkel-vcd.image-id>

2
sandbox-providers/glesys/pom.xml
View File

@ -50,6 +50,7 @@
<properties>
<test.glesys.endpoint>https://api.glesys.com</test.glesys.endpoint>
<test.glesys.api-version>1</test.glesys.api-version>
<test.glesys.build-version></test.glesys.build-version>
<test.glesys.identity>FIXME</test.glesys.identity>
<test.glesys.credential>FIXME</test.glesys.credential>
<test.glesys.image-id></test.glesys.image-id>
@ -108,6 +109,7 @@
<systemPropertyVariables>
<test.glesys.endpoint>${test.glesys.endpoint}</test.glesys.endpoint>
<test.glesys.api-version>${test.glesys.api-version}</test.glesys.api-version>
<test.glesys.build-version>${test.glesys.build-version}</test.glesys.build-version>
<test.glesys.identity>${test.glesys.identity}</test.glesys.identity>
<test.glesys.credential>${test.glesys.credential}</test.glesys.credential>
<test.glesys.image-id>${test.glesys.image-id}</test.glesys.image-id>

2
sandbox-providers/googlestorage/pom.xml
View File

@ -37,6 +37,7 @@
<test.initializer>org.jclouds.googlestorage.blobstore.GoogleStorageTestInitializer</test.initializer>
<test.googlestorage.endpoint>https://commondatastorage.googleapis.com</test.googlestorage.endpoint>
<test.googlestorage.api-version>2006-03-01</test.googlestorage.api-version>
<test.googlestorage.build-version></test.googlestorage.build-version>
<test.googlestorage.identity>FIX_ME</test.googlestorage.identity>
<test.googlestorage.credential>FIX_ME</test.googlestorage.credential>
</properties>
@ -102,6 +103,7 @@
<systemPropertyVariables>
<test.googlestorage.endpoint>${test.googlestorage.endpoint}</test.googlestorage.endpoint>
<test.googlestorage.api-version>${test.googlestorage.api-version}</test.googlestorage.api-version>
<test.googlestorage.build-version>${test.googlestorage.build-version}</test.googlestorage.build-version>
<test.googlestorage.identity>${test.googlestorage.identity}</test.googlestorage.identity>
<test.googlestorage.credential>${test.googlestorage.credential}</test.googlestorage.credential>
<test.initializer>${test.initializer}</test.initializer>

2
sandbox-providers/hosteurope-storage/pom.xml
View File

@ -37,6 +37,7 @@
<test.initializer>org.jclouds.hosteurope.storage.blobstore.HostEuropeStorageTestInitializer</test.initializer>
<test.hosteurope-storage.endpoint>https://cs.hosteurope.de</test.hosteurope-storage.endpoint>
<test.hosteurope-storage.api-version>2006-03-01</test.hosteurope-storage.api-version>
<test.hosteurope-storage.build-version></test.hosteurope-storage.build-version>
<test.hosteurope-storage.identity>FIX_ME</test.hosteurope-storage.identity>
<test.hosteurope-storage.credential>FIX_ME</test.hosteurope-storage.credential>
</properties>
@ -109,6 +110,7 @@
<systemPropertyVariables>
<test.hosteurope-storage.endpoint>${test.hosteurope-storage.endpoint}</test.hosteurope-storage.endpoint>
<test.hosteurope-storage.api-version>${test.hosteurope-storage.api-version}</test.hosteurope-storage.api-version>
<test.hosteurope-storage.build-version>${test.hosteurope-storage.build-version}</test.hosteurope-storage.build-version>
<test.hosteurope-storage.identity>${test.hosteurope-storage.identity}</test.hosteurope-storage.identity>
<test.hosteurope-storage.credential>${test.hosteurope-storage.credential}</test.hosteurope-storage.credential>
<test.initializer>${test.initializer}</test.initializer>

2
sandbox-providers/ibm-smartcloud/pom.xml
View File

@ -50,6 +50,7 @@
<properties>
<test.ibm-smartcloud.endpoint>https://www-147.ibm.com/computecloud/enterprise/api/rest</test.ibm-smartcloud.endpoint>
<test.ibm-smartcloud.api-version>20100331</test.ibm-smartcloud.api-version>
<test.ibm-smartcloud.build-version></test.ibm-smartcloud.build-version>
<test.ibm-smartcloud.identity>FIXME</test.ibm-smartcloud.identity>
<test.ibm-smartcloud.credential>FIXME</test.ibm-smartcloud.credential>
<test.ibm-smartcloud.image-id></test.ibm-smartcloud.image-id>
@ -111,6 +112,7 @@
<systemPropertyVariables>
<test.ibm-smartcloud.endpoint>${test.ibm-smartcloud.endpoint}</test.ibm-smartcloud.endpoint>
<test.ibm-smartcloud.api-version>${test.ibm-smartcloud.api-version}</test.ibm-smartcloud.api-version>
<test.ibm-smartcloud.build-version>${test.ibm-smartcloud.build-version}</test.ibm-smartcloud.build-version>
<test.ibm-smartcloud.identity>${test.ibm-smartcloud.identity}</test.ibm-smartcloud.identity>
<test.ibm-smartcloud.credential>${test.ibm-smartcloud.credential}</test.ibm-smartcloud.credential>
<test.ibm-smartcloud.image-id>${test.ibm-smartcloud.image-id}</test.ibm-smartcloud.image-id>

2
sandbox-providers/scaleup-storage/pom.xml
View File

@ -37,6 +37,7 @@
<test.initializer>org.jclouds.scaleup.storage.blobstore.ScaleUpStorageTestInitializer</test.initializer>
<test.scaleup-storage.endpoint>https://scs.scaleupstorage.com</test.scaleup-storage.endpoint>
<test.scaleup-storage.api-version>2006-03-01</test.scaleup-storage.api-version>
<test.scaleup-storage.build-version></test.scaleup-storage.build-version>
<test.scaleup-storage.identity>FIX_ME</test.scaleup-storage.identity>
<test.scaleup-storage.credential>FIX_ME</test.scaleup-storage.credential>
</properties>
@ -109,6 +110,7 @@
<systemPropertyVariables>
<test.scaleup-storage.endpoint>${test.scaleup-storage.endpoint}</test.scaleup-storage.endpoint>
<test.scaleup-storage.api-version>${test.scaleup-storage.api-version}</test.scaleup-storage.api-version>
<test.scaleup-storage.build-version>${test.scaleup-storage.build-version}</test.scaleup-storage.build-version>
<test.scaleup-storage.identity>${test.scaleup-storage.identity}</test.scaleup-storage.identity>
<test.scaleup-storage.credential>${test.scaleup-storage.credential}</test.scaleup-storage.credential>
<test.initializer>${test.initializer}</test.initializer>

Some files were not shown because too many files have changed in this diff Show More