From dc7914c1f5f68c5ead4777f1ae28f5a746d8fa43 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Mon, 27 Dec 2010 22:12:51 +0100
Subject: [PATCH] updated perftest to latest dependencies

---
 aws/perftest/pom.xml                               | 14 +++++++-------
 .../aws/s3/BaseJCloudsPerformanceLiveTest.java     | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/aws/perftest/pom.xml b/aws/perftest/pom.xml
index 669cf496c4..b674287383 100644
--- a/aws/perftest/pom.xml
+++ b/aws/perftest/pom.xml
@@ -35,9 +35,9 @@
 		-->
 		<appengine.home>YOUR_APPENGINE_HOME</appengine.home>
 		<jclouds.test.loopcount>100</jclouds.test.loopcount>
-		<jclouds.test.identity>${jclouds.aws.accesskeyid}</jclouds.test.identity>
-		<jclouds.test.credential>${jclouds.aws.secretaccesskey}</jclouds.test.credential>
-		<jclouds.test.initializer>org.jclouds.aws.s3.blobstore.integration.S3TestInitializer</jclouds.test.initializer>
+		<jclouds.test.identity>${test.aws.identity}</jclouds.test.identity>
+		<jclouds.test.credential>${test.aws.credential}</jclouds.test.credential>
+		<test.initializer>org.jclouds.aws.s3.blobstore.integration.S3TestInitializer</test.initializer>
 	</properties>
 
 	<dependencies>
@@ -54,12 +54,12 @@
 		<dependency>
 			<groupId>com.amazonaws</groupId>
 			<artifactId>aws-java-sdk</artifactId>
-			<version>1.0.007</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.java.dev.jets3t</groupId>
 			<artifactId>jets3t</artifactId>
-			<version>0.7.4</version>
+			<version>0.8.0</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -151,8 +151,8 @@
 									<value>${jclouds.test.credential}</value>
 								</property>
 								<property>
-									<name>jclouds.test.initializer</name>
-									<value>${jclouds.test.initializer}</value>
+									<name>test.initializer</name>
+									<value>${test.initializer}</value>
 								</property>
 								<property>
 									<name>jclouds.test.loopcount</name>
diff --git a/aws/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java b/aws/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java
index 82798750c8..5c01cab67e 100644
--- a/aws/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java
+++ b/aws/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java
@@ -68,8 +68,8 @@ public abstract class BaseJCloudsPerformanceLiveTest extends BasePerformanceLive
    @Override
    protected Future<?> putByteArray(String bucket, String key, byte[] data, String contentType) {
       S3Object object = newObject(key);
-      object.getMetadata().setContentType(contentType);
       object.setPayload(data);
+      object.getPayload().getContentMetadata().setContentType(contentType);
       return getApi().putObject(bucket, object);
    }
 
@@ -78,8 +78,8 @@ public abstract class BaseJCloudsPerformanceLiveTest extends BasePerformanceLive
    @Override
    protected Future<?> putFile(String bucket, String key, File data, String contentType) {
       S3Object object = newObject(key);
-      object.getMetadata().setContentType(contentType);
       object.setPayload(data);
+      object.getPayload().getContentMetadata().setContentType(contentType);
       return getApi().putObject(bucket, object);
    }
 
@@ -94,19 +94,19 @@ public abstract class BaseJCloudsPerformanceLiveTest extends BasePerformanceLive
       S3Object object = newObject(key);
       object.setPayload(data);
       try {
-         object.getPayload().setContentLength(new Long(data.available()));
+         object.getPayload().getContentMetadata().setContentLength(new Long(data.available()));
       } catch (IOException e) {
          Throwables.propagate(e);
       }
-      object.getPayload().setContentType(contentType);
+      object.getPayload().getContentMetadata().setContentType(contentType);
       return getApi().putObject(bucket, object);
    }
 
    @Override
    protected Future<?> putString(String bucket, String key, String data, String contentType) {
       S3Object object = newObject(key);
-      object.getMetadata().setContentType(contentType);
       object.setPayload(data);
+      object.getPayload().getContentMetadata().setContentType(contentType);
       return getApi().putObject(bucket, object);
    }
 }