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

Merge pull request #712 from aplowe/swift-keyston 

swift keystone 2.0: adjusting default modules for swift-keystone to include RegionModule
This commit is contained in:
Adrian Cole 2012-07-12 07:33:45 -07:00
parent ead47d9893 dfed1b2189
commit 91a8895cea
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java
View File

@ -26,6 +26,7 @@ import java.util.Properties;
import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.ApiMetadata;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties; import org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties;
import org.jclouds.openstack.services.ServiceType; import org.jclouds.openstack.services.ServiceType;
import org.jclouds.openstack.swift.blobstore.config.SwiftBlobStoreContextModule; import org.jclouds.openstack.swift.blobstore.config.SwiftBlobStoreContextModule;
@ -36,6 +37,7 @@ import org.jclouds.rest.RestContext;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
import com.google.inject.Module; import com.google.inject.Module;
/** /**
* Implementation of {@link ApiMetadata} for OpenStack Swift authenticated with KeyStone * Implementation of {@link ApiMetadata} for OpenStack Swift authenticated with KeyStone
* *
@ -78,14 +80,16 @@ public class SwiftKeystoneApiMetadata extends SwiftApiMetadata {
} }
public static class Builder extends SwiftApiMetadata.Builder { public static class Builder extends SwiftApiMetadata.Builder {
protected Builder(){ protected Builder() {
super(SwiftKeystoneClient.class, SwiftKeystoneAsyncClient.class); super(SwiftKeystoneClient.class, SwiftKeystoneAsyncClient.class);
id("swift-keystone") id("swift-keystone")
.name("OpenStack Swift with Keystone authentication") .name("OpenStack Swift with Keystone authentication")
.identityName("tenantName:user or user") .identityName("tenantName:user or user")
.credentialName("password") .credentialName("password")
.context(CONTEXT_TOKEN) .context(CONTEXT_TOKEN)
.defaultModules(ImmutableSet.<Class<? extends Module>>of(KeystoneStorageEndpointModule.class, SwiftKeystoneRestClientModule.class, SwiftBlobStoreContextModule.class)); .defaultProperties(SwiftKeystoneApiMetadata.defaultProperties())
.defaultModules(ImmutableSet.<Class<? extends Module>>of(KeystoneStorageEndpointModule.class, KeystoneAuthenticationModule.RegionModule.class,
SwiftKeystoneRestClientModule.class, SwiftBlobStoreContextModule.class));
} }
@Override @Override