Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

I solved some problems with using the program so that beginners can use cosbench easily. #373

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

I solved some problems with using the program so that beginners can use cosbench easily. #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d263f1
Correct the wrong library path.
Nathaniel7687 Jan 29, 2018
fc9f228
Remove the wrong source path(cosbench-openio/test).
Nathaniel7687 Jan 29, 2018
44a5124
Remove unnecessary metadata of cosbench-ecs.
Nathaniel7687 Jan 29, 2018
3807991
Add a default configuration for importing cosbench-ecs project into
Nathaniel7687 Jan 29, 2018
8958eef
Modify the version(0.4.1) of the MANIFEST.MF files to be the same as the
Nathaniel7687 Jan 29, 2018
5f61de7
Delete .gitignore in cosbench-ecs
Nathaniel7687 Jan 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/cosbench-ampli/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-api/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-castor/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-cdmi-base/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-cdmi-swift/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-cdmi-util/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-config/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-controller-web/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-controller/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-core-web/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-driver-web/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-driver/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
22 changes: 22 additions & 0 deletions dev/cosbench-ecs/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<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="commons-codec-1.4.jar"/>
<classpathentry kind="lib" path="commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="httpclient-4.5.jar"/>
<classpathentry kind="lib" path="httpcore-4.4.1.jar"/>
<classpathentry kind="lib" path="javax.mail-api-1.4.6.jar"/>
<classpathentry kind="lib" path="jdom2-2.0.5.jar"/>
<classpathentry kind="lib" path="jersey-apache-client4-1.18.3.jar"/>
<classpathentry kind="lib" path="jersey-client-1.18.3.jar"/>
<classpathentry kind="lib" path="jersey-core-1.18.3.jar"/>
<classpathentry kind="lib" path="log4j-1.2.17.jar"/>
<classpathentry kind="lib" path="lzma-sdk-4j-9.22.0.jar"/>
<classpathentry kind="lib" path="object-client-2.1.0.jar"/>
<classpathentry kind="lib" path="slf4j-api-1.7.5.jar"/>
<classpathentry kind="lib" path="smart-client-2.0.6.jar"/>
<classpathentry kind="lib" path="vipr-object-transformations-2.0.3.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
28 changes: 28 additions & 0 deletions dev/cosbench-ecs/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>cosbench-ecs</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
1 change: 0 additions & 1 deletion dev/cosbench-ecs/META-INF/.ecsmeta/.dirmeta
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dev/cosbench-ecs/META-INF/.ecsmeta/MANIFEST.MF
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dev/cosbench-ecs/src/.ecsmeta/.dirmeta
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dev/cosbench-ecs/src/com/.ecsmeta/.dirmeta
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dev/cosbench-ecs/src/com/emc/.ecsmeta/.dirmeta
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dev/cosbench-ecs/src/com/emc/vipr/.ecsmeta/.dirmeta
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dev/cosbench-ecs/src/com/emc/vipr/cosbench/.ecsmeta/.dirmeta
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/.dirmeta
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSConstants.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSStorage.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dev/cosbench-ecs/src/com/emc/vipr/cosbench/ECSStor/.ecsmeta/ECSStorageFactory.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion dev/cosbench-gcs/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-http/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-httpauth/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-keystone/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-librados/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: .,
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-log/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/cosbench-log4j/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion dev/cosbench-mock/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
19 changes: 9 additions & 10 deletions dev/cosbench-openio/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<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="lib" path="gson-2.5.jar"/>
<classpathentry kind="lib" path="openio-api-0.3.2-SNAPSHOT.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<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="lib" path="gson-2.5.jar"/>
<classpathentry kind="lib" path="openio-api-0.3.2-SNAPSHOT.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
2 changes: 1 addition & 1 deletion dev/cosbench-openio/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading