Merge pull request #61 from reTHINK-project/olddevelop

Olddevelop

Author: luistduarte

.gitignore

@@ -1 +1,2 @@
 /target/
+/node_modules/

Dockerfile

@@ -45,6 +45,7 @@ RUN ["mvn", "package"]
 
 #Setup Config
 ADD server-keystore.jks /build/server-keystore.jks
+ADD configuration.xml /build/configuration.xml
 
 #Run msg-node
 EXPOSE 9090

configuration.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+</Configuration>

docs/abstract-hyperty.md

@@ -24,9 +24,11 @@ Collection of Data Objects handled by the Hyperty:
 
 ```
 {
-  <objectURL>: {
-    userUrl: <URL>,
-    type: <reporter|observer>
+  <hypertyUrl>: {
+    <objectURL>: {
+      userUrl: <URL>,
+      type: <reporter|observer>
+      }
   }
 }
 ```

docs/offlineSubscriptionManager/readme.md

@@ -61,13 +61,13 @@ Forward of [Subscribe](https://rethink-project.github.io/specs/messages/data-syn
 
 1- It queries the Data Objects Registry collection for the data object URL to be subscribed (`message.body.body.resource`), and replies with 200 OK where `reply.body.value = message.body.body.value`.
 
-2- Queries the registry about cguid status.
+2- [Queries the runtime registry](https://github.com/reTHINK-project/dev-java-hyperty/blob/master/docs/registry.md#readstatus-from-user) about cguid status.
 
 3- If online it executes the `processPendingSubscription(subscribeMsg)` otherwise it stores it in the pendingSubscriptions collection.
 
 ### status handler
 
-**handler:** <runtime>/status.
+**handler:** <runtime-address> + `/registry` e.g. `runtime://sharing-cities-dsm/registry` .
 
 **message:**
 

docs/readme.md

@@ -3,7 +3,7 @@
 
 | Master                                   |
 | ---------------------------------------- |
-| [![Build Status](https://travis-ci.org/reTHINK-project/dev-java-hyperty.svg?branch=master)](https://travis-ci.org/reTHINK-project/dev-java-hyperty) |
+| [![Build Status](https://travis-ci.org/reTHINK-project/dev-java-hyperty.svg?branch=master)](https://travis-ci.org/reTHINK-project/dev-java-hyperty) | 
 
 
 ## Overview

docs/registry.md

@@ -2,6 +2,8 @@
 
 This runtime feature is responsible to keep track of the status of users (online / offline) using hyperties executed in the Vertx Runtime, based on status events published by Vertx Runtime Protostub.
 
+The registry address is `<runtime-url>\registry` e.g. `runtime://sharing-cities-dsm/registry`
+
 ### Configuration:
 
 * `checkStatusTimer`: frequency in seconds to execute checkStatus process.
@@ -22,7 +24,7 @@ The registry handles the registry data collection:
 ### status handler
 
 
-**handler:** <runtime-address> + `/status`.
+**handler:** <runtime-address> + `/registry` e.g. `runtime://sharing-cities-dsm/registry`.
 
 **message:**
 
@@ -44,12 +46,11 @@ It updates the registry collection with received info including last modified ti
 
 This function is executed by a timer every `config.checkStatusTimer` seconds.
 
-For each entry in the registry collection where `timeNow - lastModified > config.checkStatusTimer` it updates its status to offline, and publishes its new status (ensure this event is not processed by the registry status handler specifiec above).
+For each entry in the registry collection where `timeNow - lastModified > config.checkStatusTimer` it updates its status to offline, and publishes its new status (ensure this event is not processed by the registry status handler specified above).
 
 ### readStatus from User
 
-**handler:** <runtime-address> + `/status`.
-
+**handler:** <runtime-address >+ `/registry` e.g. `runtime://sharing-cities-dsm/registry`.
 **message to receive request of status:**
 
 ```javascript
@@ -78,7 +79,7 @@ body: {
 ### create status entry
 
 
-**handler:** <runtime-address> + `/status`.
+**handler:** <runtime-address> + `/registry` e.g. `runtime://sharing-cities-dsm/registry`.
 
 **message:**
 

docs/wallet-manager/readme.md

@@ -14,6 +14,7 @@ The Wallet Manager hyperty handles Token Wallets on behalf of a user.
 ```
 * `rankingTimer`: num of milliseconds before recalculating user rankings
 
+* `onReadMaxTransactions`: max of transactions to be returned on wallet read request
 
 For each public wallet, a new device and a new sensor is created at the Smart IoT Stub as specified [here](../smart-iot-protostub)
 
@@ -110,7 +111,7 @@ type: create,
 body: { resource: 'wallet/<wallet-address>', value: <transaction JSON Object>}
 ```
 
-If valid, the transaction is stored and the balance updated.
+If valid, the transaction is stored and the balance, bonus credit as well as associated Account are updated.
 
 The transaction is published in the event bus sending a [Wallet update message](https://rethink-project.github.io/specs/messages/wallet-messages/).
 
@@ -126,7 +127,7 @@ If a `wallet2bGranted` exists, a new transfer is performed to it.
 type: read,
 ```
 
-Returns the stored Wallet value.
+Returns the stored Wallet JSON. Number of transactions returned per request is limited to `onReadMaxTransactions`.
 
 ### Wallet delete requests