Revert "Revert "Dumping of Per driver results #221""

This reverts commit ccd1dbf.

dev/cosbench-s3/.classpath

@@ -3,21 +3,26 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="com.amazonaws-1.0.0.jar"/>
 	<classpathentry kind="lib" path="aspectjrt.jar"/>
 	<classpathentry kind="lib" path="aspectjweaver.jar"/>
-	<classpathentry kind="lib" path="commons-codec-1.3.jar"/>
-	<classpathentry kind="lib" path="commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="freemarker-2.3.20.jar"/>
-	<classpathentry kind="lib" path="httpclient-4.1.1.jar"/>
-	<classpathentry kind="lib" path="httpcore-4.1.jar"/>
 	<classpathentry kind="lib" path="jackson-core-asl-1.8.7.jar"/>
 	<classpathentry kind="lib" path="jackson-mapper-asl-1.8.7.jar"/>
 	<classpathentry kind="lib" path="mail-1.4.3.jar"/>
 	<classpathentry kind="lib" path="spring-beans-3.0.7.jar"/>
 	<classpathentry kind="lib" path="spring-context-3.0.7.jar"/>
 	<classpathentry kind="lib" path="spring-core-3.0.7.jar"/>
-	<classpathentry kind="lib" path="stax-1.2.0.jar"/>
-	<classpathentry kind="lib" path="stax-api-1.0.1.jar"/>
+	<classpathentry kind="lib" path="aws-java-sdk-core-1.10.76.jar"/>
+	<classpathentry kind="lib" path="aws-java-sdk-kms-1.10.76.jar"/>
+	<classpathentry kind="lib" path="commons-codec-1.6.jar"/>
+	<classpathentry kind="lib" path="commons-logging-1.1.3.jar"/>
+	<classpathentry kind="lib" path="httpclient-4.3.6.jar"/>
+	<classpathentry kind="lib" path="httpcore-4.3.3.jar"/>
+	<classpathentry kind="lib" path="jackson-annotations-2.5.0.jar"/>
+	<classpathentry kind="lib" path="jackson-core-2.5.3.jar"/>
+	<classpathentry kind="lib" path="jackson-databind-2.5.3.jar"/>
+	<classpathentry kind="lib" path="jackson-dataformat-cbor-2.5.3.jar"/>
+	<classpathentry kind="lib" path="joda-time-2.8.1.jar"/>
+	<classpathentry kind="lib" path="aws-java-sdk-s3-1.10.76.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

dev/cosbench-s3/META-INF/MANIFEST.MF

@@ -6,22 +6,27 @@ Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .,
- com.amazonaws-1.0.0.jar,
+ aws-java-sdk-s3-1.10.76.jar,
+ aws-java-sdk-kms-1.10.76.jar,
+ aws-java-sdk-core-1.10.76.jar,
  aspectjrt.jar,
  aspectjweaver.jar,
- commons-codec-1.3.jar,
- commons-logging-1.1.1.jar,
+ commons-codec-1.6.jar,
+ commons-logging-1.1.3.jar,
  freemarker-2.3.20.jar,
- httpclient-4.1.1.jar,
- httpcore-4.1.jar,
+ httpclient-4.3.6.jar,
+ httpcore-4.3.3.jar,
  jackson-core-asl-1.8.7.jar,
  jackson-mapper-asl-1.8.7.jar,
+ jackson-databind-2.5.3.jar,
+ jackson-annotations-2.5.0.jar,
+ jackson-core-2.5.3.jar,
+ jackson-dataformat-cbor-2.5.3.jar,
+ joda-time-2.8.1.jar,
  mail-1.4.3.jar,
  spring-beans-3.0.7.jar,
  spring-context-3.0.7.jar,
- spring-core-3.0.7.jar,
- stax-1.2.0.jar,
- stax-api-1.0.1.jar
+ spring-core-3.0.7.jar
 Import-Package: com.intel.cosbench.api.auth,
  com.intel.cosbench.api.context,
  com.intel.cosbench.api.storage,

dev/cosbench-s3/build.properties

@@ -1,36 +1,25 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               com.amazonaws-1.0.0.jar,\
                .,\
+               aws-java-sdk-s3-1.10.76.jar,\
+               aws-java-sdk-kms-1.10.76.jar,\
+               aws-java-sdk-core-1.10.76.jar,\
                aspectjrt.jar,\
                aspectjweaver.jar,\
-               commons-codec-1.3.jar,\
-               commons-logging-1.1.1.jar,\
+               commons-codec-1.6.jar,\
+               commons-logging-1.1.3.jar,\
                freemarker-2.3.20.jar,\
-               httpclient-4.1.1.jar,\
-               httpcore-4.1.jar,\
+               httpclient-4.3.6.jar,\
+               httpcore-4.3.3.jar,\
                jackson-core-asl-1.8.7.jar,\
                jackson-mapper-asl-1.8.7.jar,\
+               jackson-databind-2.5.3.jar,\
+               jackson-annotations-2.5.0.jar,\
+               jackson-core-2.5.3.jar,\
+               jackson-dataformat-cbor-2.5.3.jar,\
+               joda-time-2.8.1.jar,\
                mail-1.4.3.jar,\
                spring-beans-3.0.7.jar,\
                spring-context-3.0.7.jar,\
-               spring-core-3.0.7.jar,\
-               stax-1.2.0.jar,\
-               stax-api-1.0.1.jar
-               .,\
-               aspectjrt.jar,\
-               aspectjweaver.jar,\
-               commons-codec-1.3.jar,\
-               commons-logging-1.1.1.jar,\
-               freemarker-2.3.20.jar,\
-               httpclient-4.1.1.jar,\
-               httpcore-4.1.jar,\
-               jackson-core-asl-1.8.7.jar,\
-               jackson-mapper-asl-1.8.7.jar,\
-               mail-1.4.3.jar,\
-               spring-beans-3.0.7.jar,\
-               spring-context-3.0.7.jar,\
-               spring-core-3.0.7.jar,\
-               stax-1.2.0.jar,\
-               stax-api-1.0.1.jar
+               spring-core-3.0.7.jar

dev/cosbench-s3/src/com/intel/cosbench/api/S3Stor/S3Storage.java

@@ -55,7 +55,13 @@ public void init(Config config, Logger logger) {
         
         ClientConfiguration clientConf = new ClientConfiguration();
         clientConf.setConnectionTimeout(timeout);
+<<<<<<< HEAD
         clientConf.setMaxConnections(maxConnections);
+=======
+        clientConf.setSocketTimeout(timeout);
+        clientConf.withUseExpectContinue(false);
+        clientConf.withSignerOverride("S3SignerType");
+>>>>>>> d7a4d7c... Update dependency for cosbench-s3
 //        clientConf.setProtocol(Protocol.HTTP);
 		if((!proxyHost.equals(""))&&(!proxyPort.equals(""))){
 			clientConf.setProxyHost(proxyHost);