You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by jd...@apache.org on 2014/05/09 21:46:27 UTC
git commit: Updated ServiceType refs in Cloud Databases
Repository: jclouds
Updated Branches:
refs/heads/master 67c2b5f6b -> 64ecd497c
Updated ServiceType refs in Cloud Databases
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/64ecd497
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/64ecd497
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/64ecd497
Branch: refs/heads/master
Commit: 64ecd497c177e45ed33954b943e1f10d636454cb
Parents: 67c2b5f
Author: Jeremy Daggett <je...@rackspace.com>
Authored: Tue May 6 08:55:36 2014 -0700
Committer: Jeremy Daggett <je...@rackspace.com>
Committed: Fri May 9 12:35:41 2014 -0700
----------------------------------------------------------------------
.../uk/CloudDatabasesUKProviderMetadata.java | 5 +++--
.../us/CloudDatabasesUSProviderMetadata.java | 11 ++++++-----
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/64ecd497/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java b/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java
index f6cfaa0..1691282 100644
--- a/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java
+++ b/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java
@@ -31,6 +31,7 @@ import org.jclouds.openstack.trove.v1.config.TroveHttpApiModule;
import org.jclouds.openstack.trove.v1.config.TroveParserModule;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
@@ -65,12 +66,12 @@ public class CloudDatabasesUKProviderMetadata extends BaseProviderMetadata {
public static Properties defaultProperties() {
Properties properties = new Properties();
properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
- properties.setProperty(SERVICE_TYPE, "rax:database");
+ properties.setProperty(SERVICE_TYPE, ServiceType.DATABASES);
properties.setProperty(PROPERTY_ZONES, "LON");
properties.setProperty(PROPERTY_ZONE + ".LON." + ISO3166_CODES, "GB-SLG");
return properties;
}
-
+
public static class Builder extends BaseProviderMetadata.Builder {
protected Builder(){
http://git-wip-us.apache.org/repos/asf/jclouds/blob/64ecd497/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java b/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java
index fc024ed..fb10bd9 100644
--- a/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java
+++ b/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java
@@ -25,15 +25,16 @@ import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERV
import java.net.URI;
import java.util.Properties;
+import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule;
import org.jclouds.openstack.trove.v1.TroveApiMetadata;
-import org.jclouds.openstack.trove.v1.config.TroveParserModule;
import org.jclouds.openstack.trove.v1.config.TroveHttpApiModule;
-import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule;
+import org.jclouds.openstack.trove.v1.config.TroveParserModule;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType;
+import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
-import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
@@ -65,7 +66,7 @@ public class CloudDatabasesUSProviderMetadata extends BaseProviderMetadata {
public static Properties defaultProperties() {
Properties properties = new Properties();
properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
- properties.setProperty(SERVICE_TYPE, "rax:database");
+ properties.setProperty(SERVICE_TYPE, ServiceType.DATABASES);
properties.setProperty(PROPERTY_ZONES, "ORD,DFW,IAD,SYD,HKG");
properties.setProperty(PROPERTY_ZONE + ".ORD." + ISO3166_CODES, "US-IL");
properties.setProperty(PROPERTY_ZONE + ".DFW." + ISO3166_CODES, "US-TX");
@@ -74,7 +75,7 @@ public class CloudDatabasesUSProviderMetadata extends BaseProviderMetadata {
properties.setProperty(PROPERTY_ZONE + ".HKG." + ISO3166_CODES, "HK");
return properties;
}
-
+
public static class Builder extends BaseProviderMetadata.Builder {
protected Builder(){