diff --git a/archetypes/compute-service-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/compute-service-archetype/src/main/resources/archetype-resources/pom.xml index 023961bafb..431a8b2600 100644 --- a/archetypes/compute-service-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/compute-service-archetype/src/main/resources/archetype-resources/pom.xml @@ -62,8 +62,8 @@ - ${providerUser} - ${providerPassword} + ${providerUser} + ${providerPassword} ${providerEndpoint} diff --git a/archetypes/json-client-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/json-client-archetype/src/main/resources/archetype-resources/pom.xml index adfa8ac645..610c7d003a 100644 --- a/archetypes/json-client-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/json-client-archetype/src/main/resources/archetype-resources/pom.xml @@ -62,8 +62,8 @@ - ${providerAccount} - ${providerKey} + ${providerAccount} + ${providerKey} diff --git a/archetypes/json-client-archetype/src/main/resources/archetype-resources/src/main/java/config/__providerName__ContextModule.java b/archetypes/json-client-archetype/src/main/resources/archetype-resources/src/main/java/config/__providerName__ContextModule.java index 634ed65988..ef31284550 100644 --- a/archetypes/json-client-archetype/src/main/resources/archetype-resources/src/main/java/config/__providerName__ContextModule.java +++ b/archetypes/json-client-archetype/src/main/resources/archetype-resources/src/main/java/config/__providerName__ContextModule.java @@ -78,8 +78,8 @@ public class ${providerName}ContextModule extends AbstractModule { @Provides @Singleton RestContext<${providerName}Client, ${providerName}AsyncClient> provideContext(Closer closer, ${providerName}AsyncClient asyncApi, - ${providerName}Client syncApi, @${providerName} URI endPoint, @Named(${providerName}Constants.PROPERTY_${ucaseProviderName}_USER) String account) { - return new RestContextImpl<${providerName}Client, ${providerName}AsyncClient>(closer, asyncApi, syncApi, endPoint, account); + ${providerName}Client syncApi, @${providerName} URI endPoint, @Named(${providerName}Constants.PROPERTY_${ucaseProviderName}_USER) String identity) { + return new RestContextImpl<${providerName}Client, ${providerName}AsyncClient>(closer, asyncApi, syncApi, endPoint, identity); } } \ No newline at end of file diff --git a/archetypes/json-client-archetype/src/main/resources/archetype-resources/src/test/java/__providerName__ClientLiveTest.java b/archetypes/json-client-archetype/src/main/resources/archetype-resources/src/test/java/__providerName__ClientLiveTest.java index fc0b6a5654..082e2462c9 100644 --- a/archetypes/json-client-archetype/src/main/resources/archetype-resources/src/test/java/__providerName__ClientLiveTest.java +++ b/archetypes/json-client-archetype/src/main/resources/archetype-resources/src/test/java/__providerName__ClientLiveTest.java @@ -46,10 +46,10 @@ public class ${providerName}ClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - connection = ${providerName}ContextFactory.createContext(user, password, new Log4JLoggingModule()) + connection = ${providerName}ContextFactory.createContext(identity, credential, new Log4JLoggingModule()) .getApi(); } diff --git a/atmos/pom.xml b/atmos/pom.xml index 13620f9d85..47739f5582 100644 --- a/atmos/pom.xml +++ b/atmos/pom.xml @@ -32,8 +32,8 @@ jclouds atmosonline components org.jclouds.atmosonline.saas.blobstore.integration.AtmosStorageTestInitializer - ${jclouds.emcsaas.uid} - ${jclouds.emcsaas.key} + ${jclouds.emcsaas.uid} + ${jclouds.emcsaas.key} diff --git a/atmos/src/test/java/org/jclouds/atmosonline/saas/AtmosStorageClientLiveTest.java b/atmos/src/test/java/org/jclouds/atmosonline/saas/AtmosStorageClientLiveTest.java index 50b2f510ea..37ebcab726 100644 --- a/atmos/src/test/java/org/jclouds/atmosonline/saas/AtmosStorageClientLiveTest.java +++ b/atmos/src/test/java/org/jclouds/atmosonline/saas/AtmosStorageClientLiveTest.java @@ -116,10 +116,10 @@ public class AtmosStorageClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws InterruptedException, ExecutionException, TimeoutException, IOException { - String uid = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String key = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); BlobStoreContext blobStoreContext = new BlobStoreContextFactory().createContext( - "atmosonline", uid, key, ImmutableSet. of(new Log4JLoggingModule())); + "atmosonline", identity, credential, ImmutableSet. of(new Log4JLoggingModule())); RestContext context = blobStoreContext .getProviderSpecificContext(); connection = context.getApi(); @@ -138,7 +138,7 @@ public class AtmosStorageClientLiveTest { String privateDirectory; String publicDirectory; - String account; + String identity; @Test(timeOut = 5 * 60 * 1000) public void testCreateDirectory() throws Exception { diff --git a/atmos/src/test/java/org/jclouds/atmosonline/saas/blobstore/integration/AtmosStorageTestInitializer.java b/atmos/src/test/java/org/jclouds/atmosonline/saas/blobstore/integration/AtmosStorageTestInitializer.java index 82731f333a..4b55503ab9 100644 --- a/atmos/src/test/java/org/jclouds/atmosonline/saas/blobstore/integration/AtmosStorageTestInitializer.java +++ b/atmos/src/test/java/org/jclouds/atmosonline/saas/blobstore/integration/AtmosStorageTestInitializer.java @@ -37,8 +37,8 @@ public class AtmosStorageTestInitializer extends TransientBlobStoreTestInitializ @Override protected BlobStoreContext createLiveContext(Module configurationModule, String url, String app, - String account, String key) throws IOException { - return new BlobStoreContextFactory().createContext("atmosonline", account, key, ImmutableSet + String identity, String credential) throws IOException { + return new BlobStoreContextFactory().createContext("atmosonline", identity, credential, ImmutableSet .of(configurationModule, new Log4JLoggingModule()), new Properties()); } diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadata.java b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadata.java index adbe7551da..e2cb2bb7e0 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadata.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadata.java @@ -271,7 +271,7 @@ public class RunningInstanceToNodeMetadata implements Function { } /** - * The AWS account alias (e.g., "amazon", "redhat", "self", etc.) or AWS account ID that owns the + * The AWS identity alias (e.g., "amazon", "redhat", "self", etc.) or AWS identity ID that owns the * AMI. */ public String getOwnerAlias() { diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/UserIdGroupPair.java b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/UserIdGroupPair.java index d354184ce5..392f52d5b8 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/UserIdGroupPair.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/UserIdGroupPair.java @@ -46,7 +46,7 @@ public class UserIdGroupPair implements Comparable { /** - * AWS User ID of an account. Cannot be used when specifying a CIDR IP address. + * AWS User ID of an identity. Cannot be used when specifying a CIDR IP address. */ public String getUserId() { return userId; diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/options/CreateImageOptions.java b/aws/core/src/main/java/org/jclouds/aws/ec2/options/CreateImageOptions.java index 2cf4ac4cdf..97bd7485cd 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/options/CreateImageOptions.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/options/CreateImageOptions.java @@ -79,9 +79,9 @@ public class CreateImageOptions extends BaseEC2RequestOptions { /** * @see CreateImageOptions#withDescription(String ) */ - public static CreateImageOptions withDescription(String accountId) { + public static CreateImageOptions withDescription(String identityId) { CreateImageOptions options = new CreateImageOptions(); - return options.withDescription(accountId); + return options.withDescription(identityId); } /** diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/options/CreateSnapshotOptions.java b/aws/core/src/main/java/org/jclouds/aws/ec2/options/CreateSnapshotOptions.java index 04863075de..de2db029aa 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/options/CreateSnapshotOptions.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/options/CreateSnapshotOptions.java @@ -63,9 +63,9 @@ public class CreateSnapshotOptions extends BaseEC2RequestOptions { /** * @see CreateSnapshotOptions#withDescription(String ) */ - public static CreateSnapshotOptions withDescription(String accountId) { + public static CreateSnapshotOptions withDescription(String identityId) { CreateSnapshotOptions options = new CreateSnapshotOptions(); - return options.withDescription(accountId); + return options.withDescription(identityId); } } diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeImagesOptions.java b/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeImagesOptions.java index 2f20b294ee..658748f7f4 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeImagesOptions.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeImagesOptions.java @@ -49,8 +49,8 @@ public class DescribeImagesOptions extends BaseEC2RequestOptions { * AMIs for which the specified user has explicit launch permissions. * */ - public DescribeImagesOptions executableBy(String accountId) { - formParameters.put("ExecutableBy", checkNotNull(accountId, "accountId")); + public DescribeImagesOptions executableBy(String identityId) { + formParameters.put("ExecutableBy", checkNotNull(identityId, "identityId")); return this; } @@ -87,9 +87,9 @@ public class DescribeImagesOptions extends BaseEC2RequestOptions { /** * @see DescribeImagesOptions#executableBy(String ) */ - public static DescribeImagesOptions executableBy(String accountId) { + public static DescribeImagesOptions executableBy(String identityId) { DescribeImagesOptions options = new DescribeImagesOptions(); - return options.executableBy(accountId); + return options.executableBy(identityId); } /** diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/services/AMIClient.java b/aws/core/src/main/java/org/jclouds/aws/ec2/services/AMIClient.java index 54e0f0fa33..44b752051a 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/services/AMIClient.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/services/AMIClient.java @@ -125,7 +125,7 @@ public interface AMIClient { * AMIs are tied to the Region where its files are located within Amazon S3. * @param imageId * Unique ID of the AMI which was assigned during registration. To register an AMI, use - * RegisterImage. To view the AMI IDs of AMIs that belong to your account. use + * RegisterImage. To view the AMI IDs of AMIs that belong to your identity. use * DescribeImages. * * @see #describeImages diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClient.java b/aws/core/src/main/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClient.java index 4753280b52..204b93652e 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClient.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClient.java @@ -40,7 +40,7 @@ import org.jclouds.concurrent.Timeout; public interface AvailabilityZoneAndRegionClient { /** - * Displays Availability Zones that are currently available to the account and their states. + * Displays Availability Zones that are currently available to the identity and their states. * * @see InstanceClient#runInstances * @see #describeRegions @@ -52,7 +52,7 @@ public interface AvailabilityZoneAndRegionClient { DescribeAvailabilityZonesOptions... options); /** - * Describes Regions that are currently available to the account. + * Describes Regions that are currently available to the identity. * * @see InstanceClient#runInstances * @see #describeAvailabilityZones diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/services/ElasticIPAddressClient.java b/aws/core/src/main/java/org/jclouds/aws/ec2/services/ElasticIPAddressClient.java index c28d95bd4e..4a09fe2b30 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/services/ElasticIPAddressClient.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/services/ElasticIPAddressClient.java @@ -37,7 +37,7 @@ import org.jclouds.concurrent.Timeout; public interface ElasticIPAddressClient { /** - * Acquires an elastic IP address for use with your account. + * Acquires an elastic IP address for use with your identity. * * @param region * Elastic IP addresses are tied to a Region and cannot be mapped across Regions. @@ -88,12 +88,12 @@ public interface ElasticIPAddressClient { void disassociateAddressInRegion(@Nullable String region, String publicIp); /** - * Releases an elastic IP address associated with your account. + * Releases an elastic IP address associated with your identity. * * @param region * Elastic IP addresses are tied to a Region and cannot be mapped across Regions. * @param publicIp - * The IP address that you are releasing from your account. + * The IP address that you are releasing from your identity. * * @see #allocateAddress * @see #describeAddresses @@ -104,7 +104,7 @@ public interface ElasticIPAddressClient { void releaseAddressInRegion(@Nullable String region, String publicIp); /** - * Lists elastic IP addresses assigned to your account or provides information about a specific + * Lists elastic IP addresses assigned to your identity or provides information about a specific * address. * * @param region diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/services/SecurityGroupClient.java b/aws/core/src/main/java/org/jclouds/aws/ec2/services/SecurityGroupClient.java index f589ee59a4..ad2b8e51ec 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/services/SecurityGroupClient.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/services/SecurityGroupClient.java @@ -38,7 +38,7 @@ import org.jclouds.concurrent.Timeout; public interface SecurityGroupClient { /** - * Creates a new security group. Group names must be unique per account. + * Creates a new security group. Group names must be unique per identity. * * @param region * Security groups are not copied across Regions. Instances within the Region cannot @@ -112,7 +112,7 @@ public interface SecurityGroupClient { * communicate with instances outside the Region using group-based firewall rules. * Traffic from instances in another Region is seen as WAN bandwidth. * @param groupName - * Name of the group to modify. The name must be valid and belong to the account + * Name of the group to modify. The name must be valid and belong to the identity * @param sourceSecurityGroup * group to associate with this group. * @@ -143,7 +143,7 @@ public interface SecurityGroupClient { * communicate with instances outside the Region using group-based firewall rules. * Traffic from instances in another Region is seen as WAN bandwidth. * @param groupName - * Name of the group to modify. The name must be valid and belong to the account + * Name of the group to modify. The name must be valid and belong to the identity * @param ipProtocol * IP protocol. * @param fromPort @@ -176,7 +176,7 @@ public interface SecurityGroupClient { * communicate with instances outside the Region using group-based firewall rules. * Traffic from instances in another Region is seen as WAN bandwidth. * @param groupName - * Name of the group to modify. The name must be valid and belong to the account + * Name of the group to modify. The name must be valid and belong to the identity * @param sourceSecurityGroup * group to associate with this group. * @@ -208,7 +208,7 @@ public interface SecurityGroupClient { * communicate with instances outside the Region using group-based firewall rules. * Traffic from instances in another Region is seen as WAN bandwidth. * @param groupName - * Name of the group to modify. The name must be valid and belong to the account + * Name of the group to modify. The name must be valid and belong to the identity * @param ipProtocol * IP protocol. * @param fromPort diff --git a/aws/core/src/main/java/org/jclouds/aws/s3/domain/ListBucketResponse.java b/aws/core/src/main/java/org/jclouds/aws/s3/domain/ListBucketResponse.java index f4405d2d03..4a8094a019 100644 --- a/aws/core/src/main/java/org/jclouds/aws/s3/domain/ListBucketResponse.java +++ b/aws/core/src/main/java/org/jclouds/aws/s3/domain/ListBucketResponse.java @@ -32,7 +32,7 @@ import java.util.Set; * Amazon.com, only one person or organization can own a bucket within Amazon S3. Once you create a * uniquely named bucket in Amazon S3, you can organize and name the objects within the bucket in * any way you like and the bucket will remain yours for as long as you like and as long as you have - * the Amazon S3 account. + * the Amazon S3 identity. *

* The similarities between buckets and domain names is not a coincidence there is a direct mapping * between Amazon S3 buckets and subdomains of s3.amazonaws.com. Objects stored in Amazon S3 are diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java index 08b8f69a77..9f81d590bb 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java @@ -95,12 +95,12 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest { public void setupClient() throws InterruptedException, ExecutionException, TimeoutException, IOException { - String user = checkNotNull(System.getProperty("jclouds.test.user"), - "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), - "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), + "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), + "jclouds.test.credential"); Injector injector = new RestContextFactory().createContextBuilder( - "ec2", user, password, ImmutableSet. of(new Log4JLoggingModule())).buildInjector(); + "ec2", identity, credential, ImmutableSet. of(new Log4JLoggingModule())).buildInjector(); client = injector.getInstance(EC2Client.class); sshFactory = injector.getInstance(SshClient.Factory.class); runningTester = new RetryablePredicate( @@ -427,7 +427,7 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest { } private RunningInstance getInstance(String instanceId) { - // search my account for the instance I just created + // search my identity for the instance I just created Set reservations = client.getInstanceServices() .describeInstancesInRegion(null, instanceId); // last parameter // (ids) narrows the diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/EBSBootEC2ClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/EBSBootEC2ClientLiveTest.java index 2f9b83adae..9d3070cd2e 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/EBSBootEC2ClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/EBSBootEC2ClientLiveTest.java @@ -120,9 +120,9 @@ public class EBSBootEC2ClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws IOException { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); - Injector injector = new RestContextFactory().createContextBuilder("ec2", user, password, + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); + Injector injector = new RestContextFactory().createContextBuilder("ec2", identity, credential, ImmutableSet. of(new Log4JLoggingModule())).buildInjector(); client = injector.getInstance(EC2Client.class); sshFactory = injector.getInstance(SshClient.Factory.class); @@ -560,7 +560,7 @@ public class EBSBootEC2ClientLiveTest { .getId()); assert runningTester.apply(instance); - // search my account for the instance I just created + // search my identity for the instance I just created Set reservations = client.getInstanceServices().describeInstancesInRegion( instance.getRegion(), instance.getId()); // last // parameter diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2ComputeServiceLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2ComputeServiceLiveTest.java index ef3a885e96..5e89b87af0 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2ComputeServiceLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2ComputeServiceLiveTest.java @@ -97,7 +97,7 @@ public class EC2ComputeServiceLiveTest extends BaseComputeServiceLiveTest { options); NodeMetadata first = Iterables.get(nodes, 0); assert first.getCredentials() != null : first; - assert first.getCredentials().account != null : first; + assert first.getCredentials().identity != null : first; startedId = Iterables.getOnlyElement(nodes).getProviderId(); @@ -116,7 +116,7 @@ public class EC2ComputeServiceLiveTest extends BaseComputeServiceLiveTest { // try to run a script with the original keyPair runScriptWithCreds(tag, first.getImage().getOsFamily(), - new Credentials(first.getCredentials().account, result + new Credentials(first.getCredentials().identity, result .getKeyMaterial())); } finally { @@ -234,7 +234,7 @@ public class EC2ComputeServiceLiveTest extends BaseComputeServiceLiveTest { NodeMetadata first = Iterables.get(nodes, 0); assert first.getCredentials() != null : first; - assert first.getCredentials().account != null : first; + assert first.getCredentials().identity != null : first; startedId = Iterables.getOnlyElement(nodes).getProviderId(); nodeId = Iterables.getOnlyElement(nodes).getId(); diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2LoadBalancerServiceLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2LoadBalancerServiceLiveTest.java index 1ac18d0ef1..bc61cb062d 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2LoadBalancerServiceLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2LoadBalancerServiceLiveTest.java @@ -63,7 +63,7 @@ public class EC2LoadBalancerServiceLiveTest extends BaseLoadBalancerServiceLiveT @BeforeGroups(groups = { "live" }) public void setupELBClient() { - elbContext = new RestContextFactory().createContext("elb", user, password, + elbContext = new RestContextFactory().createContext("elb", identity, credential, ImmutableSet.of(new Log4JLoggingModule())); } diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2TemplateBuilderLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2TemplateBuilderLiveTest.java index 98a5cc69d7..c14d70b095 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2TemplateBuilderLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2TemplateBuilderLiveTest.java @@ -51,8 +51,8 @@ public class EC2TemplateBuilderLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws InterruptedException, ExecutionException, TimeoutException, IOException { - user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + user = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + password = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); } @Test diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java index e882e7aa5a..5622621005 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java @@ -61,7 +61,7 @@ import com.google.inject.internal.Lists; public class AMIClientLiveTest { private AMIClient client; - private String user; + private String identity; private String imageId = "ami-cdf819a4"; private static final String DEFAULT_MANIFEST = "adrianimages/image.manifest.xml"; private static final String DEFAULT_SNAPSHOT = "TODO"; @@ -71,11 +71,11 @@ public class AMIClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws IOException { - user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); context = new RestContextFactory().createContext( - "ec2", user, password, ImmutableSet. of(new Log4JLoggingModule())); + "ec2", identity, credential, ImmutableSet. of(new Log4JLoggingModule())); client = context.getApi().getAMIServices(); } diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java index a6372b00b7..7e60361136 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java @@ -61,10 +61,10 @@ public class AvailabilityZoneAndRegionClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws IOException { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - context = new RestContextFactory().createContext("ec2", user, password, ImmutableSet + context = new RestContextFactory().createContext("ec2", identity, credential, ImmutableSet . of(new Log4JLoggingModule())); client = context.getApi().getAvailabilityZoneAndRegionServices(); } diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreClientLiveTest.java index bc2e3d6e4e..be058fa6ed 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreClientLiveTest.java @@ -65,10 +65,10 @@ public class ElasticBlockStoreClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws IOException { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - context = new RestContextFactory().createContext("ec2", user, password, ImmutableSet + context = new RestContextFactory().createContext("ec2", identity, credential, ImmutableSet . of(new Log4JLoggingModule())); client = context.getApi().getElasticBlockStoreServices(); } diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticIPAddressClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticIPAddressClientLiveTest.java index 7299521008..cd97778cd3 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticIPAddressClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticIPAddressClientLiveTest.java @@ -54,10 +54,10 @@ public class ElasticIPAddressClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws IOException { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - context = new RestContextFactory().createContext("ec2", user, password, ImmutableSet + context = new RestContextFactory().createContext("ec2", identity, credential, ImmutableSet . of(new Log4JLoggingModule())); client = context.getApi().getElasticIPAddressServices(); } diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/InstanceClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/InstanceClientLiveTest.java index 518f7c4033..8a50b45e26 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/InstanceClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/InstanceClientLiveTest.java @@ -49,14 +49,14 @@ public class InstanceClientLiveTest { public static final String PREFIX = System.getProperty("user.name") + "-ec2"; private InstanceClient client; - private String user; + private String identity; private RestContext context; @BeforeGroups(groups = { "live" }) public void setupClient() throws IOException { - user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); - context = new RestContextFactory().createContext("ec2", user, password, ImmutableSet + identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); + context = new RestContextFactory().createContext("ec2", identity, credential, ImmutableSet . of(new Log4JLoggingModule())); client = context.getApi().getInstanceServices(); diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/KeyPairClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/KeyPairClientLiveTest.java index 975cc6b0f7..a3eef39505 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/KeyPairClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/KeyPairClientLiveTest.java @@ -54,9 +54,9 @@ public class KeyPairClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws IOException { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); - context = new RestContextFactory().createContext("ec2", user, password, ImmutableSet + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); + context = new RestContextFactory().createContext("ec2", identity, credential, ImmutableSet . of(new Log4JLoggingModule())); client = context.getApi().getKeyPairServices(); } diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/MonitoringClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/MonitoringClientLiveTest.java index d6299b882b..4124633709 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/MonitoringClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/MonitoringClientLiveTest.java @@ -50,10 +50,10 @@ public class MonitoringClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws IOException { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - context = new RestContextFactory().createContext("ec2", user, password, ImmutableSet + context = new RestContextFactory().createContext("ec2", identity, credential, ImmutableSet . of(new Log4JLoggingModule())); client = context.getApi().getMonitoringServices(); } diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/SecurityGroupClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/SecurityGroupClientLiveTest.java index 7cf671fb7f..b20c7c84c6 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/SecurityGroupClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/SecurityGroupClientLiveTest.java @@ -62,9 +62,9 @@ public class SecurityGroupClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws IOException { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); - context = new RestContextFactory().createContext("ec2", user, password, ImmutableSet + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); + context = new RestContextFactory().createContext("ec2", identity, credential, ImmutableSet . of(new Log4JLoggingModule())); client = context.getApi().getSecurityGroupServices(); } diff --git a/aws/core/src/test/java/org/jclouds/aws/elb/ELBClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/elb/ELBClientLiveTest.java index b8f5e39272..efaa05764e 100644 --- a/aws/core/src/test/java/org/jclouds/aws/elb/ELBClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/elb/ELBClientLiveTest.java @@ -53,10 +53,10 @@ public class ELBClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws IOException { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - context = new RestContextFactory().createContext("elb", user, password, ImmutableSet + context = new RestContextFactory().createContext("elb", identity, credential, ImmutableSet . of(new Log4JLoggingModule())); client = context.getApi(); } diff --git a/aws/core/src/test/java/org/jclouds/aws/s3/blobstore/integration/S3TestInitializer.java b/aws/core/src/test/java/org/jclouds/aws/s3/blobstore/integration/S3TestInitializer.java index 64a1bd2eec..c17c2f1170 100644 --- a/aws/core/src/test/java/org/jclouds/aws/s3/blobstore/integration/S3TestInitializer.java +++ b/aws/core/src/test/java/org/jclouds/aws/s3/blobstore/integration/S3TestInitializer.java @@ -38,9 +38,9 @@ public class S3TestInitializer extends TransientBlobStoreTestInitializer { @Override protected BlobStoreContext createLiveContext(Module configurationModule, String url, String app, - String account, String key) throws IOException { + String identity, String key) throws IOException { BaseBlobStoreIntegrationTest.SANITY_CHECK_RETURNED_BUCKET_NAME = true; - return new BlobStoreContextFactory().createContext("s3", account, key, ImmutableSet.of( + return new BlobStoreContextFactory().createContext("s3", identity, key, ImmutableSet.of( configurationModule, new Log4JLoggingModule()), new Properties()); } diff --git a/aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java index 824d024d03..2560174774 100644 --- a/aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java @@ -61,10 +61,10 @@ public class SQSClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws IOException { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - context = new RestContextFactory().createContext("sqs", user, password, ImmutableSet + context = new RestContextFactory().createContext("sqs", identity, credential, ImmutableSet . of(new Log4JLoggingModule())); this.client = context.getApi(); } diff --git a/aws/demos/googleappengine/pom.xml b/aws/demos/googleappengine/pom.xml index e2eab99161..d1c7f71b2c 100644 --- a/aws/demos/googleappengine/pom.xml +++ b/aws/demos/googleappengine/pom.xml @@ -186,11 +186,11 @@ - jclouds.test.user + jclouds.test.identity ${jclouds.aws.accesskeyid} - jclouds.test.key + jclouds.test.credential ${jclouds.aws.secretaccesskey} diff --git a/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java b/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java index 81067b8ad3..9a97450efd 100755 --- a/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java +++ b/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java @@ -50,12 +50,12 @@ public class GoogleAppEngineLiveTest { throws Exception { url = new URL(String.format("http://%s:%s", address, port)); Properties props = new Properties(); - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - props = new S3PropertiesBuilder(props).credentials(user, password).build(); + props = new S3PropertiesBuilder(props).credentials(identity, credential).build(); - props = new EC2PropertiesBuilder(props).credentials(user, password).build(); + props = new EC2PropertiesBuilder(props).credentials(identity, credential).build(); server = new GoogleDevServer(); server.writePropertiesAndStartServer(address, port, warfile, props); diff --git a/aws/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceLiveTest.java b/aws/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceLiveTest.java index 1b7ff76e9c..8d083dc46f 100755 --- a/aws/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceLiveTest.java +++ b/aws/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceLiveTest.java @@ -87,11 +87,11 @@ public class JCloudsS3ServiceLiveTest extends BaseBlobStoreIntegrationTest { @BeforeClass(groups = { "live" }, dependsOnMethods = "setUpResourcesOnThisThread") protected void createLiveS3Context(ITestContext testContext) throws S3ServiceException { - String account = System.getProperty("jclouds.test.user"); - String key = System.getProperty("jclouds.test.key"); + String identity = System.getProperty("jclouds.test.identity"); + String credential = System.getProperty("jclouds.test.credential"); - if (account != null) { - credentials = new AWSCredentials(account, key); + if (identity != null) { + credentials = new AWSCredentials(identity, credential); service = new JCloudsS3Service(credentials); } else { assert false : "credentials not present"; @@ -200,7 +200,7 @@ public class JCloudsS3ServiceLiveTest extends BaseBlobStoreIntegrationTest { TimeoutException, S3ServiceException { String bucketName = getContainerName(); try { - // Ensure there is at least 1 bucket in S3 account to list and compare. + // Ensure there is at least 1 bucket in S3 identity to list and compare. S3Bucket[] jsBuckets = service.listAllBuckets(); SortedSet jcBuckets = getApi() diff --git a/azure/pom.xml b/azure/pom.xml index 11477c1789..12fbf8142c 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -34,8 +34,8 @@ jclouds core components to access azure services - ${jclouds.azure.storage.account} - ${jclouds.azure.storage.key} + ${jclouds.azure.storage.account} + ${jclouds.azure.storage.key} org.jclouds.azure.storage.blob.blobstore.integration.AzureBlobTestInitializer diff --git a/azure/src/main/java/org/jclouds/azure/storage/blob/AzureBlobClient.java b/azure/src/main/java/org/jclouds/azure/storage/blob/AzureBlobClient.java index e5c4c98197..2285110514 100644 --- a/azure/src/main/java/org/jclouds/azure/storage/blob/AzureBlobClient.java +++ b/azure/src/main/java/org/jclouds/azure/storage/blob/AzureBlobClient.java @@ -50,7 +50,7 @@ public interface AzureBlobClient { public org.jclouds.azure.storage.blob.domain.AzureBlob newBlob(); /** - * The List Containers operation returns a list of the containers under the specified account. + * The List Containers operation returns a list of the containers under the specified identity. *

* The 2009-07-17 version of the List Containers operation times out after 30 seconds. * @@ -61,7 +61,7 @@ public interface AzureBlobClient { BoundedSet listContainers(ListOptions... listOptions); /** - * The Create Container operation creates a new container under the specified account. If the + * The Create Container operation creates a new container under the specified identity. If the * container with the same name already exists, the operation fails. *

* The container resource includes metadata and properties for that container. It does not @@ -117,7 +117,7 @@ public interface AzureBlobClient { /** * The root container is a default container that may be inferred from a URL requesting a blob * resource. The root container makes it possible to reference a blob from the top level of the - * storage account hierarchy, without referencing the container name. + * storage identity hierarchy, without referencing the container name. *

* The container resource includes metadata and properties for that container. It does not * include a list of the blobs contained by the container. diff --git a/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureAsyncBlobStore.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureAsyncBlobStore.java index beb5c7cb30..b9508b2f3f 100644 --- a/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureAsyncBlobStore.java +++ b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureAsyncBlobStore.java @@ -211,7 +211,7 @@ public class AzureAsyncBlobStore extends BaseAsyncBlobStore { * * @param container * bucket name - * @param key + * @param credential * object key */ @Override diff --git a/azure/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java b/azure/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java index c159dc77d9..509559830a 100644 --- a/azure/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java +++ b/azure/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java @@ -58,7 +58,7 @@ public class SharedKeyLiteAuthentication implements HttpRequestFilter { HttpHeaders.CONTENT_TYPE, HttpHeaders.DATE }; private final SignatureWire signatureWire; - private final String account; + private final String identity; private final byte[] key; private final Provider timeStampProvider; private final EncryptionService encryptionService; @@ -68,12 +68,12 @@ public class SharedKeyLiteAuthentication implements HttpRequestFilter { @Inject public SharedKeyLiteAuthentication(SignatureWire signatureWire, - @Named(Constants.PROPERTY_IDENTITY) String account, + @Named(Constants.PROPERTY_IDENTITY) String identity, @Named(Constants.PROPERTY_CREDENTIAL) String encodedKey, @TimeStamp Provider timeStampProvider, EncryptionService encryptionService) { this.encryptionService = encryptionService; this.signatureWire = signatureWire; - this.account = account; + this.identity = identity; this.key = encryptionService.fromBase64String(encodedKey); this.timeStampProvider = timeStampProvider; } @@ -104,7 +104,7 @@ public class SharedKeyLiteAuthentication implements HttpRequestFilter { if (signatureWire.enabled()) signatureWire.input(Utils.toInputStream(signature)); request.getHeaders().replaceValues(HttpHeaders.AUTHORIZATION, - Collections.singletonList("SharedKeyLite " + account + ":" + signature)); + Collections.singletonList("SharedKeyLite " + identity + ":" + signature)); } public String signString(String toSign) { @@ -149,8 +149,8 @@ public class SharedKeyLiteAuthentication implements HttpRequestFilter { void appendCanonicalizedResource(HttpRequest request, StringBuilder toSign) { // 1. Beginning with an empty string (""), append a forward slash (/), followed by the name of - // the account that owns the resource being accessed. - toSign.append("/").append(account); + // the identity that owns the resource being accessed. + toSign.append("/").append(identity); appendUriPath(request, toSign); } diff --git a/azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueueAsyncClient.java b/azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueueAsyncClient.java index 303de941d3..56c68b6dbc 100644 --- a/azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueueAsyncClient.java +++ b/azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueueAsyncClient.java @@ -53,7 +53,7 @@ import com.google.common.util.concurrent.ListenableFuture; * Provides asynchronous access to Azure Queue via their REST API. *

* The Queue service stores messages that may be read by any client who has access to the storage - * account. + * identity. *

* A queue can contain an unlimited number of messages, each of which can be up to 8 KB in size. * Messages are generally added to the end of the queue and retrieved from the front of the queue, diff --git a/azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueueClient.java b/azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueueClient.java index 851c09ca70..43c6cd12af 100644 --- a/azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueueClient.java +++ b/azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueueClient.java @@ -38,7 +38,7 @@ import com.google.common.util.concurrent.ListenableFuture; * Provides access to Azure Queue via their REST API. *

* The Queue service stores messages that may be read by any client who has access to the storage - * account. + * identity. *

* A queue can contain an unlimited number of messages, each of which can be up to 8 KB in size. * Messages are generally added to the end of the queue and retrieved from the front of the queue, @@ -59,7 +59,7 @@ import com.google.common.util.concurrent.ListenableFuture; public interface AzureQueueClient { /** - * The List Queues operation returns a list of the queues under the specified account. + * The List Queues operation returns a list of the queues under the specified identity. *

* The 2009-07-17 version of the List Queues operation times out after 30 seconds. * @@ -70,7 +70,7 @@ public interface AzureQueueClient { BoundedSet listQueues(ListOptions... listOptions); /** - * The Create Queue operation creates a new queue under the specified account. + * The Create Queue operation creates a new queue under the specified identity. *

* You can specify user-defined metadata as name-value pairs on the queue at the time that it is * created. diff --git a/azure/src/main/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandler.java b/azure/src/main/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandler.java index 4a916b91b6..bf9779317e 100755 --- a/azure/src/main/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandler.java +++ b/azure/src/main/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandler.java @@ -33,7 +33,7 @@ import com.google.common.collect.Sets; /** * Parses the following XML document: *

- * EnumerationResults AccountName="http://myaccount.queue.core.windows.net" + * EnumerationResults AccountName="http://myidentity.queue.core.windows.net" * * @see * @author Adrian Cole diff --git a/azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientLiveTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientLiveTest.java index bc83f0bad3..64fdc27638 100644 --- a/azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientLiveTest.java +++ b/azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientLiveTest.java @@ -71,10 +71,10 @@ public class AzureBlobClientLiveTest { @BeforeTest public void setupClient() throws IOException { - account = System.getProperty("jclouds.test.user"); - String key = System.getProperty("jclouds.test.key"); - client = (AzureBlobClient) new BlobStoreContextFactory().createContext("azureblob", account, - key, ImmutableSet. of(new Log4JLoggingModule())).getProviderSpecificContext().getApi(); + identity = System.getProperty("jclouds.test.identity"); + String credential = System.getProperty("jclouds.test.credential"); + client = (AzureBlobClient) new BlobStoreContextFactory().createContext("azureblob", identity, + credential, ImmutableSet. of(new Log4JLoggingModule())).getProviderSpecificContext().getApi(); } @Test @@ -88,7 +88,7 @@ public class AzureBlobClientLiveTest { String privateContainer; String publicContainer; - String account; + String identity; @Test(timeOut = 5 * 60 * 1000) public void testCreateContainer() throws Exception { @@ -111,7 +111,7 @@ public class AzureBlobClientLiveTest { assertTrue(containerCount >= 1); ListBlobsResponse list = client.listBlobs(privateContainer); assertEquals(list.getUrl(), URI.create(String.format("https://%s.blob.core.windows.net/%s", - account, privateContainer))); + identity, privateContainer))); // TODO ... check to see the container actually exists } @@ -130,7 +130,7 @@ public class AzureBlobClientLiveTest { } } // TODO - // URL url = new URL(String.format("http://%s.blob.core.windows.net/%s", account, + // URL url = new URL(String.format("http://%s.blob.core.windows.net/%s", identity, // publicContainer)); // Utils.toStringAndClose(url.openStream()); } @@ -164,7 +164,7 @@ public class AzureBlobClientLiveTest { } ListBlobsResponse list = client.listBlobs(); assertEquals(list.getUrl(), URI.create(String.format( - "https://%s.blob.core.windows.net/%%24root", account))); + "https://%s.blob.core.windows.net/%%24root", identity))); } @Test diff --git a/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobTestInitializer.java b/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobTestInitializer.java index b7fd485880..9c96c7fe9c 100644 --- a/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobTestInitializer.java +++ b/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobTestInitializer.java @@ -37,13 +37,13 @@ public class AzureBlobTestInitializer extends TransientBlobStoreTestInitializer @Override protected BlobStoreContext createLiveContext(Module configurationModule, String url, String app, - String account, String key) throws IOException { + String identity, String key) throws IOException { Properties properties = new Properties(); // properties.setProperty(PROPERTY_MAX_CONNECTIONS_PER_CONTEXT, Integer.toString(0)); // properties.setProperty(PROPERTY_MAX_CONNECTIONS_PER_HOST, Integer.toString(0)); // properties.setProperty(PROPERTY_USER_THREADS, Integer.toString(0)); // properties.setProperty(PROPERTY_IO_WORKER_THREADS, Integer.toString(20)); - return (BlobStoreContext) new BlobStoreContextFactory().createContext("azureblob", account, + return (BlobStoreContext) new BlobStoreContextFactory().createContext("azureblob", identity, key, ImmutableSet.of(configurationModule, new Log4JLoggingModule()), properties); } diff --git a/azure/src/test/java/org/jclouds/azure/storage/queue/AzureQueueClientLiveTest.java b/azure/src/test/java/org/jclouds/azure/storage/queue/AzureQueueClientLiveTest.java index a405cf18eb..1c3831bad1 100644 --- a/azure/src/test/java/org/jclouds/azure/storage/queue/AzureQueueClientLiveTest.java +++ b/azure/src/test/java/org/jclouds/azure/storage/queue/AzureQueueClientLiveTest.java @@ -50,7 +50,7 @@ import com.google.inject.Module; */ @Test(groups = "live", sequential = true, testName = "azurequeue.AzureQueueClientLiveTest") public class AzureQueueClientLiveTest { - String account; + String identity; protected AzureQueueClient connection; @@ -58,10 +58,10 @@ public class AzureQueueClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws IOException { - account = System.getProperty("jclouds.test.user"); - String key = System.getProperty("jclouds.test.key"); - connection = (AzureQueueClient) new RestContextFactory().createContext("azurequeue", account, - key, ImmutableSet. of(new Log4JLoggingModule())).getApi(); + identity = System.getProperty("jclouds.test.identity"); + String credential = System.getProperty("jclouds.test.credential"); + connection = (AzureQueueClient) new RestContextFactory().createContext("azurequeue", identity, + credential, ImmutableSet. of(new Log4JLoggingModule())).getApi(); } @Test diff --git a/blobstore/src/main/java/org/jclouds/blobstore/BlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/BlobStore.java index 1c767d6b82..1498ee4d25 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/BlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/BlobStore.java @@ -58,7 +58,7 @@ public interface BlobStore { Set listAssignableLocations(); /** - * Lists all root-level resources available to the account. + * Lists all root-level resources available to the identity. */ PageSet list(); @@ -72,7 +72,7 @@ public interface BlobStore { *

* * A container is a namespace for your objects. Depending on the service, the scope can be - * global, account, or sub-account scoped. For example, in Amazon S3, containers are called + * global, identity, or sub-identity scoped. For example, in Amazon S3, containers are called * buckets, and they must be uniquely named such that no-one else in the world conflicts. In * other blobstores, the naming convention of the container is less strict. All blobstores allow * you to list your containers and also the contents within them. These contents can either be diff --git a/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContext.java b/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContext.java index 9444bcd130..2e4f6d0f3d 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContext.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContext.java @@ -27,7 +27,7 @@ import com.google.inject.ImplementedBy; /** * Represents a cloud that has key-value storage functionality. This object is scoped to a service - * and an account. + * and an identity. * * @author Adrian Cole * diff --git a/blobstore/src/main/java/org/jclouds/blobstore/attr/ContainerVisibilities.java b/blobstore/src/main/java/org/jclouds/blobstore/attr/ContainerVisibilities.java index d62fa2b26b..23f3f3b74c 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/attr/ContainerVisibilities.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/attr/ContainerVisibilities.java @@ -28,12 +28,12 @@ public enum ContainerVisibilities { /** * Container namespace is shared by the general public and therefore has highest likelihood of - * collision. Containers created in public namespace are not deletable by other accounts. + * collision. Containers created in public namespace are not deletable by other identitys. */ PUBLIC, /** - * Container namespace is shared within an account and therefore all containers are deletable by - * the account. + * Container namespace is shared within an identity and therefore all containers are deletable by + * the identity. */ ACCOUNT } \ No newline at end of file diff --git a/blobstore/src/test/java/org/jclouds/blobstore/BlobStoreContextFactoryTest.java b/blobstore/src/test/java/org/jclouds/blobstore/BlobStoreContextFactoryTest.java index 363b9f4a1b..23c8740d1f 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/BlobStoreContextFactoryTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/BlobStoreContextFactoryTest.java @@ -38,22 +38,22 @@ import com.google.common.base.Splitter; public class BlobStoreContextFactoryTest { public void test() throws IOException { - URI blobStore = URI.create("service://account:key@container/path"); + URI blobStore = URI.create("service://identity:key@container/path"); assertEquals(blobStore.getScheme(), "service"); - Iterator accountKey = Splitter.on(":").split( + Iterator identityKey = Splitter.on(":").split( checkNotNull(blobStore.getUserInfo(), "userInfo")).iterator(); - assertEquals(accountKey.next(), "account"); - assertEquals(accountKey.next(), "key"); + assertEquals(identityKey.next(), "identity"); + assertEquals(identityKey.next(), "key"); assertEquals(blobStore.getHost(), "container"); assertEquals(blobStore.getPath(), "/path"); } public void testNoPassword() throws IOException { - URI blobStore = URI.create("service://account@container/path"); + URI blobStore = URI.create("service://identity@container/path"); assertEquals(blobStore.getScheme(), "service"); - Iterator accountKey = Splitter.on(":").split( + Iterator identityKey = Splitter.on(":").split( checkNotNull(blobStore.getUserInfo(), "userInfo")).iterator(); - assertEquals(accountKey.next(), "account"); + assertEquals(identityKey.next(), "identity"); assertEquals(blobStore.getHost(), "container"); assertEquals(blobStore.getPath(), "/path"); } diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobStoreTestInitializer.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobStoreTestInitializer.java index 929d578730..371ecc01fb 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobStoreTestInitializer.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobStoreTestInitializer.java @@ -34,7 +34,7 @@ public class TransientBlobStoreTestInitializer extends BaseTestInitializer { @Override protected BlobStoreContext createLiveContext(Module configurationModule, String url, String app, - String account, String key) throws IOException { + String identity, String key) throws IOException { return createStubContext(); } diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java index af13a1625b..a1a7831697 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java @@ -31,18 +31,18 @@ public abstract class BaseTestInitializer { throws Exception { String endpoint = System.getProperty("jclouds.test.endpoint"); String app = System.getProperty("jclouds.test.app"); - String account = System.getProperty("jclouds.test.user"); - String key = System.getProperty("jclouds.test.key"); + String identity = System.getProperty("jclouds.test.identity"); + String credential = System.getProperty("jclouds.test.credential"); if (endpoint != null) testContext.setAttribute("jclouds.test.endpoint", endpoint); if (app != null) testContext.setAttribute("jclouds.test.app", app); - if (account != null) - testContext.setAttribute("jclouds.test.user", account); - if (key != null) - testContext.setAttribute("jclouds.test.key", key); - if (account != null) { - return createLiveContext(configurationModule, endpoint, app, account, key); + if (identity != null) + testContext.setAttribute("jclouds.test.identity", identity); + if (credential != null) + testContext.setAttribute("jclouds.test.credential", credential); + if (identity != null) { + return createLiveContext(configurationModule, endpoint, app, identity, credential); } else { return createStubContext(); } @@ -51,5 +51,5 @@ public abstract class BaseTestInitializer { protected abstract BlobStoreContext createStubContext() throws IOException; protected abstract BlobStoreContext createLiveContext(Module configurationModule, String url, - String app, String account, String key) throws IOException; + String app, String identity, String key) throws IOException; } \ No newline at end of file diff --git a/boxdotnet/pom.xml b/boxdotnet/pom.xml index e16d4f5e3f..77a62c89a0 100644 --- a/boxdotnet/pom.xml +++ b/boxdotnet/pom.xml @@ -60,8 +60,8 @@ - apiKey - authToken + apiKey + authToken diff --git a/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetClientLiveTest.java b/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetClientLiveTest.java index 235fbea71f..09c3e48c1a 100644 --- a/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetClientLiveTest.java +++ b/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetClientLiveTest.java @@ -46,11 +46,11 @@ public class BoxDotNetClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); context = createContext(contextSpec("boxdotnet", "https://www.box.net/api/1.0/rest", "1.0", - user, password, BoxDotNetClient.class, BoxDotNetAsyncClient.class)); + identity, credential, BoxDotNetClient.class, BoxDotNetAsyncClient.class)); connection = context.getApi(); } diff --git a/chef/pom.xml b/chef/pom.xml index 4ea5dd7815..0201872d8d 100644 --- a/chef/pom.xml +++ b/chef/pom.xml @@ -63,8 +63,8 @@ chef-validator /etc/chef/validation.pem http://localhost:4000 - ${jclouds.chef.identity} - ${jclouds.chef.rsa-key} + ${jclouds.chef.identity} + ${jclouds.chef.rsa-key} ${jclouds.chef.endpoint} diff --git a/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java b/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java index 16955d6216..5b0d684905 100644 --- a/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java +++ b/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java @@ -78,8 +78,8 @@ public class ChefClientLiveTest { String validatorKey = System.getProperty("jclouds.test.validator.key"); if (validatorKey == null || validatorKey.equals("")) validatorKey = System.getProperty("user.home") + "/.chef/validation.pem"; - user = checkNotNull(System.getProperty("jclouds.test.user")); - String keyfile = System.getProperty("jclouds.test.key"); + user = checkNotNull(System.getProperty("jclouds.test.identity")); + String keyfile = System.getProperty("jclouds.test.credential"); if (keyfile == null || keyfile.equals("")) keyfile = System.getProperty("user.home") + "/.chef/" + user + ".pem"; validatorConnection = createConnection(validator, Files.toString(new File(validatorKey), diff --git a/compute/src/main/java/org/jclouds/compute/callables/AuthorizeRSAPublicKey.java b/compute/src/main/java/org/jclouds/compute/callables/AuthorizeRSAPublicKey.java index e627f61af3..79798d8698 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/AuthorizeRSAPublicKey.java +++ b/compute/src/main/java/org/jclouds/compute/callables/AuthorizeRSAPublicKey.java @@ -50,7 +50,7 @@ public class AuthorizeRSAPublicKey implements SshCallable { public ExecResponse call() throws Exception { ssh.exec("mkdir .ssh"); ssh.put(".ssh/id_rsa.pub", new ByteArrayInputStream(publicKey.getBytes())); - logger.debug(">> authorizing rsa public key for %s@%s", node.getCredentials().account, + logger.debug(">> authorizing rsa public key for %s@%s", node.getCredentials().identity, Iterables.get(node.getPublicAddresses(), 0)); ExecResponse returnVal = ssh.exec("cat .ssh/id_rsa.pub >> .ssh/authorized_keys"); returnVal = ssh.exec("chmod 600 .ssh/authorized_keys"); diff --git a/compute/src/main/java/org/jclouds/compute/callables/InstallRSAPrivateKey.java b/compute/src/main/java/org/jclouds/compute/callables/InstallRSAPrivateKey.java index f7d25cfbc6..ead59b07d3 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/InstallRSAPrivateKey.java +++ b/compute/src/main/java/org/jclouds/compute/callables/InstallRSAPrivateKey.java @@ -50,7 +50,7 @@ public class InstallRSAPrivateKey implements SshCallable { public ExecResponse call() throws Exception { ssh.exec("mkdir .ssh"); ssh.put(".ssh/id_rsa", new ByteArrayInputStream(privateKey.getBytes())); - logger.debug(">> installing rsa key for %s@%s", node.getCredentials().account, Iterables.get( + logger.debug(">> installing rsa key for %s@%s", node.getCredentials().identity, Iterables.get( node.getPublicAddresses(), 0)); return ssh.exec("chmod 600 .ssh/id_rsa"); } diff --git a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNode.java b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNode.java index 37d471d485..1d05ad6cce 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNode.java +++ b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNode.java @@ -83,10 +83,10 @@ public class RunScriptOnNode implements SshCallable { runScriptNotRunning.apply(new CommandUsingClient("./" + scriptName + " status", ssh)); logger.debug("<< complete(%d)", returnVal.getExitCode()); if (logger.isDebugEnabled() || returnVal.getExitCode() != 0) { - logger.debug("<< stdout from %s as %s@%s\n%s", scriptName, node.getCredentials().account, + logger.debug("<< stdout from %s as %s@%s\n%s", scriptName, node.getCredentials().identity, Iterables.get(node.getPublicAddresses(), 0), ssh .exec("./" + scriptName + " tail").getOutput()); - logger.debug("<< stderr from %s as %s@%s\n%s", scriptName, node.getCredentials().account, + logger.debug("<< stderr from %s as %s@%s\n%s", scriptName, node.getCredentials().identity, Iterables.get(node.getPublicAddresses(), 0), ssh.exec( "./" + scriptName + " tailerr").getOutput()); } @@ -100,24 +100,24 @@ public class RunScriptOnNode implements SshCallable { } private ExecResponse runScriptAsRoot() { - if (node.getCredentials().account.equals("root")) { - logger.debug(">> running %s as %s@%s", scriptName, node.getCredentials().account, + if (node.getCredentials().identity.equals("root")) { + logger.debug(">> running %s as %s@%s", scriptName, node.getCredentials().identity, Iterables.get(node.getPublicAddresses(), 0)); return ssh.exec("./" + scriptName + " start"); } else if (ComputeServiceUtils.isKeyAuth(node)) { - logger.debug(">> running sudo %s as %s@%s", scriptName, node.getCredentials().account, + logger.debug(">> running sudo %s as %s@%s", scriptName, node.getCredentials().identity, Iterables.get(node.getPublicAddresses(), 0)); return ssh.exec("sudo ./" + scriptName + " start"); } else { - logger.debug(">> running sudo -S %s as %s@%s", scriptName, node.getCredentials().account, + logger.debug(">> running sudo -S %s as %s@%s", scriptName, node.getCredentials().identity, Iterables.get(node.getPublicAddresses(), 0)); - return ssh.exec(String.format("echo '%s'|sudo -S ./%s", node.getCredentials().key, + return ssh.exec(String.format("echo '%s'|sudo -S ./%s", node.getCredentials().credential, scriptName + " start")); } } private ExecResponse runScriptAsDefaultUser() { - logger.debug(">> running script %s as %s@%s", scriptName, node.getCredentials().account, + logger.debug(">> running script %s as %s@%s", scriptName, node.getCredentials().identity, Iterables.get(node.getPublicAddresses(), 0)); return ssh.exec(String.format("./%s", scriptName + " start")); } diff --git a/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java b/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java index 2c72ec8b0a..e55c52f879 100755 --- a/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java +++ b/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java @@ -412,10 +412,10 @@ public class BaseComputeService implements ComputeService { // don't override checkNotNull(node.getCredentials(), "If the default credentials need to be used, they can't be null"); - checkNotNull(node.getCredentials().account, + checkNotNull(node.getCredentials().identity, "Account name for ssh authentication must be " + "specified. Try passing RunScriptOptions with new credentials"); - checkNotNull(node.getCredentials().key, + checkNotNull(node.getCredentials().credential, "Key or password for ssh authentication must be " + "specified. Try passing RunScriptOptions with new credentials"); } diff --git a/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java b/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java index 0a342d3636..e8bce70dda 100644 --- a/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java +++ b/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java @@ -80,8 +80,8 @@ public class RunScriptOptions { public RunScriptOptions withOverridingCredentials(Credentials overridingCredentials) { checkNotNull(overridingCredentials, "overridingCredentials"); - checkNotNull(overridingCredentials.account, "overridingCredentials.account"); - checkNotNull(overridingCredentials.key, "overridingCredentials.key"); + checkNotNull(overridingCredentials.identity, "overridingCredentials.identity"); + checkNotNull(overridingCredentials.credential, "overridingCredentials.key"); this.overridingCredentials = overridingCredentials; return this; } diff --git a/compute/src/main/java/org/jclouds/compute/strategy/PopulateDefaultLoginCredentialsForImageStrategy.java b/compute/src/main/java/org/jclouds/compute/strategy/PopulateDefaultLoginCredentialsForImageStrategy.java index 3c17a412f5..683ae4f46b 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/PopulateDefaultLoginCredentialsForImageStrategy.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/PopulateDefaultLoginCredentialsForImageStrategy.java @@ -38,7 +38,7 @@ public interface PopulateDefaultLoginCredentialsForImageStrategy { * responsibility of an implementation to apply * the cloud-specific logic. * @return credentials object. Note: the key - * may not be set, but the account must be set + * may not be set, but the identity must be set */ Credentials execute(Object resourceToAuthenticate); diff --git a/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java b/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java index a927609977..536aa9ede5 100644 --- a/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java +++ b/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java @@ -144,8 +144,8 @@ public class ComputeServiceUtils { } public static boolean isKeyAuth(NodeMetadata createdNode) { - return createdNode.getCredentials().key != null - && createdNode.getCredentials().key.startsWith("-----BEGIN RSA PRIVATE KEY-----"); + return createdNode.getCredentials().credential != null + && createdNode.getCredentials().credential.startsWith("-----BEGIN RSA PRIVATE KEY-----"); } /** diff --git a/compute/src/main/java/org/jclouds/compute/util/ComputeUtils.java b/compute/src/main/java/org/jclouds/compute/util/ComputeUtils.java index 4beb16c6f0..0fe904d77b 100644 --- a/compute/src/main/java/org/jclouds/compute/util/ComputeUtils.java +++ b/compute/src/main/java/org/jclouds/compute/util/ComputeUtils.java @@ -201,7 +201,7 @@ public class ComputeUtils { Iterable> parallel, @Nullable SshCallable last) { checkState(this.sshFactory != null, "runScript requested, but no SshModule configured"); checkNodeHasPublicIps(node); - checkNotNull(node.getCredentials().key, "credentials.key for node " + node.getId()); + checkNotNull(node.getCredentials().credential, "credentials.key for node " + node.getId()); SshClient ssh = createSshClientOncePortIsListeningOnNode(node); try { ssh.connect(); @@ -232,9 +232,9 @@ public class ComputeUtils { public SshClient createSshClientOncePortIsListeningOnNode(NodeMetadata node) { IPSocket socket = new IPSocket(Iterables.get(node.getPublicAddresses(), 0), 22); socketTester.apply(socket); - SshClient ssh = isKeyAuth(node) ? sshFactory.create(socket, node.getCredentials().account, - node.getCredentials().key.getBytes()) : sshFactory.create(socket, node - .getCredentials().account, node.getCredentials().key); + SshClient ssh = isKeyAuth(node) ? sshFactory.create(socket, node.getCredentials().identity, + node.getCredentials().credential.getBytes()) : sshFactory.create(socket, node + .getCredentials().identity, node.getCredentials().credential); return ssh; } diff --git a/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java index 6385b77441..4dcaf066d7 100755 --- a/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java @@ -93,8 +93,8 @@ public abstract class BaseComputeServiceLiveTest { protected SortedSet nodes; protected ComputeServiceContext context; protected ComputeService client; - protected String user; - protected String password; + protected String identity; + protected String credential; protected Template template; protected Map keyPair; @@ -133,10 +133,10 @@ public abstract class BaseComputeServiceLiveTest { } protected void setupCredentials() { - user = checkNotNull(System.getProperty("jclouds.test.user"), - "jclouds.test.user"); - password = checkNotNull(System.getProperty("jclouds.test.key"), - "jclouds.test.key"); + identity = checkNotNull(System.getProperty("jclouds.test.identity"), + "jclouds.test.identity"); + credential = checkNotNull(System.getProperty("jclouds.test.credential"), + "jclouds.test.credential"); } protected Injector createSshClientInjector() { @@ -147,7 +147,7 @@ public abstract class BaseComputeServiceLiveTest { if (context != null) context.close(); context = new ComputeServiceContextFactory() - .createContext(service, user, password, ImmutableSet.of( + .createContext(service, identity, credential, ImmutableSet.of( new Log4JLoggingModule(), getSshModule())); client = context.getComputeService(); } @@ -198,13 +198,13 @@ public abstract class BaseComputeServiceLiveTest { Set nodes = client.runNodesWithTag(tag, 1, options); Credentials good = nodes.iterator().next().getCredentials(); - assert good.account != null; - assert good.key != null; + assert good.identity != null; + assert good.credential != null; Image image = Iterables.get(nodes, 0).getImage(); try { Map responses = runScriptWithCreds( - tag, image.getOsFamily(), new Credentials(good.account, + tag, image.getOsFamily(), new Credentials(good.identity, "romeo")); assert false : "shouldn't pass with a bad password\n" + responses; } catch (RunScriptOnNodesException e) { @@ -297,7 +297,7 @@ public abstract class BaseComputeServiceLiveTest { } catch (SshException e) { if (Throwables.getRootCause(e).getMessage().contains("Auth fail")) { // System.err.printf("bad credentials: %s:%s for %s%n", - // creds.account, creds.key, client + // creds.identity, creds.key, client // .listNodesDetailsMatching(tag)); } throw e; @@ -314,9 +314,9 @@ public abstract class BaseComputeServiceLiveTest { assert node.getPublicAddresses().size() >= 1 || node.getPrivateAddresses().size() >= 1 : "no ips in" + node; assertNotNull(node.getCredentials()); - if (node.getCredentials().account != null) { - assertNotNull(node.getCredentials().account); - assertNotNull(node.getCredentials().key); + if (node.getCredentials().identity != null) { + assertNotNull(node.getCredentials().identity); + assertNotNull(node.getCredentials().credential); sshPing(node); } } @@ -536,7 +536,7 @@ public abstract class BaseComputeServiceLiveTest { socketTester.apply(socket); // TODO add transitionTo option that accepts // a socket conection // state. - SshClient ssh = sshFactory.create(socket, node.getCredentials().account, + SshClient ssh = sshFactory.create(socket, node.getCredentials().identity, keyPair.get("private").getBytes()); try { ssh.connect(); diff --git a/compute/src/test/java/org/jclouds/compute/BaseLoadBalancerServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/BaseLoadBalancerServiceLiveTest.java index 6ddabbe8c8..931e4633db 100644 --- a/compute/src/test/java/org/jclouds/compute/BaseLoadBalancerServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/BaseLoadBalancerServiceLiveTest.java @@ -69,8 +69,8 @@ public abstract class BaseLoadBalancerServiceLiveTest { protected ComputeServiceContext context; protected ComputeService client; protected LoadBalancerService lbClient; - protected String user; - protected String password; + protected String identity; + protected String credential; protected Template template; protected Map keyPair; protected Set loadbalancers; @@ -80,8 +80,8 @@ public abstract class BaseLoadBalancerServiceLiveTest { IOException, RunNodesException { if (tag == null) tag = checkNotNull(service, "service") + "lb"; - user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); initializeContextAndClient(); @@ -99,7 +99,7 @@ public abstract class BaseLoadBalancerServiceLiveTest { private void initializeContextAndClient() throws IOException { if (context != null) context.close(); - context = new ComputeServiceContextFactory().createContext(service, user, password, + context = new ComputeServiceContextFactory().createContext(service, identity, credential, ImmutableSet.of(new Log4JLoggingModule(), getSshModule())); client = context.getComputeService(); lbClient = context.getLoadBalancerService(); diff --git a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java index 3f730c5df8..cf0ee663aa 100644 --- a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java +++ b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java @@ -255,8 +255,8 @@ public class StubComputeServiceIntegrationTest extends @Override protected void setupCredentials() { - user = "stub"; - password = "stub"; + identity = "stub"; + credential = "stub"; } protected void assertNodeZero(Set metadataSet) { @@ -279,7 +279,7 @@ public class StubComputeServiceIntegrationTest extends public void testAssignability() throws Exception { @SuppressWarnings("unused") RestContext, ConcurrentMap> stubContext = new ComputeServiceContextFactory() - .createContext(service, user, password) + .createContext(service, identity, credential) .getProviderSpecificContext(); } diff --git a/core/src/main/java/org/jclouds/domain/Credentials.java b/core/src/main/java/org/jclouds/domain/Credentials.java index 681f5311c5..60ee50b6c1 100644 --- a/core/src/main/java/org/jclouds/domain/Credentials.java +++ b/core/src/main/java/org/jclouds/domain/Credentials.java @@ -33,35 +33,35 @@ import com.google.common.collect.Lists; */ public class Credentials { - public final String account; - public final String key; + public final String identity; + public final String credential; - public Credentials(String account, String key) { - this.account = account; - this.key = key; + public Credentials(String identity, String credential) { + this.identity = identity; + this.credential = credential; } public static Credentials parse(URI uri) { checkNotNull(uri, "uri"); List userInfo = Lists.newArrayList(Splitter.on(':').split( checkNotNull(uri.getUserInfo(), "no userInfo in " + uri))); - String account = checkNotNull(userInfo.get(0), "no username in " + uri.getUserInfo()); - if (HttpUtils.isUrlEncoded(account)) { - account = HttpUtils.urlDecode(account); + String identity = checkNotNull(userInfo.get(0), "no username in " + uri.getUserInfo()); + if (HttpUtils.isUrlEncoded(identity)) { + identity = HttpUtils.urlDecode(identity); } - String key = userInfo.size() > 1 ? userInfo.get(1) : null; - if (key != null && HttpUtils.isUrlEncoded(key)) { - key = HttpUtils.urlDecode(key); + String credential = userInfo.size() > 1 ? userInfo.get(1) : null; + if (credential != null && HttpUtils.isUrlEncoded(credential)) { + credential = HttpUtils.urlDecode(credential); } - return new Credentials(account, key); + return new Credentials(identity, credential); } @Override public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((account == null) ? 0 : account.hashCode()); - result = prime * result + ((key == null) ? 0 : key.hashCode()); + result = prime * result + ((identity == null) ? 0 : identity.hashCode()); + result = prime * result + ((credential == null) ? 0 : credential.hashCode()); return result; } @@ -74,15 +74,15 @@ public class Credentials { if (getClass() != obj.getClass()) return false; Credentials other = (Credentials) obj; - if (account == null) { - if (other.account != null) + if (identity == null) { + if (other.identity != null) return false; - } else if (!account.equals(other.account)) + } else if (!identity.equals(other.identity)) return false; - if (key == null) { - if (other.key != null) + if (credential == null) { + if (other.credential != null) return false; - } else if (!key.equals(other.key)) + } else if (!credential.equals(other.credential)) return false; return true; diff --git a/core/src/main/java/org/jclouds/http/HttpUtils.java b/core/src/main/java/org/jclouds/http/HttpUtils.java index c833059ae4..2582307a7a 100644 --- a/core/src/main/java/org/jclouds/http/HttpUtils.java +++ b/core/src/main/java/org/jclouds/http/HttpUtils.java @@ -281,9 +281,9 @@ public class HttpUtils { if (matcher.find()) { String scheme = matcher.group(1); String rest = matcher.group(4); - String account = matcher.group(2); + String identity = matcher.group(2); String key = matcher.group(3); - return URI.create(String.format("%s://%s:%s@%s", scheme, urlEncode(account), + return URI.create(String.format("%s://%s:%s@%s", scheme, urlEncode(identity), urlEncode(key), rest)); } else { throw new IllegalArgumentException("bad syntax"); diff --git a/core/src/main/java/org/jclouds/rest/annotations/Identity.java b/core/src/main/java/org/jclouds/rest/annotations/Identity.java index af75bf1f7c..d54493b93d 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/Identity.java +++ b/core/src/main/java/org/jclouds/rest/annotations/Identity.java @@ -29,7 +29,7 @@ import java.lang.annotation.Target; import javax.inject.Qualifier; /** - * Designates that this Resource qualifies an object to an account on a provider. + * Designates that this Resource qualifies an object to an identity on a provider. * * @author Adrian Cole */ diff --git a/core/src/test/java/org/jclouds/domain/CredentialsTest.java b/core/src/test/java/org/jclouds/domain/CredentialsTest.java index 7287e22e2d..73c929024a 100644 --- a/core/src/test/java/org/jclouds/domain/CredentialsTest.java +++ b/core/src/test/java/org/jclouds/domain/CredentialsTest.java @@ -32,51 +32,51 @@ public class CredentialsTest { public void testAzure() { Credentials creds = Credentials.parse(URI - .create("compute://account:Base64==@azureblob/container-hyphen/prefix")); - assertEquals(creds.account, "account"); - assertEquals(creds.key, "Base64=="); + .create("compute://identity:Base64==@azureblob/container-hyphen/prefix")); + assertEquals(creds.identity, "identity"); + assertEquals(creds.credential, "Base64=="); } public void testAtmos() { Credentials creds = Credentials.parse(URI .create("compute://domain%2Fuser:Base64%3D%3D@azureblob/container-hyphen/prefix")); - assertEquals(creds.account, "domain/user"); - assertEquals(creds.key, "Base64=="); + assertEquals(creds.identity, "domain/user"); + assertEquals(creds.credential, "Base64=="); } public void testHosting() { Credentials creds = Credentials.parse(URI .create("compute://user%40domain:pa%24sword@hostingdotcom")); - assertEquals(creds.account, "user@domain"); - assertEquals(creds.key, "pa$sword"); + assertEquals(creds.identity, "user@domain"); + assertEquals(creds.credential, "pa$sword"); } public void testTerremark() { Credentials creds = Credentials.parse(URI .create("compute://user%40domain:password@terremark")); - assertEquals(creds.account, "user@domain"); - assertEquals(creds.key, "password"); + assertEquals(creds.identity, "user@domain"); + assertEquals(creds.credential, "password"); } public void testTerremark2() { Credentials creds = Credentials.parse(URI .create("compute://user%40domain:passw%40rd@terremark")); - assertEquals(creds.account, "user@domain"); - assertEquals(creds.key, "passw@rd"); + assertEquals(creds.identity, "user@domain"); + assertEquals(creds.credential, "passw@rd"); } public void testTerremark3() { Credentials creds = Credentials.parse(URI .create("compute://user%40domain:AbC%21%40943%21@terremark")); - assertEquals(creds.account, "user@domain"); - assertEquals(creds.key, "AbC!@943!"); + assertEquals(creds.identity, "user@domain"); + assertEquals(creds.credential, "AbC!@943!"); } public void testCloudFiles() { Credentials creds = Credentials.parse(URI - .create("compute://account:h3c@cloudfiles/container-hyphen/prefix")); - assertEquals(creds.account, "account"); - assertEquals(creds.key, "h3c"); + .create("compute://identity:h3c@cloudfiles/container-hyphen/prefix")); + assertEquals(creds.identity, "identity"); + assertEquals(creds.credential, "h3c"); } @@ -84,16 +84,16 @@ public class CredentialsTest { Credentials creds = Credentials .parse(URI.create("compute://0AB:aA%2B%2F0@s3/buck-et/prefix")); - assertEquals(creds.account, "0AB"); - assertEquals(creds.key, "aA+/0"); + assertEquals(creds.identity, "0AB"); + assertEquals(creds.credential, "aA+/0"); } public void testS3Space() { Credentials creds = Credentials.parse(URI .create("compute://0AB:aA%2B%2F0@s3/buck-et/pre%20fix")); - assertEquals(creds.account, "0AB"); - assertEquals(creds.key, "aA+/0"); + assertEquals(creds.identity, "0AB"); + assertEquals(creds.credential, "aA+/0"); } } diff --git a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java index ebeea67a4e..9a5b0a62bd 100755 --- a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java @@ -945,10 +945,10 @@ public class RestAnnotationProcessorTest { } @SkipEncoding('/') - @Path("/v1/{account}") + @Path("/v1/{identity}") public interface TestConstantPathParam { - @Named("testaccount") - @PathParam("account") + @Named("testidentity") + @PathParam("identity") void setUsername(); @GET diff --git a/core/src/test/java/org/jclouds/util/HttpUtilsTest.java b/core/src/test/java/org/jclouds/util/HttpUtilsTest.java index ab69794666..acefd48074 100644 --- a/core/src/test/java/org/jclouds/util/HttpUtilsTest.java +++ b/core/src/test/java/org/jclouds/util/HttpUtilsTest.java @@ -60,9 +60,9 @@ public class HttpUtilsTest extends PerformanceTest { public void testAzure() { URI creds = HttpUtils - .createUri("compute://account:Base64==@azureblob/container-hyphen/prefix"); + .createUri("compute://identity:Base64==@azureblob/container-hyphen/prefix"); assertEquals(creds, URI - .create("compute://account:Base64==@azureblob/container-hyphen/prefix")); + .create("compute://identity:Base64==@azureblob/container-hyphen/prefix")); } public void testHosting() { @@ -90,8 +90,8 @@ public class HttpUtilsTest extends PerformanceTest { } public void testCloudFiles() { - URI creds = HttpUtils.createUri("compute://account:h3c@cloudfiles/container-hyphen/prefix"); - assertEquals(creds, URI.create("compute://account:h3c@cloudfiles/container-hyphen/prefix")); + URI creds = HttpUtils.createUri("compute://identity:h3c@cloudfiles/container-hyphen/prefix"); + assertEquals(creds, URI.create("compute://identity:h3c@cloudfiles/container-hyphen/prefix")); } public void testS3() { diff --git a/gogrid/pom.xml b/gogrid/pom.xml index 10ab7b2bfb..f4b73057d2 100644 --- a/gogrid/pom.xml +++ b/gogrid/pom.xml @@ -42,8 +42,8 @@ http://jclouds.googlecode.com/svn/trunk/gogrid - ${jclouds.gogrid.apikey} - ${jclouds.gogrid.secret} + ${jclouds.gogrid.apikey} + ${jclouds.gogrid.secret} diff --git a/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridAddNodeWithTagStrategy.java b/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridAddNodeWithTagStrategy.java index 97a6fbb916..6993fd427e 100644 --- a/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridAddNodeWithTagStrategy.java +++ b/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridAddNodeWithTagStrategy.java @@ -84,7 +84,7 @@ public class GoGridAddNodeWithTagStrategy implements AddNodeWithTagStrategy { IpType.PUBLIC)); if (availableIps.size() == 0) throw new RuntimeException( - "No public IPs available on this account."); + "No public IPs available on this identity."); int ipIndex = new SecureRandom().nextInt(availableIps.size()); Ip availableIp = Iterables.get(availableIps, ipIndex); try { diff --git a/gogrid/src/test/java/org/jclouds/gogrid/GoGridComputeServiceLiveTest.java b/gogrid/src/test/java/org/jclouds/gogrid/GoGridComputeServiceLiveTest.java index 8f0eaa5824..a15cab02dc 100644 --- a/gogrid/src/test/java/org/jclouds/gogrid/GoGridComputeServiceLiveTest.java +++ b/gogrid/src/test/java/org/jclouds/gogrid/GoGridComputeServiceLiveTest.java @@ -59,6 +59,6 @@ public class GoGridComputeServiceLiveTest extends BaseComputeServiceLiveTest { public void testAssignability() throws Exception { @SuppressWarnings("unused") RestContext goGridContext = new ComputeServiceContextFactory() - .createContext(service, user, password).getProviderSpecificContext(); + .createContext(service, identity, credential).getProviderSpecificContext(); } } diff --git a/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTest.java b/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTest.java index 0af0edaf07..81d9b6848a 100644 --- a/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTest.java +++ b/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTest.java @@ -94,10 +94,10 @@ public class GoGridLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - context = new RestContextFactory().createContext("gogrid", user, password, ImmutableSet + context = new RestContextFactory().createContext("gogrid", identity, credential, ImmutableSet . of(new Log4JLoggingModule())); client = context.getApi(); @@ -360,7 +360,7 @@ public class GoGridLiveTest { socketOpen.apply(socket); SshClient sshClient = new JschSshClient(new BackoffLimitedRetryHandler(), socket, 60000, - instanceCredentials.account, instanceCredentials.key, null); + instanceCredentials.identity, instanceCredentials.credential, null); sshClient.connect(); String output = sshClient.exec("df").getOutput(); assertTrue(output.contains("Filesystem"), diff --git a/ibmdev/pom.xml b/ibmdev/pom.xml index bf52aeeeb1..7fd6c0c8a8 100644 --- a/ibmdev/pom.xml +++ b/ibmdev/pom.xml @@ -58,8 +58,8 @@ - ${providerUser} - ${providerPassword} + ${providerUser} + ${providerPassword} https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403 diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java b/ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java index bdf9f6b41d..c907ba16f7 100644 --- a/ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java +++ b/ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java @@ -82,6 +82,6 @@ public class InstanceToNodeMetadata implements Function return new NodeMetadataImpl(from.getId() + "", from.getName(), from.getId() + "", locations .get(image.getLocation()), null, ImmutableMap. of(), tag, image, state, ipSet, ImmutableList. of(), ImmutableMap. of(), - new Credentials(image.getDefaultCredentials().account, key)); + new Credentials(image.getDefaultCredentials().identity, key)); } } \ No newline at end of file diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java b/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java index a89768d8df..ca5d3e8678 100644 --- a/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java +++ b/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java @@ -83,7 +83,7 @@ public class IBMDeveloperCloudClientLiveTest { private ImmutableMap keyPair; private Key key; private Volume volume; - private String user; + private String identity; private Instance instance2; private Instance instance; private RestContext context; @@ -94,13 +94,13 @@ public class IBMDeveloperCloudClientLiveTest { public void setupClient() { String endpoint = System.getProperty("jclouds.test.endpoint"); - user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); Properties props = new Properties(); if (endpoint != null) props.setProperty("ibmdev.endpoint", endpoint); - context = new RestContextFactory().createContext("ibmdev", user, password, ImmutableSet + context = new RestContextFactory().createContext("ibmdev", identity, credential, ImmutableSet . of(new Log4JLoggingModule()), props); connection = context.getApi(); @@ -376,7 +376,7 @@ public class IBMDeveloperCloudClientLiveTest { assertEquals(instance.getKeyName(), key.getName()); assertNotNull(instance.getLaunchTime()); assertNotNull(instance.getExpirationTime()); - assertEquals(instance.getOwner(), user); + assertEquals(instance.getOwner(), identity); assertEquals(instance.getProductCodes(), ImmutableSet. of()); assertEquals(instance.getRequestName(), name); assertNotNull(instance.getRequestId()); diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTest.java b/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTest.java index 701318eb72..314b7679e6 100644 --- a/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTest.java +++ b/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTest.java @@ -72,7 +72,7 @@ public class IBMDeveloperCloudComputeServiceLiveTest extends BaseComputeServiceL public void testAssignability() throws Exception { @SuppressWarnings("unused") RestContext tmContext = new ComputeServiceContextFactory() - .createContext(service, user, password).getProviderSpecificContext(); + .createContext(service, identity, credential).getProviderSpecificContext(); } } \ No newline at end of file diff --git a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java b/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java index fd8ce01270..86c6ee53e0 100644 --- a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java +++ b/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java @@ -65,7 +65,7 @@ public class PCSClientLiveTest { private PCSClient connection; - private String user; + private String identity; Provider uriBuilderProvider = new Provider() { @Override @@ -79,14 +79,14 @@ public class PCSClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws InterruptedException, ExecutionException, TimeoutException { - user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); String endpoint = checkNotNull(System.getProperty("jclouds.test.endpoint"), "jclouds.test.endpoint"); Properties props = new Properties(); props.setProperty("pcs.endpoint", endpoint); - context = new RestContextFactory().createContext("pcs", user, password, ImmutableSet + context = new RestContextFactory().createContext("pcs", identity, credential, ImmutableSet . of(new Log4JLoggingModule()), props); connection = context.getApi(); @@ -163,7 +163,7 @@ public class PCSClientLiveTest { assertNotNull(response.getMetadata()); assertNotNull(response.getModified()); assertEquals(response.getName(), name); - assertEquals(response.getOwner(), user); + assertEquals(response.getOwner(), identity); assertEquals(response.getParent(), parent); assertNotNull(response.getTags()); assertNotNull(response.getType()); diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/config/SDNAuthRestClientModule.java b/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/config/SDNAuthRestClientModule.java index 4ad14ee391..9afc37cb9a 100755 --- a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/config/SDNAuthRestClientModule.java +++ b/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/config/SDNAuthRestClientModule.java @@ -53,10 +53,10 @@ public class SDNAuthRestClientModule extends AbstractModule { @Provides @Singleton @Named(SDNConstants.PROPERTY_SDN_APPKEY) - public String credentials1(@Named(Constants.PROPERTY_IDENTITY) String account) { - List parts = Lists.newArrayList(Splitter.on('/').split(account)); + public String credentials1(@Named(Constants.PROPERTY_IDENTITY) String identity) { + List parts = Lists.newArrayList(Splitter.on('/').split(identity)); if (parts.size() != 3) { - throw new IllegalArgumentException("account syntax is appkey/appname/username"); + throw new IllegalArgumentException("identity syntax is appkey/appname/username"); } return parts.get(0); } @@ -64,10 +64,10 @@ public class SDNAuthRestClientModule extends AbstractModule { @Provides @Singleton @Named(SDNConstants.PROPERTY_SDN_APPNAME) - public String credentials2(@Named(Constants.PROPERTY_IDENTITY) String account) { - List parts = Lists.newArrayList(Splitter.on('/').split(account)); + public String credentials2(@Named(Constants.PROPERTY_IDENTITY) String identity) { + List parts = Lists.newArrayList(Splitter.on('/').split(identity)); if (parts.size() != 3) { - throw new IllegalArgumentException("account syntax is appkey/appname/username"); + throw new IllegalArgumentException("identity syntax is appkey/appname/username"); } return parts.get(1); } @@ -75,10 +75,10 @@ public class SDNAuthRestClientModule extends AbstractModule { @Provides @Singleton @Named(SDNConstants.PROPERTY_SDN_USERNAME) - public String credentials3(@Named(Constants.PROPERTY_IDENTITY) String account) { - List parts = Lists.newArrayList(Splitter.on('/').split(account)); + public String credentials3(@Named(Constants.PROPERTY_IDENTITY) String identity) { + List parts = Lists.newArrayList(Splitter.on('/').split(identity)); if (parts.size() != 3) { - throw new IllegalArgumentException("account syntax is appkey/appname/username"); + throw new IllegalArgumentException("identity syntax is appkey/appname/username"); } return parts.get(2); } diff --git a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthenticationLiveTest.java b/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthenticationLiveTest.java index aee16e61af..0d79bceefa 100644 --- a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthenticationLiveTest.java +++ b/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthenticationLiveTest.java @@ -70,8 +70,8 @@ public class SDNAuthenticationLiveTest { void setupFactory() { String endpoint = "http://services.nirvanix.com"; - identity = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - credential = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); ContextSpec contextSpec = contextSpec("test", endpoint, "1", identity, credential, SDNAuthClient.class, SDNAuthAsyncClient.class); diff --git a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNClientLiveTest.java b/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNClientLiveTest.java index bf4919be25..d611c5de86 100644 --- a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNClientLiveTest.java +++ b/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNClientLiveTest.java @@ -59,10 +59,10 @@ public class SDNClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - this.context = new RestContextFactory().createContext("sdn", user, password, ImmutableSet + this.context = new RestContextFactory().createContext("sdn", identity, credential, ImmutableSet . of(new Log4JLoggingModule())); this.connection = context.getApi(); } diff --git a/opscodeplatform/pom.xml b/opscodeplatform/pom.xml index 1293153b47..89d652fd7c 100644 --- a/opscodeplatform/pom.xml +++ b/opscodeplatform/pom.xml @@ -62,8 +62,8 @@ MYORG /etc/chef/validation.pem - ${jclouds.opscodeplatform.org} - ${jclouds.opscodeplatform.rsa-key} + ${jclouds.opscodeplatform.org} + ${jclouds.opscodeplatform.rsa-key} diff --git a/opscodeplatform/src/test/java/org/jclouds/opscodeplatform/OpscodePlatformClientLiveTest.java b/opscodeplatform/src/test/java/org/jclouds/opscodeplatform/OpscodePlatformClientLiveTest.java index d2f5ad832d..60b15f3dda 100644 --- a/opscodeplatform/src/test/java/org/jclouds/opscodeplatform/OpscodePlatformClientLiveTest.java +++ b/opscodeplatform/src/test/java/org/jclouds/opscodeplatform/OpscodePlatformClientLiveTest.java @@ -63,8 +63,8 @@ public class OpscodePlatformClientLiveTest { @BeforeClass(groups = { "live" }) public void setupClient() throws IOException { - orgname = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String keyfile = System.getProperty("jclouds.test.key"); + orgname = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String keyfile = System.getProperty("jclouds.test.credential"); if (keyfile == null || keyfile.equals("")) keyfile = "/etc/chef/validation.pem"; validatorConnection = createConnection(orgname + "-validator", Files.toString(new File( diff --git a/rackspace/pom.xml b/rackspace/pom.xml index a14b184917..ba059532fb 100644 --- a/rackspace/pom.xml +++ b/rackspace/pom.xml @@ -31,8 +31,8 @@ jclouds-rackspace jclouds rackspace components - ${jclouds.rackspace.user} - ${jclouds.rackspace.key} + ${jclouds.rackspace.user} + ${jclouds.rackspace.key} org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesTestInitializer diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesClient.java b/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesClient.java index 4e4b4add64..596c2bb438 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesClient.java +++ b/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesClient.java @@ -55,10 +55,10 @@ public interface CloudFilesClient { CFObject newCFObject(); /** - * HEAD operations against an account are performed to retrieve the number of Containers and the - * total bytes stored in Cloud Files for the account. + * HEAD operations against an identity are performed to retrieve the number of Containers and the + * total bytes stored in Cloud Files for the identity. *

- * Determine the number of Containers within the account and the total bytes stored. Since the + * Determine the number of Containers within the identity and the total bytes stored. Since the * storage system is designed to store large amounts of data, care should be taken when * representing the total bytes response as an integer; when possible, convert it to a 64-bit * unsigned integer if your platform supports that primitive flavor. @@ -66,7 +66,7 @@ public interface CloudFilesClient { AccountMetadata getAccountStatistics(); /** - * GET operations against the X-Storage-Url for an account are performed to retrieve a list of + * GET operations against the X-Storage-Url for an identity are performed to retrieve a list of * existing storage *

* Containers ordered by name. The following list describes the optional query parameters that diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/options/ListCdnContainerOptions.java b/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/options/ListCdnContainerOptions.java index a42bd7b479..a8761b8a3b 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/options/ListCdnContainerOptions.java +++ b/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/options/ListCdnContainerOptions.java @@ -36,7 +36,7 @@ public class ListCdnContainerOptions extends BaseHttpRequestOptions { } /** - * Indicates where to begin listing the account's containers. The list will only include + * Indicates where to begin listing the identity's containers. The list will only include * containers whose names occur lexicographically after the marker. This is convenient for * pagination: To get the next page of results use the last container name of the current * page as the marker. diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersClient.java b/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersClient.java index 83c1a1f70e..1bdb1ee4c4 100755 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersClient.java +++ b/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersClient.java @@ -58,7 +58,7 @@ public interface CloudServersClient { * * List all servers (IDs and names only) * - * This operation provides a list of servers associated with your account. Servers that have been + * This operation provides a list of servers associated with your identity. Servers that have been * deleted are not included in this list. *

* in order to retrieve all details, pass the option {@link ListOptions#withDetails() diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModule.java b/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModule.java index 0893c2026a..e48e0b1514 100755 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModule.java +++ b/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModule.java @@ -127,8 +127,8 @@ public class CloudServersComputeServiceContextModule extends AbstractModule { @Provides @Named("NAMING_CONVENTION") @Singleton - String provideNamingConvention(@Named(Constants.PROPERTY_IDENTITY) String account) { - return account + "-%s-%s"; + String provideNamingConvention(@Named(Constants.PROPERTY_IDENTITY) String identity) { + return identity + "-%s-%s"; } @Singleton diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/RateLimit.java b/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/RateLimit.java index de4060c429..17cfd5e219 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/RateLimit.java +++ b/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/RateLimit.java @@ -32,7 +32,7 @@ import javax.ws.rs.HttpMethod; * Rate limits are applied in order relative to the verb, going from least to most specific. For * example, although the threshold for POST to /servers is 25 per day, one cannot POST to /servers * more than 10 times within a single minute because the rate limits for any POST is 10/min. In the - * event you exceed the thresholds established for your account, a 413 Rate Control HTTP response + * event you exceed the thresholds established for your identity, a 413 Rate Control HTTP response * will be returned with a Reply-After header to notify the client when theyagain. * * @author Adrian Cole diff --git a/rackspace/src/test/java/org/jclouds/rackspace/RackspaceAuthenticationLiveTest.java b/rackspace/src/test/java/org/jclouds/rackspace/RackspaceAuthenticationLiveTest.java index 40a266eab4..b8bb6e1fd7 100755 --- a/rackspace/src/test/java/org/jclouds/rackspace/RackspaceAuthenticationLiveTest.java +++ b/rackspace/src/test/java/org/jclouds/rackspace/RackspaceAuthenticationLiveTest.java @@ -77,8 +77,8 @@ public class RackspaceAuthenticationLiveTest { @BeforeClass void setupFactory() { - identity = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - credential = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); ContextSpec contextSpec = contextSpec("test", "https://api.mosso.com", "1", null, null, RackspaceAuthClient.class, diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesTestInitializer.java b/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesTestInitializer.java index 10ea0d4b61..2ffe482c46 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesTestInitializer.java +++ b/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesTestInitializer.java @@ -37,8 +37,8 @@ public class CloudFilesTestInitializer extends TransientBlobStoreTestInitializer @Override protected BlobStoreContext createLiveContext(Module configurationModule, String url, String app, - String account, String key) throws IOException { - return (BlobStoreContext) new BlobStoreContextFactory().createContext("cloudfiles", account, + String identity, String key) throws IOException { + return (BlobStoreContext) new BlobStoreContextFactory().createContext("cloudfiles", identity, key, ImmutableSet.of(configurationModule, new Log4JLoggingModule()), new Properties()); } diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersClientLiveTest.java b/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersClientLiveTest.java index 6ad0c5747e..4bf136939b 100755 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersClientLiveTest.java +++ b/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersClientLiveTest.java @@ -83,11 +83,11 @@ public class CloudServersClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - Injector injector = new RestContextFactory().createContextBuilder("cloudservers", user, - password, + Injector injector = new RestContextFactory().createContextBuilder("cloudservers", identity, + credential, ImmutableSet. of(new Log4JLoggingModule(), new JschSshClientModule()), new Properties()).buildInjector(); diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java b/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java index 9885ba936e..dedc946c15 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java +++ b/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java @@ -69,7 +69,7 @@ public class CloudServersComputeServiceLiveTest extends BaseComputeServiceLiveTe public void testAssignability() throws Exception { @SuppressWarnings("unused") RestContext tmContext = new ComputeServiceContextFactory() - .createContext(service, user, password).getProviderSpecificContext(); + .createContext(service, identity, credential).getProviderSpecificContext(); } @Override diff --git a/rimuhosting/pom.xml b/rimuhosting/pom.xml index 9c34627e9f..72b3d4d58c 100644 --- a/rimuhosting/pom.xml +++ b/rimuhosting/pom.xml @@ -39,8 +39,8 @@ http://jclouds.googlecode.com/svn/trunk/rimuhosting - ${jclouds.rimuhosting.apikey} - ${jclouds.rimuhosting.apikey} + ${jclouds.rimuhosting.apikey} + ${jclouds.rimuhosting.apikey} diff --git a/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingClient.java b/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingClient.java index 51ec5ccd8a..6c8c67ac5a 100644 --- a/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingClient.java +++ b/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingClient.java @@ -45,7 +45,7 @@ public interface RimuHostingClient { SortedSet getImageList(); /** - * Returns a list of servers that belong to this account. + * Returns a list of servers that belong to this identity. * * @return An empty set if there are no servers. * @see Server diff --git a/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/NewServerData.java b/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/NewServerData.java index df77eaea0a..6274b903ce 100644 --- a/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/NewServerData.java +++ b/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/NewServerData.java @@ -55,7 +55,7 @@ public class NewServerData implements PostData{ * on your last order that had a credit card.  Or use a wire * transfer method if you are using that on other orders.  See the * billing methods resource for how to find what billing methods/ids you - * have setup on your account. + * have setup on your identity. */ @SerializedName("billing_oid") private Long billingId; @@ -100,7 +100,7 @@ public class NewServerData implements PostData{ /** * To whom will the order belong? Leave this blank and we will assign it * to you.  If you set it and you do not have permissions on that - * user's account you will get an error. + * user's identity you will get an error. */ @SerializedName("user_oid") private Long userId; diff --git a/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResult.java b/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResult.java index ca260eb216..713aeaccf7 100644 --- a/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResult.java +++ b/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResult.java @@ -44,7 +44,7 @@ public class ResizeResult { *

* You will need to check these messages in some cases.  e.g. * if you are decreasing pricing and you are paying via a paypal - * subscription.  Since you would be overpaying your account, + * subscription.  Since you would be overpaying your identity, * unless you followed the directions to modify your paypal * subscription. */ diff --git a/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java b/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java index 2327d645e2..06ed933217 100644 --- a/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java +++ b/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java @@ -53,8 +53,8 @@ public class RimuHostingClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() { - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); - this.context = new RestContextFactory().createContext("rimuhosting", password, password, + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); + this.context = new RestContextFactory().createContext("rimuhosting", credential, credential, ImmutableSet. of(new Log4JLoggingModule())); this.connection = context.getApi(); diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java index 4b1fd49904..0a52571a65 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java @@ -217,10 +217,10 @@ public class ComputeTask extends Task { ipOrEmptyString(createdNode.getPublicAddresses())); if (nodeElement.getPasswordproperty() != null && !isKeyAuth(createdNode)) getProject().setProperty(nodeElement.getPasswordproperty(), - createdNode.getCredentials().key); + createdNode.getCredentials().credential); if (nodeElement.getUsernameproperty() != null) getProject().setProperty(nodeElement.getUsernameproperty(), - createdNode.getCredentials().account); + createdNode.getCredentials().identity); } private void reboot(ComputeService computeService) { diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTaskUtils.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTaskUtils.java index 3dca9d3252..66c264c45e 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTaskUtils.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTaskUtils.java @@ -83,7 +83,7 @@ public class ComputeTaskUtils { String provider = from.getHost(); Credentials creds = Credentials.parse(from); return new ComputeServiceContextFactory(props).createContext(provider, - creds.account, creds.key, ImmutableSet.of((Module) new AntLoggingModule( + creds.identity, creds.credential, ImmutableSet.of((Module) new AntLoggingModule( projectProvider.get(), ComputeServiceConstants.COMPUTE_LOGGER), new JschSshClientModule()), props); diff --git a/tools/getpath/pom.xml b/tools/getpath/pom.xml index 93a2a9799a..9a863b7241 100644 --- a/tools/getpath/pom.xml +++ b/tools/getpath/pom.xml @@ -127,7 +127,7 @@ - jclouds.test.principal.azureblob + jclouds.test.identity.azureblob ${jclouds.azure.storage.account} @@ -135,7 +135,7 @@ ${jclouds.azure.storage.key} - jclouds.test.principal.cloudfiles + jclouds.test.identity.cloudfiles ${jclouds.rackspace.user} @@ -143,7 +143,7 @@ ${jclouds.rackspace.key} - jclouds.test.principal.s3 + jclouds.test.identity.s3 ${jclouds.aws.accesskeyid} diff --git a/tools/getpath/src/main/java/org/jclouds/blobstore/GetPath.java b/tools/getpath/src/main/java/org/jclouds/blobstore/GetPath.java index af2184628b..e4498bd4d2 100755 --- a/tools/getpath/src/main/java/org/jclouds/blobstore/GetPath.java +++ b/tools/getpath/src/main/java/org/jclouds/blobstore/GetPath.java @@ -39,13 +39,13 @@ import com.google.common.io.Closeables; /** * - * Usage is: java GetPath blobstore://account:key@service/container/path destinationPath + * Usage is: java GetPath blobstore://identity:key@service/container/path destinationPath * * @author Adrian Cole */ public class GetPath { - public static String INVALID_SYNTAX = "Invalid parameters. Syntax is: blobstore://account:key@service/container/path destinationPath"; + public static String INVALID_SYNTAX = "Invalid parameters. Syntax is: blobstore://identity:key@service/container/path destinationPath"; public static void main(String... args) throws IOException { if (args.length < 2) @@ -67,7 +67,7 @@ public class GetPath { Credentials creds = Credentials.parse(uri); BlobStoreContext context = new BlobStoreContextFactory().createContext(provider, - creds.account, creds.key); + creds.identity, creds.credential); String path = uri.getPath(); if (path.startsWith("/")) diff --git a/tools/vfs/src/main/java/org/jclouds/vfs/provider/blobstore/BlobStoreFileName.java b/tools/vfs/src/main/java/org/jclouds/vfs/provider/blobstore/BlobStoreFileName.java index f88863f133..816656b9fd 100644 --- a/tools/vfs/src/main/java/org/jclouds/vfs/provider/blobstore/BlobStoreFileName.java +++ b/tools/vfs/src/main/java/org/jclouds/vfs/provider/blobstore/BlobStoreFileName.java @@ -33,9 +33,9 @@ public class BlobStoreFileName extends GenericFileName { private final String container; private String uriWithoutAuth; - protected BlobStoreFileName(final String service, final String account, final String key, + protected BlobStoreFileName(final String service, final String identity, final String key, final String path, final FileType type, final String container) { - super("blobstore", service, DEFAULT_PORT, DEFAULT_PORT, account, key, path, type); + super("blobstore", service, DEFAULT_PORT, DEFAULT_PORT, identity, key, path, type); this.container = container; } diff --git a/tools/vfs/src/main/java/org/jclouds/vfs/provider/blobstore/BlobStoreFileNameParser.java b/tools/vfs/src/main/java/org/jclouds/vfs/provider/blobstore/BlobStoreFileNameParser.java index 81aca0ad87..6cd508474a 100644 --- a/tools/vfs/src/main/java/org/jclouds/vfs/provider/blobstore/BlobStoreFileNameParser.java +++ b/tools/vfs/src/main/java/org/jclouds/vfs/provider/blobstore/BlobStoreFileNameParser.java @@ -73,7 +73,7 @@ public class BlobStoreFileNameParser extends URLFileNameParser { FileType fileType = UriParser.normalisePath(name); String path = name.toString(); - return new BlobStoreFileName(auth.hostName, creds.account, creds.key, path, fileType, + return new BlobStoreFileName(auth.hostName, creds.identity, creds.credential, path, fileType, container); } diff --git a/tools/vfs/src/main/java/org/jclouds/vfs/tools/blobstore/BlobStoreShell.java b/tools/vfs/src/main/java/org/jclouds/vfs/tools/blobstore/BlobStoreShell.java index f46f03e5a7..fd6b0f8d53 100644 --- a/tools/vfs/src/main/java/org/jclouds/vfs/tools/blobstore/BlobStoreShell.java +++ b/tools/vfs/src/main/java/org/jclouds/vfs/tools/blobstore/BlobStoreShell.java @@ -55,7 +55,7 @@ import com.google.common.collect.Lists; * @author Gary D. Gregory */ public class BlobStoreShell { - public static String INVALID_SYNTAX = "Invalid parameters. Syntax is: blobstore://account:key@service/container"; + public static String INVALID_SYNTAX = "Invalid parameters. Syntax is: blobstore://identity:key@service/container"; private final DefaultFileSystemManager remoteMgr; private FileObject remoteCwd; diff --git a/tools/vfs/src/test/java/org/jclouds/vfs/provider/blobstore/test/BlobStoreProviderTestCase.java b/tools/vfs/src/test/java/org/jclouds/vfs/provider/blobstore/test/BlobStoreProviderTestCase.java index f65dc30773..ba52ac91c1 100644 --- a/tools/vfs/src/test/java/org/jclouds/vfs/provider/blobstore/test/BlobStoreProviderTestCase.java +++ b/tools/vfs/src/test/java/org/jclouds/vfs/provider/blobstore/test/BlobStoreProviderTestCase.java @@ -62,7 +62,7 @@ public class BlobStoreProviderTestCase extends AbstractProviderTestConfig { * Returns the base folder for tests. */ public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception { - String uri = System.getProperty(TEST_URI, "blobstore://account:key@stub/stub"); + String uri = System.getProperty(TEST_URI, "blobstore://identity:key@stub/stub"); return setUpTests(manager, uri); } diff --git a/twitter/pom.xml b/twitter/pom.xml index 7360dbc08f..3a3ff18730 100644 --- a/twitter/pom.xml +++ b/twitter/pom.xml @@ -39,8 +39,8 @@ http://jclouds.googlecode.com/svn/trunk/twitter - ${jclouds.twitter.user} - ${jclouds.twitter.password} + ${jclouds.twitter.user} + ${jclouds.twitter.password} diff --git a/twitter/src/test/java/org/jclouds/twitter/TwitterClientLiveTest.java b/twitter/src/test/java/org/jclouds/twitter/TwitterClientLiveTest.java index 200627b3b8..7a90ec776e 100644 --- a/twitter/src/test/java/org/jclouds/twitter/TwitterClientLiveTest.java +++ b/twitter/src/test/java/org/jclouds/twitter/TwitterClientLiveTest.java @@ -45,10 +45,10 @@ public class TwitterClientLiveTest { @BeforeGroups(groups = "live") public void setupClient() throws InterruptedException, ExecutionException, TimeoutException { - String user = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String password = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - context = createContext(contextSpec("twitter", "http://twitter.com", "1", user, password, + context = createContext(contextSpec("twitter", "http://twitter.com", "1", identity, credential, TwitterClient.class, TwitterAsyncClient.class)); connection = context.getApi(); diff --git a/vcloud/bluelock/pom.xml b/vcloud/bluelock/pom.xml index 7b1a836a6e..e0e5da56bc 100644 --- a/vcloud/bluelock/pom.xml +++ b/vcloud/bluelock/pom.xml @@ -32,8 +32,8 @@ jclouds bluelock Components Core jclouds core components to access bluelock - ${jclouds.bluelock.user} - ${jclouds.bluelock.password} + ${jclouds.bluelock.user} + ${jclouds.bluelock.password} diff --git a/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudComputeClient.java b/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudComputeClient.java index fe089022fe..b2d51c4bc0 100644 --- a/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudComputeClient.java +++ b/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudComputeClient.java @@ -38,8 +38,8 @@ public class BlueLockVCloudComputeClient extends BaseVCloudComputeClient { .getVAppTemplate(templateId)); Map toReturn = super.parseResponse(templateId, vAppResponse); - toReturn.put("username", credentials.account); - toReturn.put("password", credentials.key); + toReturn.put("username", credentials.identity); + toReturn.put("password", credentials.credential); return toReturn; } diff --git a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/BlueLockVCloudClientLiveTest.java b/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/BlueLockVCloudClientLiveTest.java index e31e5001db..951ac1644b 100644 --- a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/BlueLockVCloudClientLiveTest.java +++ b/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/BlueLockVCloudClientLiveTest.java @@ -42,9 +42,9 @@ public class BlueLockVCloudClientLiveTest extends VCloudClientLiveTest { @BeforeGroups(groups = { "live" }) @Override public void setupClient() { - account = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String key = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); - context = new RestContextFactory().createContext("bluelock", account, key, ImmutableSet + identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); + context = new RestContextFactory().createContext("bluelock", identity, credential, ImmutableSet . of(new Log4JLoggingModule()), new Properties()); connection = context.getApi(); } diff --git a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/VCloudSessionRefreshLiveTest.java b/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/VCloudSessionRefreshLiveTest.java index 398f8978a5..b7ea45397a 100644 --- a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/VCloudSessionRefreshLiveTest.java +++ b/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/VCloudSessionRefreshLiveTest.java @@ -29,7 +29,7 @@ public class VCloudSessionRefreshLiveTest { private final static int timeOut = 40; protected VCloudClient connection; - protected String account; + protected String identity; protected ComputeServiceContext context; @Test @@ -41,13 +41,13 @@ public class VCloudSessionRefreshLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() throws IOException { - account = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String key = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); Properties props = new Properties(); props.setProperty(PROPERTY_SESSION_INTERVAL, 40 + ""); - context = new ComputeServiceContextFactory().createContext("bluelock", account, key, + context = new ComputeServiceContextFactory().createContext("bluelock", identity, credential, ImmutableSet. of(new Log4JLoggingModule()), props); connection = VCloudClient.class.cast(context.getProviderSpecificContext().getApi()); diff --git a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudComputeServiceLiveTest.java b/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudComputeServiceLiveTest.java index 4bcdc81c2e..d1e5704b9e 100644 --- a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudComputeServiceLiveTest.java +++ b/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudComputeServiceLiveTest.java @@ -58,8 +58,8 @@ public class BlueLockVCloudComputeServiceLiveTest extends VCloudComputeServiceLi protected Template buildTemplate(TemplateBuilder templateBuilder) { Template template = super.buildTemplate(templateBuilder); Image image = template.getImage(); - assert image.getDefaultCredentials().account != null : image; - assert image.getDefaultCredentials().key != null : image; + assert image.getDefaultCredentials().identity != null : image; + assert image.getDefaultCredentials().credential != null : image; return template; } diff --git a/vcloud/core/pom.xml b/vcloud/core/pom.xml index 3750d7c330..ee67087488 100644 --- a/vcloud/core/pom.xml +++ b/vcloud/core/pom.xml @@ -31,8 +31,8 @@ jclouds vcloud Components Core jclouds Core components to access vcloud - ${jclouds.vcloud.user} - ${jclouds.vcloud.password} + ${jclouds.vcloud.user} + ${jclouds.vcloud.password} ${jclouds.vcloud.endpoint} diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudClientLiveTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudClientLiveTest.java index a898c1f046..bf944be56d 100644 --- a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudClientLiveTest.java +++ b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudClientLiveTest.java @@ -50,7 +50,7 @@ import com.google.inject.Module; public class VCloudClientLiveTest { protected VCloudClient connection; - protected String account; + protected String identity; protected RestContext context; @Test @@ -58,7 +58,7 @@ public class VCloudClientLiveTest { Organization response = connection.getDefaultOrganization(); assertNotNull(response); assertNotNull(response.getId()); - assertNotNull(account); + assertNotNull(identity); assert response.getCatalogs().size() >= 1; assert response.getTasksLists().size() >= 1; assert response.getVDCs().size() >= 1; @@ -164,12 +164,12 @@ public class VCloudClientLiveTest { public void setupClient() { String endpoint = checkNotNull(System.getProperty("jclouds.test.endpoint"), "jclouds.test.endpoint"); - account = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String key = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); Properties props = new Properties(); props.setProperty("vcloud.endpoint", endpoint); - context = new RestContextFactory().createContext("vcloud", account, key, ImmutableSet + context = new RestContextFactory().createContext("vcloud", identity, credential, ImmutableSet . of(new Log4JLoggingModule()), props); connection = context.getApi(); diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudLoginLiveTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudLoginLiveTest.java index 0835bd7ce3..a02b24abf8 100755 --- a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudLoginLiveTest.java +++ b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudLoginLiveTest.java @@ -77,8 +77,8 @@ public class VCloudLoginLiveTest { "jclouds.test.endpoint") + "/v0.8/login"; - String identity = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String credential = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); ContextSpec contextSpec = contextSpec("test", endpoint, "1", identity, credential, VCloudLoginClient.class, diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudVersionsLiveTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudVersionsLiveTest.java index a623c4d4e8..b97e4596a3 100644 --- a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudVersionsLiveTest.java +++ b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudVersionsLiveTest.java @@ -70,8 +70,8 @@ public class VCloudVersionsLiveTest { void setupFactory() { String endpoint = checkNotNull(System.getProperty("jclouds.test.endpoint"), "jclouds.test.endpoint"); - String identity = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String credential = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); ContextSpec contextSpec = contextSpec( "test", endpoint, "1", identity, credential, VCloudVersionsClient.class, diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeClientLiveTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeClientLiveTest.java index fe3bf15ec7..066005ef3e 100644 --- a/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeClientLiveTest.java +++ b/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeClientLiveTest.java @@ -141,14 +141,14 @@ public class VCloudComputeClientLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() { - String account = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String key = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); String endpoint = checkNotNull(System.getProperty("jclouds.test.endpoint"), "jclouds.test.endpoint"); Properties props = new Properties(); props.setProperty("vcloud.endpoint", endpoint); - Injector injector = new RestContextFactory().createContextBuilder("vcloud", account, key, + Injector injector = new RestContextFactory().createContextBuilder("vcloud", identity, credential, ImmutableSet. of(new Log4JLoggingModule()), props).buildInjector(); computeClient = injector.getInstance(VCloudComputeClient.class); diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java index 7e001fcb3a..a350d6bc3e 100644 --- a/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java +++ b/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java @@ -39,7 +39,7 @@ public class VCloudComputeServiceLiveTest extends BaseComputeServiceLiveTest { public void testAssignability() throws Exception { @SuppressWarnings("unused") RestContext tmContext = new ComputeServiceContextFactory() - .createContext(service, user, password) + .createContext(service, identity, credential) .getProviderSpecificContext(); } diff --git a/vcloud/hostingdotcom/pom.xml b/vcloud/hostingdotcom/pom.xml index 005d1d76d7..44692259e5 100644 --- a/vcloud/hostingdotcom/pom.xml +++ b/vcloud/hostingdotcom/pom.xml @@ -32,8 +32,8 @@ jclouds hostingdotcom Components Core jclouds core components to access hostingdotcom - ${jclouds.hostingdotcom.user} - ${jclouds.hostingdotcom.password} + ${jclouds.hostingdotcom.user} + ${jclouds.hostingdotcom.password} diff --git a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudClientLiveTest.java b/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudClientLiveTest.java index f8a2ac3071..c8c2d69e7a 100644 --- a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudClientLiveTest.java +++ b/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/HostingDotComVCloudClientLiveTest.java @@ -42,10 +42,10 @@ public class HostingDotComVCloudClientLiveTest extends VCloudClientLiveTest { @BeforeGroups(groups = { "live" }) @Override public void setupClient() { - account = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String key = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); - context = new RestContextFactory().createContext("hostingdotcom", account, key, ImmutableSet + context = new RestContextFactory().createContext("hostingdotcom", identity, credential, ImmutableSet . of(new Log4JLoggingModule()), new Properties()); connection = context.getApi(); } diff --git a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeClientLiveTest.java b/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeClientLiveTest.java index 47b193fd28..0d59cd1675 100644 --- a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeClientLiveTest.java +++ b/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeClientLiveTest.java @@ -49,10 +49,10 @@ public class HostingDotComVCloudComputeClientLiveTest extends VCloudComputeClien @BeforeGroups(groups = { "live" }) @Override public void setupClient() { - String account = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String key = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); - Injector injector = new RestContextFactory().createContextBuilder("hostingdotcom", account, - key, ImmutableSet. of(new Log4JLoggingModule()), new Properties()) + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); + Injector injector = new RestContextFactory().createContextBuilder("hostingdotcom", identity, + credential, ImmutableSet. of(new Log4JLoggingModule()), new Properties()) .buildInjector(); computeClient = injector.getInstance(HostingDotComVCloudComputeClient.class); diff --git a/vcloud/terremark/pom.xml b/vcloud/terremark/pom.xml index 0e100e7292..a92b70560a 100644 --- a/vcloud/terremark/pom.xml +++ b/vcloud/terremark/pom.xml @@ -32,8 +32,8 @@ jclouds Core components to access terremark - ${jclouds.terremark.user} - ${jclouds.terremark.password} + ${jclouds.terremark.user} + ${jclouds.terremark.password} ${jclouds.terremark.password} diff --git a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeClient.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeClient.java index 9ce8a8c99f..4557e08092 100644 --- a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeClient.java +++ b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeClient.java @@ -77,8 +77,8 @@ public class TerremarkVCloudComputeClient extends BaseVCloudComputeClient { .getVAppTemplate(templateId)); Map toReturn = super.parseResponse(templateId, vAppResponse); - toReturn.put("username", credentials.account); - toReturn.put("password", credentials.key); + toReturn.put("username", credentials.identity); + toReturn.put("password", credentials.credential); return toReturn; } diff --git a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/strategy/TerremarkVCloudGetNodeMetadataStrategy.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/strategy/TerremarkVCloudGetNodeMetadataStrategy.java index 27644c33f0..2209b16cec 100644 --- a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/strategy/TerremarkVCloudGetNodeMetadataStrategy.java +++ b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/strategy/TerremarkVCloudGetNodeMetadataStrategy.java @@ -76,10 +76,10 @@ public class TerremarkVCloudGetNodeMetadataStrategy extends VCloudGetNodeMetadat NodeMetadata installCredentialsFromCache(NodeMetadata node) { OrgAndName orgAndName = getOrgAndNameFromNode(node); if (credentialsMap.containsKey(orgAndName)) { - String account = getLoginAccountForNode(node); - if (account != null) { + String identity = getLoginAccountForNode(node); + if (identity != null) { String privateKey = credentialsMap.get(orgAndName).getPrivateKey(); - Credentials creds = new Credentials(account, privateKey); + Credentials creds = new Credentials(identity, privateKey); node = installNewCredentials(node, creds); } } @@ -93,12 +93,12 @@ public class TerremarkVCloudGetNodeMetadataStrategy extends VCloudGetNodeMetadat } String getLoginAccountForNode(NodeMetadata node) { - String account = null; + String identity = null; if (node.getCredentials() != null) - account = node.getCredentials().account; + identity = node.getCredentials().identity; else if (node.getImage() != null && node.getImage().getDefaultCredentials() != null) - account = node.getImage().getDefaultCredentials().account; - return account; + identity = node.getImage().getDefaultCredentials().identity; + return identity; } NodeMetadata installDefaultCredentialsFromImage(NodeMetadata node) { diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/InternetServiceLiveTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/InternetServiceLiveTest.java index 57a67eacde..42187870a7 100644 --- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/InternetServiceLiveTest.java +++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/InternetServiceLiveTest.java @@ -90,14 +90,14 @@ public class InternetServiceLiveTest { @BeforeGroups(groups = { "live" }) public void setupClient() { - String account = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String key = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); String endpoint = System.getProperty("jclouds.test.endpoint"); Properties props = new Properties(); if (endpoint != null && !"".equals(endpoint)) props.setProperty("terremark.endpoint", endpoint); - context = new RestContextFactory().createContext("terremark", account, key, ImmutableSet + context = new RestContextFactory().createContext("terremark", identity, credential, ImmutableSet . of(new Log4JLoggingModule(), new JschSshClientModule()), props); tmClient = context.getApi(); diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java index b7f291ffbc..f5353f9700 100644 --- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java +++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java @@ -478,8 +478,8 @@ public class TerremarkVCloudClientLiveTest extends VCloudClientLiveTest { @BeforeGroups(groups = { "live" }) @Override public void setupClient() { - String account = checkNotNull(System.getProperty("jclouds.test.user"), "jclouds.test.user"); - String key = checkNotNull(System.getProperty("jclouds.test.key"), "jclouds.test.key"); + String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); + String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); String endpoint = System.getProperty("jclouds.test.endpoint"); Properties props = new Properties(); @@ -488,8 +488,8 @@ public class TerremarkVCloudClientLiveTest extends VCloudClientLiveTest { Injector injector = new RestContextFactory() .createContextBuilder( "terremark", - account, - key, + identity, + credential, ImmutableSet. of(new Log4JLoggingModule(), new JschSshClientModule()), props).buildInjector(); diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeServiceLiveTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeServiceLiveTest.java index 73bdc7308a..d6cf58fdcb 100644 --- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeServiceLiveTest.java +++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeServiceLiveTest.java @@ -65,15 +65,15 @@ public class TerremarkVCloudComputeServiceLiveTest extends VCloudComputeServiceL public void testAssignability() throws Exception { @SuppressWarnings("unused") RestContext tmContext = new ComputeServiceContextFactory() - .createContext(service, user, password).getProviderSpecificContext(); + .createContext(service, identity, credential).getProviderSpecificContext(); } @Override protected Template buildTemplate(TemplateBuilder templateBuilder) { Template template = super.buildTemplate(templateBuilder); Image image = template.getImage(); - assert image.getDefaultCredentials().account != null : image; - assert image.getDefaultCredentials().key != null : image; + assert image.getDefaultCredentials().identity != null : image; + assert image.getDefaultCredentials().credential != null : image; return template; } @@ -83,9 +83,9 @@ public class TerremarkVCloudComputeServiceLiveTest extends VCloudComputeServiceL assert image.getProviderId() != null : image; // image.getLocationId() can be null, if it is a location-free image assertEquals(image.getType(), ComputeType.IMAGE); - assert image.getDefaultCredentials().account != null : image; + assert image.getDefaultCredentials().identity != null : image; if (image.getOsFamily() != OsFamily.WINDOWS) - assert image.getDefaultCredentials().key != null : image; + assert image.getDefaultCredentials().credential != null : image; } } diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/strategy/PopulateDefaultLoginCredentialsForVAppTemplateTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/strategy/PopulateDefaultLoginCredentialsForVAppTemplateTest.java index bd4cfb41b6..9d0fc1f9ae 100644 --- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/strategy/PopulateDefaultLoginCredentialsForVAppTemplateTest.java +++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/strategy/PopulateDefaultLoginCredentialsForVAppTemplateTest.java @@ -48,8 +48,8 @@ public class PopulateDefaultLoginCredentialsForVAppTemplateTest { replay(template); ParseVAppTemplateDescriptionToGetDefaultLoginCredentials converter = new ParseVAppTemplateDescriptionToGetDefaultLoginCredentials(); Credentials creds = converter.execute(template); - assertEquals(creds.account, "vcloud"); - assertEquals(creds.key, "$Ep455l0ud!2"); + assertEquals(creds.identity, "vcloud"); + assertEquals(creds.credential, "$Ep455l0ud!2"); verify(template); } @@ -62,8 +62,8 @@ public class PopulateDefaultLoginCredentialsForVAppTemplateTest { replay(template); ParseVAppTemplateDescriptionToGetDefaultLoginCredentials converter = new ParseVAppTemplateDescriptionToGetDefaultLoginCredentials(); Credentials creds = converter.execute(template); - assertEquals(creds.account, "vpncubed"); - assertEquals(creds.key, "vpncubed"); + assertEquals(creds.identity, "vpncubed"); + assertEquals(creds.credential, "vpncubed"); verify(template); } @@ -76,8 +76,8 @@ public class PopulateDefaultLoginCredentialsForVAppTemplateTest { replay(template); ParseVAppTemplateDescriptionToGetDefaultLoginCredentials converter = new ParseVAppTemplateDescriptionToGetDefaultLoginCredentials(); Credentials creds = converter.execute(template); - assertEquals(creds.account, "Administrator"); - assertEquals(creds.key, null); + assertEquals(creds.identity, "Administrator"); + assertEquals(creds.credential, null); verify(template); } }