From b9e60a8b4e9c6a9b201f498705b82c369aa25651 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Tue, 25 Jan 2011 17:11:05 -0800 Subject: [PATCH] fixed swift to have a default version property --- .../org/jclouds/cloudfiles/CloudFilesPropertiesBuilder.java | 3 --- .../org/jclouds/openstack/swift/SwiftPropertiesBuilder.java | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesPropertiesBuilder.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesPropertiesBuilder.java index 26dbd2dc9b..ee457e7855 100644 --- a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesPropertiesBuilder.java +++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesPropertiesBuilder.java @@ -19,13 +19,11 @@ package org.jclouds.cloudfiles; -import static org.jclouds.Constants.PROPERTY_API_VERSION; import static org.jclouds.Constants.PROPERTY_ENDPOINT; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; import java.util.Properties; -import org.jclouds.openstack.OpenStackAuthAsyncClient; import org.jclouds.openstack.swift.SwiftPropertiesBuilder; /** @@ -39,7 +37,6 @@ public class CloudFilesPropertiesBuilder extends SwiftPropertiesBuilder { Properties properties = super.defaultProperties(); properties.setProperty(PROPERTY_REGIONS, "US"); properties.setProperty(PROPERTY_ENDPOINT, "https://auth.api.rackspacecloud.com"); - properties.setProperty(PROPERTY_API_VERSION, OpenStackAuthAsyncClient.VERSION); return properties; } diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftPropertiesBuilder.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftPropertiesBuilder.java index d261c29c06..b9488292b0 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftPropertiesBuilder.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftPropertiesBuilder.java @@ -19,12 +19,14 @@ package org.jclouds.openstack.swift; +import static org.jclouds.Constants.PROPERTY_API_VERSION; import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; import java.util.Properties; import org.jclouds.PropertiesBuilder; +import org.jclouds.openstack.OpenStackAuthAsyncClient; /** * Builds properties used in CloudFiles Connections @@ -37,6 +39,7 @@ public class SwiftPropertiesBuilder extends PropertiesBuilder { Properties properties = super.defaultProperties(); properties.setProperty(PROPERTY_REGIONS, "DEFAULT"); properties.setProperty(PROPERTY_USER_METADATA_PREFIX, "X-Object-Meta-"); + properties.setProperty(PROPERTY_API_VERSION, OpenStackAuthAsyncClient.VERSION); return properties; }