Merge remote branch 'upstream/master'

magro · Apr 5, 2011 · 793740b · 793740b
2 parents ed90e29 + 1cfbdf0
commit 793740b
Show file tree

Hide file tree

Showing 92 changed files with 7,922 additions and 99 deletions.
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobBuilderImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobBuilderImpl.java
@@ -25,7 +25,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.security.MessageDigest;
 import java.util.Map;
 
 import javax.inject.Inject;
@@ -128,12 +127,12 @@ public Blob build() {
    public class PayloadBlobBuilderImpl implements PayloadBlobBuilder {
       private final BlobBuilder builder;
       private final Payload payload;
-      private MessageDigest digest;
+      private final Crypto crypto;
 
       public PayloadBlobBuilderImpl(BlobBuilder builder, Payload payload, Crypto crypto) {
          this.builder = checkNotNull(builder, "builder");
          this.payload = checkNotNull(payload, "payload");
-         this.digest = checkNotNull(crypto, "crypto").md5();
+         this.crypto = checkNotNull(crypto, "crypto");
       }
 
       @Override
@@ -158,7 +157,7 @@ public PayloadBlobBuilder payload(Payload payload) {
 
       @Override
       public PayloadBlobBuilder calculateMD5() throws IOException {
-         return builder.payload(Payloads.calculateMD5(payload, digest));
+         return builder.payload(Payloads.calculateMD5(payload, crypto.md5()));
       }
 
       @Override

diff --git a/core/src/main/resources/rest.properties b/core/src/main/resources/rest.properties
@@ -83,8 +83,8 @@ eucalyptus.propertiesbuilder=org.jclouds.eucalyptus.EucalyptusPropertiesBuilder
 eucalyptus-partnercloud-ec2.contextbuilder=org.jclouds.epc.EucalyptusPartnerCloudContextBuilder
 eucalyptus-partnercloud-ec2.propertiesbuilder=org.jclouds.epc.EucalyptusPartnerCloudPropertiesBuilder
 
-nova-ec2.contextbuilder=org.jclouds.ec2.EC2ContextBuilder
-nova-ec2.propertiesbuilder=org.jclouds.nova.ec2.NovaEC2PropertiesBuilder
+nova.contextbuilder=org.jclouds.openstack.nova.NovaContextBuilder
+nova.propertiesbuilder=org.jclouds.openstack.nova.NovaPropertiesBuilder
 
 cloudservers-uk.contextbuilder=org.jclouds.cloudservers.CloudServersContextBuilder
 cloudservers-uk.propertiesbuilder=org.jclouds.rackspace.cloudservers.CloudServersUKPropertiesBuilder

diff --git a/drivers/bouncycastle/pom.xml b/drivers/bouncycastle/pom.xml
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk16</artifactId>
-            <version>1.45</version>
+            <version>1.46</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/...is/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2ComputeServiceLiveTest.java b/...is/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2ComputeServiceLiveTest.java
diff --git a/sandbox-apis/nova-ec2/pom.xml → sandbox-apis/nova/pom.xml b/sandbox-apis/nova-ec2/pom.xml → sandbox-apis/nova/pom.xml
@@ -30,29 +30,27 @@
         <relativePath>../../project/pom.xml</relativePath>
     </parent>
     <groupId>org.jclouds.api</groupId>
-    <artifactId>nova-ec2</artifactId>
-    <name>jclouds OpenStack Nova EC2 api</name>
-    <description>EC2 implementation based on OpenStack Nova</description>
+    <artifactId>nova</artifactId>
+    <name>jcloud nova api</name>
+    <description>jclouds components to access an implementation of OpenStack Nova</description>
 
     <properties>
-        <test.nova-ec2.endpoint>TODO</test.nova-ec2.endpoint>
-        <test.nova-ec2.apiversion>2010-06-15</test.nova-ec2.apiversion>
-        <test.nova-ec2.identity>FIXME</test.nova-ec2.identity>
-        <test.nova-ec2.credential>FIXME</test.nova-ec2.credential>
+        <test.nova.endpoint>https://auth.api.rackspacecloud.com</test.nova.endpoint>
+        <test.nova.apiversion>1.1</test.nova.apiversion>
+        <test.nova.identity>FIXME</test.nova.identity>
+        <test.nova.credential>FIXME</test.nova.credential>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.api</groupId>
-            <artifactId>ec2</artifactId>
+            <groupId>org.jclouds.common</groupId>
+            <artifactId>openstack-common</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.api</groupId>
-            <artifactId>ec2</artifactId>
+            <groupId>org.jclouds</groupId>
+            <artifactId>jclouds-compute</artifactId>
             <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
@@ -61,6 +59,13 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jclouds.common</groupId>
+            <artifactId>openstack-common</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
@@ -111,20 +116,24 @@
                                 <configuration>
                                     <systemProperties>
                                         <property>
-                                            <name>test.nova-ec2.endpoint</name>
-                                            <value>${test.nova-ec2.endpoint}</value>
+                                            <name>test.nova.endpoint</name>
+                                            <value>${test.nova.endpoint}</value>
+                                        </property>
+                                        <property>
+                                            <name>test.nova.apiversion</name>
+                                            <value>${test.nova.apiversion}</value>
                                         </property>
                                         <property>
-                                            <name>test.nova-ec2.apiversion</name>
-                                            <value>${test.nova-ec2.apiversion}</value>
+                                            <name>test.nova.identity</name>
+                                            <value>${test.nova.identity}</value>
                                         </property>
                                         <property>
-                                            <name>test.nova-ec2.identity</name>
-                                            <value>${test.nova-ec2.identity}</value>
+                                            <name>test.nova.credential</name>
+                                            <value>${test.nova.credential}</value>
                                         </property>
                                         <property>
-                                            <name>test.nova-ec2.credential</name>
-                                            <value>${test.nova-ec2.credential}</value>
+                                            <name>test.initializer</name>
+                                            <value>${test.initializer}</value>
                                         </property>
                                     </systemProperties>
                                 </configuration>