update version to 0.4.2

Signed-off-by: ywang19 <yaguang.wang@intel.com>
intel-cloud · Jan 27, 2016 · dc2b730 · dc2b730
1 parent 7b44441
commit dc2b730
Show file tree

Hide file tree

Showing 31 changed files with 41 additions and 30 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.2
+0.4.2
diff --git a/dev/cosbench-ampli/META-INF/MANIFEST.MF b/dev/cosbench-ampli/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Cosbench Ampli Client Bundle
 Bundle-SymbolicName: cosbench-ampli
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.api.context,

diff --git a/dev/cosbench-api/META-INF/MANIFEST.MF b/dev/cosbench-api/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench API Bundle
 Bundle-SymbolicName: cosbench-api
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.config,

diff --git a/dev/cosbench-castor/META-INF/MANIFEST.MF b/dev/cosbench-castor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Castor Configuration Bundle
 Bundle-SymbolicName: cosbench-castor
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Fragment-Host: com.springsource.org.castor;bundle-version="[1.2.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/dev/cosbench-cdmi-base/META-INF/MANIFEST.MF b/dev/cosbench-cdmi-base/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDMI Base Client Bundle
 Bundle-SymbolicName: cosbench-cdmi-base
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.api.auth,

diff --git a/dev/cosbench-cdmi-swift/META-INF/MANIFEST.MF b/dev/cosbench-cdmi-swift/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDMI Client for Swift Bundle
 Bundle-SymbolicName: cosbench-cdmi-swift
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.api.auth,

diff --git a/dev/cosbench-cdmi-util/META-INF/MANIFEST.MF b/dev/cosbench-cdmi-util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDMI Utility Bundle
 Bundle-SymbolicName: cosbench-cdmi-util
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.intel.cosbench.client.cdmi.util

diff --git a/dev/cosbench-config/META-INF/MANIFEST.MF b/dev/cosbench-config/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Config Bundle
 Bundle-SymbolicName: cosbench-config
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.intel.cosbench.config,

diff --git a/dev/cosbench-controller-web/META-INF/MANIFEST.MF b/dev/cosbench-controller-web/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Web-ContextPath: controller
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Controller Web Bundle
 Bundle-SymbolicName: cosbench-controller-web
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.bench,

diff --git a/dev/cosbench-controller-web/WEB-INF/freemarker/header.ftl b/dev/cosbench-controller-web/WEB-INF/freemarker/header.ftl
@@ -1,6 +1,6 @@
 <div id="header">
 <div class="content">
   <div id="title"><span class="codename">COSBench</span> - <span>Controller Web Console</span></div>
-  <div id="version"><div><strong>Beta Release</strong></div><div>version: 0.4.1 </div></div>
+  <div id="version"><div><strong>Beta Release</strong></div><div>version: 0.4.2 </div></div>
 </div> <#-- end of content -->
 </div> <#-- end of header -->
diff --git a/dev/cosbench-controller/META-INF/MANIFEST.MF b/dev/cosbench-controller/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Controller Bundler
 Bundle-SymbolicName: cosbench-controller
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.bench,

diff --git a/dev/cosbench-core-web/META-INF/MANIFEST.MF b/dev/cosbench-core-web/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Web Core Bundle
 Bundle-SymbolicName: cosbench-core-web
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.intel.cosbench.web

diff --git a/dev/cosbench-core/META-INF/MANIFEST.MF b/dev/cosbench-core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Core Bundle
 Bundle-SymbolicName: cosbench-core
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.intel.cosbench.bench,

diff --git a/dev/cosbench-driver-web/META-INF/MANIFEST.MF b/dev/cosbench-driver-web/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Web-ContextPath: driver
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Driver Web Bundle
 Bundle-SymbolicName: cosbench-driver-web
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.bench,

diff --git a/dev/cosbench-driver-web/WEB-INF/freemarker/header.ftl b/dev/cosbench-driver-web/WEB-INF/freemarker/header.ftl
@@ -1,6 +1,6 @@
 <div id="header">
 <div class="content">
   <div id="title"><span class="codename">COSBench</span> - <span>Driver Web Console</span></div>
-  <div id="version"><div><strong>Beta Release</strong></div><div>version: 0.4.1 </div></div>
+  <div id="version"><div><strong>Beta Release</strong></div><div>version: 0.4.2 </div></div>
 </div> <#-- end of content -->
 </div> <#-- end of header -->
diff --git a/dev/cosbench-driver/META-INF/MANIFEST.MF b/dev/cosbench-driver/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Driver Bundle
 Bundle-SymbolicName: cosbench-driver
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.api.auth,

diff --git a/dev/cosbench-http/META-INF/MANIFEST.MF b/dev/cosbench-http/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Http Client Utility Bundle
 Bundle-SymbolicName: cosbench-http
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.intel.cosbench.client.http

diff --git a/dev/cosbench-httpauth/META-INF/MANIFEST.MF b/dev/cosbench-httpauth/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Http Authentication Bundle
 Bundle-SymbolicName: cosbench-httpauth
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.api.auth,

diff --git a/dev/cosbench-keystone/META-INF/MANIFEST.MF b/dev/cosbench-keystone/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Keystone Client Bundle
 Bundle-SymbolicName: cosbench-keystone
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.api.auth,

diff --git a/dev/cosbench-librados/META-INF/MANIFEST.MF b/dev/cosbench-librados/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Librados Storage Client Bundle
 Bundle-SymbolicName: cosbench-librados
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .,

diff --git a/dev/cosbench-log/META-INF/MANIFEST.MF b/dev/cosbench-log/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Log Bundle
 Bundle-SymbolicName: cosbench-log
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Activator: com.intel.cosbench.log.osgi.Activator
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/dev/cosbench-log4j/META-INF/MANIFEST.MF b/dev/cosbench-log4j/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Log4j Configuration Bundle
 Bundle-SymbolicName: cosbench-log4j
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Fragment-Host: com.springsource.org.apache.log4j;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/dev/cosbench-mock/META-INF/MANIFEST.MF b/dev/cosbench-mock/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Mock Client Bundle
 Bundle-SymbolicName: cosbench-mock
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.api.auth,

diff --git a/dev/cosbench-s3/META-INF/MANIFEST.MF b/dev/cosbench-s3/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: S3 Storage Client Bundle
 Bundle-SymbolicName: cosbench-s3
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .,

diff --git a/dev/cosbench-scality/META-INF/MANIFEST.MF b/dev/cosbench-scality/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Scality COSBench Client Bundle
 Bundle-SymbolicName: cosbench-scality
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: Scality
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.api.auth,

diff --git a/dev/cosbench-swauth/META-INF/MANIFEST.MF b/dev/cosbench-swauth/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Swauth Client Bundle
 Bundle-SymbolicName: cosbench-swauth
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.api.auth,

diff --git a/dev/cosbench-swift/META-INF/MANIFEST.MF b/dev/cosbench-swift/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Swift Client Bundle
 Bundle-SymbolicName: cosbench-swift
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.api.auth,

diff --git a/dev/cosbench-swift/src/com/intel/cosbench/api/swift/SwiftStorage.java b/dev/cosbench-swift/src/com/intel/cosbench/api/swift/SwiftStorage.java
@@ -49,6 +49,7 @@ class SwiftStorage extends NoneStorage {
     private String token;
     private String storage_url;
     private String policy;
+    private int transfer_rate;
 
     public SwiftStorage() {
         /* empty */
@@ -62,11 +63,13 @@ public void init(Config config, Logger logger) {
         token = config.get(AUTH_TOKEN_KEY, AUTH_TOKEN_DEFAULT);
         storage_url = config.get(STORAGE_URL_KEY, STORAGE_URL_DEFAULT);
         policy = config.get(POLICY_KEY, POLICY_DEFAULT);
+        transfer_rate = config.getInt(TRANSFER_RATE, TRANSFER_RATE_DEFAULT);
 
         parms.put(CONN_TIMEOUT_KEY, timeout);
         parms.put(AUTH_TOKEN_KEY, token);
         parms.put(STORAGE_URL_KEY, storage_url);
         parms.put(POLICY_KEY, policy);
+        parms.put(TRANSFER_RATE, transfer_rate);
 
         logger.debug("using storage config: {}", parms);
 
@@ -86,7 +89,7 @@ public void setAuthContext(AuthContext info) {
         }
 
         try {
-            client.init(token, storage_url, policy);
+            client.init(token, storage_url, policy, transfer_rate);
         } catch (Exception e) {
             throw new StorageException(e);
         }

diff --git a/dev/cosbench-swift/src/com/intel/cosbench/client/swift/SwiftClient.java b/dev/cosbench-swift/src/com/intel/cosbench/client/swift/SwiftClient.java
@@ -38,6 +38,7 @@ public class SwiftClient {
     private String authToken;
     private String storageURL;
     private String policy;
+    private int rate;
 
     /* HTTP client */
     private HttpClient client;
@@ -68,10 +69,11 @@ public void abort() {
         method = null;
     }
 
-    public void init(String authToken, String storageURL, String policy) {
+    public void init(String authToken, String storageURL, String policy, int rate) {
         this.authToken = authToken;
         this.storageURL = storageURL;
         this.policy = policy;
+        this.rate = rate;
     }
 
     public SwiftAccount getAccountInfo() throws IOException, SwiftException {
@@ -174,6 +176,7 @@ public InputStream getObjectAsStream(String container, String object)
             throws IOException, SwiftException {
         method = HttpClientUtil.makeHttpGet(getObjectPath(container, object));
         method.setHeader(X_AUTH_TOKEN, authToken);
+        method.setHeader(X_TRANSFER_RATE, new Integer(rate).toString());
         SwiftResponse response = new SwiftResponse(client.execute(method));
         if (response.getStatusCode() == SC_OK)
             return response.getResponseBodyAsStream();

diff --git a/dev/cosbench-swift/src/com/intel/cosbench/client/swift/SwiftConstants.java b/dev/cosbench-swift/src/com/intel/cosbench/client/swift/SwiftConstants.java
@@ -40,6 +40,9 @@ public interface SwiftConstants {
     String POLICY_KEY = "policy";
     String POLICY_DEFAULT = null;
 
+    String TRANSFER_RATE = "transfer_rate";
+    Integer TRANSFER_RATE_DEFAULT = 50000000;
+
     // --------------------------------------------------------------------------
     // Swift RESTful API
     // --------------------------------------------------------------------------
@@ -57,5 +60,7 @@ public interface SwiftConstants {
     String X_ACCOUNT_CONTAINER_COUNT = "X-Account-Container-Count";
 
     String X_ACCOUNT_BYTES_USED = "X-Account-Bytes-Used";
+
+    String X_TRANSFER_RATE = "X-Transfer-Rate";
 
 }
diff --git a/dev/cosbench-tomcat/META-INF/MANIFEST.MF b/dev/cosbench-tomcat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: COSBench Tomcat Bundle
 Bundle-SymbolicName: cosbench-tomcat
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.2.0
 Bundle-Activator: com.intel.cosbench.tomcat.osgi.Activator
 Import-Package: com.intel.cosbench.log,
  org.apache.catalina;version="[6.0.16,7.0.0)",