Merge branch 'master' into spring-boot

README.md

@@ -6,10 +6,19 @@ This project ports the SNIA CDMI-Server reference implementation to a Spring Boo
 
 * JDK 1.8+
 * [Maven 3+](https://maven.apache.org/)
+* cdmi-spi-\<VERSION\>.jar
 
 ## Build & Run & Configure
 
-The project uses maven build automation tool that will build one fat jar Spring Boot application.
+The project uses the Maven build automation tool that will build one fat jar Spring Boot application.
+
+It depends on the cdmi-spi Java SPI [cdmi-spi](https://github.com/indigo-dc/cdmi-spi) library.
+
+You should first install the cdmi-spi-\<VERSION\>.jar into your local Maven repository, e.g.
+
+```
+mvn install:install-file -Dfile=cdmi-spi-0.0.1-SNAPSHOT.jar
+```
 
 ```
 mvn clean package
@@ -27,39 +36,14 @@ To specify the server port use the ```--server.port=PORT``` parameter, default "
 java -jar cdmi-server-0.0.1-SNAPSHOT.jar --server.port=9000
 ```
 
-To specify the data root directory use the ```--cdmi.data.baseDirectory=DIR``` parameter, default "data" (relative to the jar execution).
+To specify the data root directory use the ```--cdmi.data.baseDirectory=DIR``` parameter, default "test" (relative to the jar execution).
 
 ```
 java -jar cdmi-server-0.0.1-SNAPSHOT.jar --cdmi.data.baseDirectory=/cdmi/data
 ```
 
 All configuration for the application can be done either via command line parameters or in the application.properties file.
 
-Configuration for the CDMI capabilities (QoS) is done in capabilities.properties.json
-
-For example to add a new container class insert following into the capabilities.properties.json file and rebuild.
-
-```
-{ ...
-...
-container-capabilities:
-{
-...
-ssd: {
-    cdmi_list_children: true,
-	cdmi_read_metadata: true,
-	cdmi_modify_metadata: true,
-	cdmi_create_dataobject: true,
-	cdmi_post_dataobject: false,
-	cdmi_create_container: true,
-	cdmi_copy_dataobject: true,
-	cdmi_qos_accesslatency: 10, 
-    cdmi_qos_durability: 95, 
-    cdmi_qos_price: 3
-},
-...
-```
-
 It is recommended to run the application behind a https proxy with e.g. apache,nginx ...
 
 ## Tests