From 0d263f171091539de834aec726b7809b13241232 Mon Sep 17 00:00:00 2001 From: Nathaniel Date: Mon, 29 Jan 2018 16:13:32 +0900 Subject: [PATCH 1/6] Correct the wrong library path. --- dev/cosbench-oss/.classpath | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dev/cosbench-oss/.classpath b/dev/cosbench-oss/.classpath index f0fb6aaf..a4b364b5 100644 --- a/dev/cosbench-oss/.classpath +++ b/dev/cosbench-oss/.classpath @@ -1,14 +1,14 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + From fc9f228c39350a89a88720b00092c82b8514d786 Mon Sep 17 00:00:00 2001 From: Nathaniel Date: Mon, 29 Jan 2018 16:15:06 +0900 Subject: [PATCH 2/6] Remove the wrong source path(cosbench-openio/test). --- dev/cosbench-openio/.classpath | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dev/cosbench-openio/.classpath b/dev/cosbench-openio/.classpath index 72649e55..c6e914bf 100644 --- a/dev/cosbench-openio/.classpath +++ b/dev/cosbench-openio/.classpath @@ -1,10 +1,9 @@ - - - - - - - - - - + + + + + + + + + From 44a51247d7600c868f829883c9140d483caa9f95 Mon Sep 17 00:00:00 2001 From: Nathaniel Date: Mon, 29 Jan 2018 16:58:16 +0900 Subject: [PATCH 3/6] Remove unnecessary metadata of cosbench-ecs. --- dev/cosbench-ecs/META-INF/.ecsmeta/.dirmeta | 1 - dev/cosbench-ecs/META-INF/.ecsmeta/MANIFEST.MF | 1 - dev/cosbench-ecs/src/.ecsmeta/.dirmeta | 1 - dev/cosbench-ecs/src/com/.ecsmeta/.dirmeta | 1 - dev/cosbench-ecs/src/com/emc/.ecsmeta/.dirmeta | 1 - dev/cosbench-ecs/src/com/emc/vipr/.ecsmeta/.dirmeta | 1 - dev/cosbench-ecs/src/com/emc/vipr/cosbench/.ecsmeta/.dirmeta | 1 - .../src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/.dirmeta | 1 - .../src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSConstants.java | 1 - .../src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSStorage.java | 1 - .../emc/vipr/cosbench/ECSStor/.ecsmeta/ECSStorageFactory.java | 1 - 11 files changed, 11 deletions(-) delete mode 100644 dev/cosbench-ecs/META-INF/.ecsmeta/.dirmeta delete mode 100644 dev/cosbench-ecs/META-INF/.ecsmeta/MANIFEST.MF delete mode 100644 dev/cosbench-ecs/src/.ecsmeta/.dirmeta delete mode 100644 dev/cosbench-ecs/src/com/.ecsmeta/.dirmeta delete mode 100644 dev/cosbench-ecs/src/com/emc/.ecsmeta/.dirmeta delete mode 100644 dev/cosbench-ecs/src/com/emc/vipr/.ecsmeta/.dirmeta delete mode 100644 dev/cosbench-ecs/src/com/emc/vipr/cosbench/.ecsmeta/.dirmeta delete mode 100644 dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/.dirmeta delete mode 100644 dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSConstants.java delete mode 100644 dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSStorage.java delete mode 100644 dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSStorageFactory.java diff --git a/dev/cosbench-ecs/META-INF/.ecsmeta/.dirmeta b/dev/cosbench-ecs/META-INF/.ecsmeta/.dirmeta deleted file mode 100644 index 170229a4..00000000 --- a/dev/cosbench-ecs/META-INF/.ecsmeta/.dirmeta +++ /dev/null @@ -1 +0,0 @@ -{"instanceClass":"com.emc.ecs.sync.model.SyncMetadata","cacheControl":null,"contentDisposition":null,"contentEncoding":"identity","contentLength":0,"contentType":"application/x-directory","httpExpires":null,"modificationTime":"Jun 23, 2016 4:03:00 PM","userMetadata":{"x-emc-crtime":{"key":"x-emc-crtime","value":"2016-06-20T21:16:47Z","indexed":false},"x-emc-posix-owner-name":{"key":"x-emc-posix-owner-name","value":"petera5","indexed":false},"x-emc-posix-group-owner-name":{"key":"x-emc-posix-group-owner-name","value":"CORP\\Domain Users","indexed":false},"x-emc-atime":{"key":"x-emc-atime","value":"2016-06-23T21:02:46Z","indexed":false},"x-emc-mtime":{"key":"x-emc-mtime","value":"2016-06-20T21:16:47Z","indexed":false},"x-emc-posix-mode":{"key":"x-emc-posix-mode","value":"rwxr-xr-x","indexed":false}},"acl":null,"checksum":null,"expirationDate":null} \ No newline at end of file diff --git a/dev/cosbench-ecs/META-INF/.ecsmeta/MANIFEST.MF b/dev/cosbench-ecs/META-INF/.ecsmeta/MANIFEST.MF deleted file mode 100644 index 6d1e583e..00000000 --- a/dev/cosbench-ecs/META-INF/.ecsmeta/MANIFEST.MF +++ /dev/null @@ -1 +0,0 @@ -{"instanceClass":"com.emc.ecs.sync.model.SyncMetadata","cacheControl":null,"contentDisposition":null,"contentEncoding":"identity","contentLength":777,"contentType":"application/octet-stream","httpExpires":null,"modificationTime":"Jun 23, 2016 4:03:49 PM","userMetadata":{"x-emc-crtime":{"key":"x-emc-crtime","value":"2016-06-20T21:16:47Z","indexed":false},"x-emc-posix-owner-name":{"key":"x-emc-posix-owner-name","value":"petera5","indexed":false},"x-emc-posix-group-owner-name":{"key":"x-emc-posix-group-owner-name","value":"CORP\\Domain Users","indexed":false},"x-emc-atime":{"key":"x-emc-atime","value":"2016-06-20T21:16:47Z","indexed":false},"x-emc-mtime":{"key":"x-emc-mtime","value":"2016-06-20T21:16:47Z","indexed":false},"x-emc-posix-mode":{"key":"x-emc-posix-mode","value":"rw-r--r--","indexed":false}},"acl":null,"checksum":null,"expirationDate":null} \ No newline at end of file diff --git a/dev/cosbench-ecs/src/.ecsmeta/.dirmeta b/dev/cosbench-ecs/src/.ecsmeta/.dirmeta deleted file mode 100644 index 51f85ea1..00000000 --- a/dev/cosbench-ecs/src/.ecsmeta/.dirmeta +++ /dev/null @@ -1 +0,0 @@ -{"instanceClass":"com.emc.ecs.sync.model.SyncMetadata","cacheControl":null,"contentDisposition":null,"contentEncoding":"identity","contentLength":0,"contentType":"application/x-directory","httpExpires":null,"modificationTime":"Jun 23, 2016 4:03:00 PM","userMetadata":{"x-emc-crtime":{"key":"x-emc-crtime","value":"2014-11-19T20:38:22Z","indexed":false},"x-emc-posix-owner-name":{"key":"x-emc-posix-owner-name","value":"petera5","indexed":false},"x-emc-posix-group-owner-name":{"key":"x-emc-posix-group-owner-name","value":"CORP\\Domain Users","indexed":false},"x-emc-atime":{"key":"x-emc-atime","value":"2016-06-23T21:02:46Z","indexed":false},"x-emc-mtime":{"key":"x-emc-mtime","value":"2014-11-19T20:38:22Z","indexed":false},"x-emc-posix-mode":{"key":"x-emc-posix-mode","value":"rwxr-xr-x","indexed":false}},"acl":null,"checksum":null,"expirationDate":null} \ No newline at end of file diff --git a/dev/cosbench-ecs/src/com/.ecsmeta/.dirmeta b/dev/cosbench-ecs/src/com/.ecsmeta/.dirmeta deleted file mode 100644 index 40e820d0..00000000 --- a/dev/cosbench-ecs/src/com/.ecsmeta/.dirmeta +++ /dev/null @@ -1 +0,0 @@ -{"instanceClass":"com.emc.ecs.sync.model.SyncMetadata","cacheControl":null,"contentDisposition":null,"contentEncoding":"identity","contentLength":0,"contentType":"application/x-directory","httpExpires":null,"modificationTime":"Jun 23, 2016 4:03:50 PM","userMetadata":{"x-emc-crtime":{"key":"x-emc-crtime","value":"2014-11-19T20:38:22Z","indexed":false},"x-emc-posix-owner-name":{"key":"x-emc-posix-owner-name","value":"petera5","indexed":false},"x-emc-posix-group-owner-name":{"key":"x-emc-posix-group-owner-name","value":"CORP\\Domain Users","indexed":false},"x-emc-atime":{"key":"x-emc-atime","value":"2016-06-23T21:02:46Z","indexed":false},"x-emc-mtime":{"key":"x-emc-mtime","value":"2014-11-19T20:38:22Z","indexed":false},"x-emc-posix-mode":{"key":"x-emc-posix-mode","value":"rwxr-xr-x","indexed":false}},"acl":null,"checksum":null,"expirationDate":null} \ No newline at end of file diff --git a/dev/cosbench-ecs/src/com/emc/.ecsmeta/.dirmeta b/dev/cosbench-ecs/src/com/emc/.ecsmeta/.dirmeta deleted file mode 100644 index c931195c..00000000 --- a/dev/cosbench-ecs/src/com/emc/.ecsmeta/.dirmeta +++ /dev/null @@ -1 +0,0 @@ -{"instanceClass":"com.emc.ecs.sync.model.SyncMetadata","cacheControl":null,"contentDisposition":null,"contentEncoding":"identity","contentLength":0,"contentType":"application/x-directory","httpExpires":null,"modificationTime":"Jun 23, 2016 4:06:27 PM","userMetadata":{"x-emc-crtime":{"key":"x-emc-crtime","value":"2015-03-06T18:29:54Z","indexed":false},"x-emc-posix-owner-name":{"key":"x-emc-posix-owner-name","value":"petera5","indexed":false},"x-emc-posix-group-owner-name":{"key":"x-emc-posix-group-owner-name","value":"CORP\\Domain Users","indexed":false},"x-emc-atime":{"key":"x-emc-atime","value":"2016-06-23T21:02:47Z","indexed":false},"x-emc-mtime":{"key":"x-emc-mtime","value":"2015-03-06T18:29:54Z","indexed":false},"x-emc-posix-mode":{"key":"x-emc-posix-mode","value":"rwxr-xr-x","indexed":false}},"acl":null,"checksum":null,"expirationDate":null} \ No newline at end of file diff --git a/dev/cosbench-ecs/src/com/emc/vipr/.ecsmeta/.dirmeta b/dev/cosbench-ecs/src/com/emc/vipr/.ecsmeta/.dirmeta deleted file mode 100644 index bea511d9..00000000 --- a/dev/cosbench-ecs/src/com/emc/vipr/.ecsmeta/.dirmeta +++ /dev/null @@ -1 +0,0 @@ -{"instanceClass":"com.emc.ecs.sync.model.SyncMetadata","cacheControl":null,"contentDisposition":null,"contentEncoding":"identity","contentLength":0,"contentType":"application/x-directory","httpExpires":null,"modificationTime":"Jun 23, 2016 4:11:56 PM","userMetadata":{"x-emc-crtime":{"key":"x-emc-crtime","value":"2014-11-19T20:38:22Z","indexed":false},"x-emc-posix-owner-name":{"key":"x-emc-posix-owner-name","value":"petera5","indexed":false},"x-emc-posix-group-owner-name":{"key":"x-emc-posix-group-owner-name","value":"CORP\\Domain Users","indexed":false},"x-emc-atime":{"key":"x-emc-atime","value":"2016-06-23T21:02:47Z","indexed":false},"x-emc-mtime":{"key":"x-emc-mtime","value":"2014-11-19T20:38:22Z","indexed":false},"x-emc-posix-mode":{"key":"x-emc-posix-mode","value":"rwxr-xr-x","indexed":false}},"acl":null,"checksum":null,"expirationDate":null} \ No newline at end of file diff --git a/dev/cosbench-ecs/src/com/emc/vipr/cosbench/.ecsmeta/.dirmeta b/dev/cosbench-ecs/src/com/emc/vipr/cosbench/.ecsmeta/.dirmeta deleted file mode 100644 index 0e619466..00000000 --- a/dev/cosbench-ecs/src/com/emc/vipr/cosbench/.ecsmeta/.dirmeta +++ /dev/null @@ -1 +0,0 @@ -{"instanceClass":"com.emc.ecs.sync.model.SyncMetadata","cacheControl":null,"contentDisposition":null,"contentEncoding":"identity","contentLength":0,"contentType":"application/x-directory","httpExpires":null,"modificationTime":"Jun 23, 2016 4:18:41 PM","userMetadata":{"x-emc-crtime":{"key":"x-emc-crtime","value":"2015-03-11T16:53:12Z","indexed":false},"x-emc-posix-owner-name":{"key":"x-emc-posix-owner-name","value":"petera5","indexed":false},"x-emc-posix-group-owner-name":{"key":"x-emc-posix-group-owner-name","value":"CORP\\Domain Users","indexed":false},"x-emc-atime":{"key":"x-emc-atime","value":"2016-06-23T21:02:47Z","indexed":false},"x-emc-mtime":{"key":"x-emc-mtime","value":"2015-03-11T16:53:12Z","indexed":false},"x-emc-posix-mode":{"key":"x-emc-posix-mode","value":"rwxr-xr-x","indexed":false}},"acl":null,"checksum":null,"expirationDate":null} \ No newline at end of file diff --git a/dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/.dirmeta b/dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/.dirmeta deleted file mode 100644 index 65793fef..00000000 --- a/dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/.dirmeta +++ /dev/null @@ -1 +0,0 @@ -{"instanceClass":"com.emc.ecs.sync.model.SyncMetadata","cacheControl":null,"contentDisposition":null,"contentEncoding":"identity","contentLength":0,"contentType":"application/x-directory","httpExpires":null,"modificationTime":"Jun 23, 2016 4:23:56 PM","userMetadata":{"x-emc-crtime":{"key":"x-emc-crtime","value":"2016-06-20T15:52:33Z","indexed":false},"x-emc-posix-owner-name":{"key":"x-emc-posix-owner-name","value":"petera5","indexed":false},"x-emc-posix-group-owner-name":{"key":"x-emc-posix-group-owner-name","value":"CORP\\Domain Users","indexed":false},"x-emc-atime":{"key":"x-emc-atime","value":"2016-06-23T21:02:48Z","indexed":false},"x-emc-mtime":{"key":"x-emc-mtime","value":"2016-06-20T15:52:33Z","indexed":false},"x-emc-posix-mode":{"key":"x-emc-posix-mode","value":"rwxr-xr-x","indexed":false}},"acl":null,"checksum":null,"expirationDate":null} \ No newline at end of file diff --git a/dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSConstants.java b/dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSConstants.java deleted file mode 100644 index 1c74319f..00000000 --- a/dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSConstants.java +++ /dev/null @@ -1 +0,0 @@ -{"instanceClass":"com.emc.ecs.sync.model.SyncMetadata","cacheControl":null,"contentDisposition":null,"contentEncoding":"identity","contentLength":2529,"contentType":"application/octet-stream","httpExpires":null,"modificationTime":"Jun 23, 2016 4:30:40 PM","userMetadata":{"x-emc-crtime":{"key":"x-emc-crtime","value":"2016-05-24T15:54:45Z","indexed":false},"x-emc-posix-owner-name":{"key":"x-emc-posix-owner-name","value":"petera5","indexed":false},"x-emc-posix-group-owner-name":{"key":"x-emc-posix-group-owner-name","value":"CORP\\Domain Users","indexed":false},"x-emc-atime":{"key":"x-emc-atime","value":"2016-06-20T15:23:45Z","indexed":false},"x-emc-mtime":{"key":"x-emc-mtime","value":"2016-05-24T15:54:45Z","indexed":false},"x-emc-posix-mode":{"key":"x-emc-posix-mode","value":"rw-r--r--","indexed":false}},"acl":null,"checksum":null,"expirationDate":null} \ No newline at end of file diff --git a/dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSStorage.java b/dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSStorage.java deleted file mode 100644 index 4699571b..00000000 --- a/dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSStorage.java +++ /dev/null @@ -1 +0,0 @@ -{"instanceClass":"com.emc.ecs.sync.model.SyncMetadata","cacheControl":null,"contentDisposition":null,"contentEncoding":"identity","contentLength":10046,"contentType":"application/octet-stream","httpExpires":null,"modificationTime":"Jun 23, 2016 4:30:40 PM","userMetadata":{"x-emc-crtime":{"key":"x-emc-crtime","value":"2016-06-13T22:12:05Z","indexed":false},"x-emc-posix-owner-name":{"key":"x-emc-posix-owner-name","value":"petera5","indexed":false},"x-emc-posix-group-owner-name":{"key":"x-emc-posix-group-owner-name","value":"CORP\\Domain Users","indexed":false},"x-emc-atime":{"key":"x-emc-atime","value":"2016-06-16T16:58:53Z","indexed":false},"x-emc-mtime":{"key":"x-emc-mtime","value":"2016-06-13T22:12:05Z","indexed":false},"x-emc-posix-mode":{"key":"x-emc-posix-mode","value":"rw-r--r--","indexed":false}},"acl":null,"checksum":null,"expirationDate":null} \ No newline at end of file diff --git a/dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSStorageFactory.java b/dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSStorageFactory.java deleted file mode 100644 index 738bd2fd..00000000 --- a/dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSStorageFactory.java +++ /dev/null @@ -1 +0,0 @@ -{"instanceClass":"com.emc.ecs.sync.model.SyncMetadata","cacheControl":null,"contentDisposition":null,"contentEncoding":"identity","contentLength":1150,"contentType":"application/octet-stream","httpExpires":null,"modificationTime":"Jun 23, 2016 4:30:40 PM","userMetadata":{"x-emc-crtime":{"key":"x-emc-crtime","value":"2015-05-15T18:49:33Z","indexed":false},"x-emc-posix-owner-name":{"key":"x-emc-posix-owner-name","value":"petera5","indexed":false},"x-emc-posix-group-owner-name":{"key":"x-emc-posix-group-owner-name","value":"CORP\\Domain Users","indexed":false},"x-emc-atime":{"key":"x-emc-atime","value":"2016-06-16T16:58:53Z","indexed":false},"x-emc-mtime":{"key":"x-emc-mtime","value":"2015-05-15T18:49:33Z","indexed":false},"x-emc-posix-mode":{"key":"x-emc-posix-mode","value":"rw-r--r--","indexed":false}},"acl":null,"checksum":null,"expirationDate":null} \ No newline at end of file From 3807991edb05a9f81c9ecfc65d45cab9f0382039 Mon Sep 17 00:00:00 2001 From: Nathaniel Date: Mon, 29 Jan 2018 17:06:13 +0900 Subject: [PATCH 4/6] Add a default configuration for importing cosbench-ecs project into eclipse. --- dev/cosbench-ecs/.classpath | 22 ++++++++++++++++++++++ dev/cosbench-ecs/.gitignore | 1 + dev/cosbench-ecs/.project | 28 ++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 dev/cosbench-ecs/.classpath create mode 100644 dev/cosbench-ecs/.gitignore create mode 100644 dev/cosbench-ecs/.project diff --git a/dev/cosbench-ecs/.classpath b/dev/cosbench-ecs/.classpath new file mode 100644 index 00000000..dbdfc0ce --- /dev/null +++ b/dev/cosbench-ecs/.classpath @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/cosbench-ecs/.gitignore b/dev/cosbench-ecs/.gitignore new file mode 100644 index 00000000..5e56e040 --- /dev/null +++ b/dev/cosbench-ecs/.gitignore @@ -0,0 +1 @@ +/bin diff --git a/dev/cosbench-ecs/.project b/dev/cosbench-ecs/.project new file mode 100644 index 00000000..e4f0aac4 --- /dev/null +++ b/dev/cosbench-ecs/.project @@ -0,0 +1,28 @@ + + + cosbench-ecs + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + From 8958eef1e6cded294fc11d1e79f2eaf7414a13f3 Mon Sep 17 00:00:00 2001 From: Nathaniel Date: Mon, 29 Jan 2018 17:14:33 +0900 Subject: [PATCH 5/6] Modify the version(0.4.1) of the MANIFEST.MF files to be the same as the version(0.4.2) recorded in the VERSION file for linux users. This is because the VERSION(VERSION=`cat VERSION`) from start-driver.sh and start-controller.sh does not match the name of the generated .jar file(cosbench-xxx_${VERSION}). --- dev/cosbench-ampli/META-INF/MANIFEST.MF | 2 +- dev/cosbench-api/META-INF/MANIFEST.MF | 2 +- dev/cosbench-castor/META-INF/MANIFEST.MF | 2 +- dev/cosbench-cdmi-base/META-INF/MANIFEST.MF | 2 +- dev/cosbench-cdmi-swift/META-INF/MANIFEST.MF | 2 +- dev/cosbench-cdmi-util/META-INF/MANIFEST.MF | 2 +- dev/cosbench-config/META-INF/MANIFEST.MF | 2 +- dev/cosbench-controller-web/META-INF/MANIFEST.MF | 2 +- dev/cosbench-controller/META-INF/MANIFEST.MF | 2 +- dev/cosbench-core-web/META-INF/MANIFEST.MF | 2 +- dev/cosbench-core/META-INF/MANIFEST.MF | 2 +- dev/cosbench-driver-web/META-INF/MANIFEST.MF | 2 +- dev/cosbench-driver/META-INF/MANIFEST.MF | 2 +- dev/cosbench-gcs/META-INF/MANIFEST.MF | 2 +- dev/cosbench-http/META-INF/MANIFEST.MF | 2 +- dev/cosbench-httpauth/META-INF/MANIFEST.MF | 2 +- dev/cosbench-keystone/META-INF/MANIFEST.MF | 2 +- dev/cosbench-librados/META-INF/MANIFEST.MF | 2 +- dev/cosbench-log/META-INF/MANIFEST.MF | 2 +- dev/cosbench-log4j/META-INF/MANIFEST.MF | 2 +- dev/cosbench-mock/META-INF/MANIFEST.MF | 2 +- dev/cosbench-openio/META-INF/MANIFEST.MF | 2 +- dev/cosbench-s3/META-INF/MANIFEST.MF | 2 +- dev/cosbench-scality/META-INF/MANIFEST.MF | 2 +- dev/cosbench-swauth/META-INF/MANIFEST.MF | 2 +- dev/cosbench-swift/META-INF/MANIFEST.MF | 2 +- dev/cosbench-tomcat/META-INF/MANIFEST.MF | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dev/cosbench-ampli/META-INF/MANIFEST.MF b/dev/cosbench-ampli/META-INF/MANIFEST.MF index b2010dc2..8e87b233 100644 --- 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 index eb1091ba..31eba699 100644 --- 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 index d83dd54c..b781c42b 100644 --- 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 index 51462c07..417f2418 100644 --- 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 index 209967d1..b77d03c9 100644 --- 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 index f393fbb6..e73f55b1 100644 --- 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 index 5fe60eb9..47dfd9d8 100644 --- 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 index d56a5b35..c127648d 100644 --- 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/META-INF/MANIFEST.MF b/dev/cosbench-controller/META-INF/MANIFEST.MF index ace9fa08..5f7d6fcb 100644 --- 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 index f4407b82..452802ad 100644 --- 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 index 227c2a14..0f4aee3c 100644 --- 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 index b5d9dfbb..4aa6d4ac 100644 --- 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/META-INF/MANIFEST.MF b/dev/cosbench-driver/META-INF/MANIFEST.MF index 9cd80104..5192cce7 100644 --- 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-gcs/META-INF/MANIFEST.MF b/dev/cosbench-gcs/META-INF/MANIFEST.MF index 558f8d85..d0c8abeb 100644 --- a/dev/cosbench-gcs/META-INF/MANIFEST.MF +++ b/dev/cosbench-gcs/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Google Cloud Storage Client Bundle Bundle-SymbolicName: cosbench-gcs -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 index 057d2f7b..f0910462 100644 --- 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 index 8cac2177..a7b4a91c 100644 --- 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 index 784d2b8f..e91744ef 100644 --- 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 index d830a306..bbbe26e5 100644 --- 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 index ca2512c1..483b804f 100644 --- 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 index d889c885..5cb6d4fc 100644 --- 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 index 8598971e..a8b0066b 100644 --- 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-openio/META-INF/MANIFEST.MF b/dev/cosbench-openio/META-INF/MANIFEST.MF index 5e5431fa..64454984 100644 --- a/dev/cosbench-openio/META-INF/MANIFEST.MF +++ b/dev/cosbench-openio/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: OpenIO Storage Client Bundle Bundle-SymbolicName: cosbench-openio -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 index e81b0826..d7f4e17f 100644 --- 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 index 1fadd176..be41973a 100644 --- 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 index c4d87a33..3b32fabe 100644 --- 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 index 815d0057..8eced52a 100644 --- 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-tomcat/META-INF/MANIFEST.MF b/dev/cosbench-tomcat/META-INF/MANIFEST.MF index 41da3411..cb40c4a9 100644 --- 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)", From 5f61de70613bd036a9fe7e75942eab93aa964d83 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Mon, 29 Jan 2018 17:18:13 +0900 Subject: [PATCH 6/6] Delete .gitignore in cosbench-ecs --- dev/cosbench-ecs/.gitignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 dev/cosbench-ecs/.gitignore diff --git a/dev/cosbench-ecs/.gitignore b/dev/cosbench-ecs/.gitignore deleted file mode 100644 index 5e56e040..00000000 --- a/dev/cosbench-ecs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin