Update docs

Author: jason-fox

context-provider/routes/proxy-ld.js

@@ -128,22 +128,19 @@ router.get('/weather/weatherConditions/ngsi-ld/v1/entities/:id', weatherDefaults
 
 // Convenience endpoints for tweets readings
 
-
-
 router.get('/catfacts/tweets/ngsi-ld/v1/entities/', tweetDefaults, (req, res, next) => {
-    req.params.id = req.query.id || '12345'
+    req.params.id = req.query.id || '12345';
     CatFactsNGSIProxy.getAsNgsiLD(req, res, next, true);
-}); 
+});
 router.get('/random/tweets/ngsi-ld/v1/entities/', tweetDefaults, (req, res, next) => {
-    req.params.id = req.query.id || '12345'
+    req.params.id = req.query.id || '12345';
     RandomNGSIProxy.getAsNgsiLD(req, res, next, true);
-}); 
+});
 router.get('/static/tweets/ngsi-ld/v1/entities/', tweetDefaults, (req, res, next) => {
-    req.params.id = req.query.id || '12345'
+    req.params.id = req.query.id || '12345';
     StaticNGSIProxy.getAsNgsiLD(req, res, next, true);
 });
 
-
 router.get('/random/tweets/ngsi-ld/v1/entities/:id', tweetDefaults, RandomNGSIProxy.getAsNgsiLD);
 
 router.get('/static/tweets/ngsi-ld/v1/entities/:id', tweetDefaults, StaticNGSIProxy.getAsNgsiLD);
@@ -152,11 +149,6 @@ router.get('/twitter/tweets/ngsi-ld/v1/entities/:id', tweetDefaults, TwitterNGSI
 
 router.get('/catfacts/tweets/ngsi-ld/v1/entities/:id', tweetDefaults, CatFactsNGSIProxy.getAsNgsiLD);
 
-
-
-
-
-
 // Not Supported Endpoints
 
 router.all('/:proxy/:attributes/ngsi-ld/v1/entities', notSupported);

docker/README.md

@@ -19,7 +19,7 @@ in debug mode add `DEBUG=tutorial:*`
 -   `NGSI_LD_PREFIX=` - Whether to use full URNs for devices
 -   `SECURE_ENDPOINTS=true` - Enable Keyrock as PDP - default is `false`
 
-## Dummy Ultralight Devices
+## Dummy JSON Devices
 
 -   `IOTA_HTTP_HOST=iot-agent` - The URL of the IoT Agent
 -   `IOTA_HTTP_PORT=7896` - Port used by the dummy IoT devices to commuicate with the IoT Agent

docs/administrating-xacml.md

@@ -105,7 +105,7 @@ This application demonstrates the administration of level 3 Advanced Authorizati
 Management and Sensors-based application created in [previous tutorials](xacml-access-rules.md) and secures access to
 the context broker behind a [PEP Proxy](https://github.com/FIWARE/tutorials.PEP-Proxy/). It will make use of five FIWARE
 components - the [Orion Context Broker](https://fiware-orion.readthedocs.io/en/latest/),the
-[IoT Agent for UltraLight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/), the
+[IoT Agent for JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/), the
 [Keyrock](https://fiware-idm.readthedocs.io/en/latest/) Identity Manager, the
 [Wilma](https://fiware-pep-proxy.readthedocs.io/en/latest/) PEP Proxy and the
 [Authzforce](https://authzforce-ce-fiware.readthedocs.io) XACML Server. All access control decisions will be delegated
@@ -119,10 +119,10 @@ Therefore, the overall architecture will consist of the following elements:
 
 -   The FIWARE [Orion Context Broker](https://fiware-orion.readthedocs.io/en/latest/) which will receive requests using
     [NGSI-v2](https://fiware.github.io/specifications/OpenAPI/ngsiv2).
--   The FIWARE [IoT Agent for UltraLight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/) which will receive
+-   The FIWARE [IoT Agent for JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/) which will receive
     southbound requests using [NGSI-v2](https://fiware.github.io/specifications/OpenAPI/ngsiv2) and convert them to
-    [UltraLight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual)
-    commands for the devices.
+    [JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual) commands
+    for the devices.
 -   FIWARE [Keyrock](https://fiware-idm.readthedocs.io/en/latest/) offer a complement Identity Management System
     including:
     -   An OAuth2 authentication system for Applications and Users.
@@ -145,8 +145,8 @@ Therefore, the overall architecture will consist of the following elements:
     -   Allows authorized users into restricted areas, it also delegates authorization decisions to the **Authzforce**
         PDP.
 -   A webserver acting as set of [dummy IoT devices](iot-sensors.md) using the
-    [UltraLight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual)
-    protocol running over HTTP - access to certain resources is restricted.
+    [JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual) protocol
+    running over HTTP - access to certain resources is restricted.
 
 Since all interactions between the services are initiated by HTTP requests, the services can be containerized and run
 from exposed ports.

docs/application-mashups.md

@@ -72,7 +72,7 @@ JavaScript). The aim is to create an equivalent application without resorting to
 The Users in **Wirecloud** have been created using the standard [identity management](identity-management.md) component,
 **Keyrock**. Overall the system makes use of four FIWARE components - the
 [Orion Context Broker](https://fiware-orion.readthedocs.io/en/latest/),the
-[IoT Agent for UltraLight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/), the
+[IoT Agent for JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/), the
 [Keyrock](https://fiware-idm.readthedocs.io/en/latest/) Identity Manager and the newly integrated
 [Wirecloud](https://wirecloud.readthedocs.io/en/stable/) application mashup tool. Usage of the Orion Context Broker is
 sufficient for an application to qualify as _“Powered by FIWARE”_.
@@ -81,10 +81,10 @@ Therefore, the overall architecture will consist of the following elements:
 
 -   The FIWARE [Orion Context Broker](https://fiware-orion.readthedocs.io/en/latest/) which will receive requests using
     [NGSI-v2](https://fiware.github.io/specifications/OpenAPI/ngsiv2).
--   The FIWARE [IoT Agent for UltraLight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/) which will receive
+-   The FIWARE [IoT Agent for JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/) which will receive
     southbound requests using [NGSI-v2](https://fiware.github.io/specifications/OpenAPI/ngsiv2) and convert them to
-    [UltraLight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual)
-    commands for the devices.
+    [JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual) commands
+    for the devices.
 -   The FIWARE [Keyrock](https://fiware-idm.readthedocs.io/en/latest/) Identity Management System:
     -   Used by both the **Stock Management System** and **Wirecloud**.
 -   FIWARE [Wirecloud](https://wirecloud.readthedocs.io/en/stable/) an application mashup tool for displaying NGSI
@@ -105,8 +105,8 @@ Therefore, the overall architecture will consist of the following elements:
     -   Shows which products can be bought at each store.
     -   Allows users to "buy" products and reduce the stock count.
 -   A webserver acting as set of [dummy IoT devices](iot-sensors.md) using the
-    [UltraLight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual)
-    protocol running over HTTP - access to certain resources is restricted.
+    [JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual) protocol
+    running over HTTP - access to certain resources is restricted.
 -   Three additional microservices are used by **Wirecloud**:
     -   [Memcache](https://memcached.org), a general-purpose distributed memory caching system.
     -   [ElasticSearch](https://www.elastic.co/products/elasticsearch), a full-text search engine.

docs/big-data-flink.md

@@ -53,7 +53,7 @@ which is processing a continuous stream of context-data events.
 This application builds on the components and dummy IoT devices created in
 [previous tutorials](https://github.com/FIWARE/tutorials.IoT-Agent/). It will make use of three FIWARE components - the
 [Orion Context Broker](https://fiware-orion.readthedocs.io/en/latest/), the
-[IoT Agent for Ultralight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/), and the
+[IoT Agent for JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/), and the
 [Cosmos Orion Flink Connector](https://fiware-cosmos-flink.readthedocs.io/en/latest/) for connecting Orion to an
 [Apache Flink cluster](https://ci.apache.org/projects/flink/flink-docs-stable/concepts/runtime.html). The Flink cluster
 itself will consist of a single **JobManager** _master_ to coordinate execution and a single **TaskManager** _worker_ to
@@ -68,9 +68,9 @@ Therefore the overall architecture will consist of the following elements:
 -   Two **FIWARE Generic Enablers** as independent microservices:
     -   The FIWARE [Orion Context Broker](https://fiware-orion.readthedocs.io/en/latest/) which will receive requests
         using [NGSI-v2](https://fiware.github.io/specifications/OpenAPI/ngsiv2)
-    -   The FIWARE [IoT Agent for Ultralight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/) which will
-        receive northbound measurements from the dummy IoT devices in
-        [Ultralight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual)
+    -   The FIWARE [IoT Agent for JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/) which will receive
+        northbound measurements from the dummy IoT devices in
+        [JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual)
         format and convert them to [NGSI-v2](https://fiware.github.io/specifications/OpenAPI/ngsiv2) requests for the
         context broker to alter the state of the context entities
 -   An [Apache Flink cluster](https://ci.apache.org/projects/flink/flink-docs-stable/concepts/runtime.html) consisting
@@ -84,7 +84,7 @@ Therefore the overall architecture will consist of the following elements:
     -   Used by the **IoT Agent** to hold device information such as device URLs and Keys
 -   Three **Context Providers**:
     -   A webserver acting as set of [dummy IoT devices](iot-sensors.md) using the
-        [Ultralight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual)
+        [JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual)
         protocol running over HTTP.
     -   The **Stock Management Frontend** is not used in this tutorial. It does the following:
         -   Display store information and allow users to interact with the dummy IoT devices

docs/big-data-spark.md

@@ -50,7 +50,7 @@ which is processing a continuous stream of context-data events.
 
 This application builds on the components and dummy IoT devices created in [previous tutorials](iot-agent.md). It will
 make use of three FIWARE components - the [Orion Context Broker](https://fiware-orion.readthedocs.io/en/latest/), the
-[IoT Agent for Ultralight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/), and the
+[IoT Agent for JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/), and the
 [Cosmos Orion Spark Connector](https://fiware-cosmos-spark.readthedocs.io/en/latest/) for connecting Orion to an
 [Apache Spark cluster](https://spark.apache.org/docs/latest/cluster-overview.html). The Spark cluster itself will
 consist of a single **Cluster Manager** _master_ to coordinate execution and some **Worker Nodes** _worker_ to execute
@@ -65,9 +65,9 @@ Therefore, the overall architecture will consist of the following elements:
 -   Two **FIWARE Generic Enablers** as independent microservices:
     -   The FIWARE [Orion Context Broker](https://fiware-orion.readthedocs.io/en/latest/) which will receive requests
         using [NGSI](https://fiware.github.io/specifications/OpenAPI/ngsiv2).
-    -   The FIWARE [IoT Agent for Ultralight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/) which will
-        receive northbound measurements from the dummy IoT devices in
-        [Ultralight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual)
+    -   The FIWARE [IoT Agent for JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/) which will receive
+        northbound measurements from the dummy IoT devices in
+        [JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual)
         format and convert them to [NGSI](https://fiware.github.io/specifications/OpenAPI/ngsiv2) requests for the
         context broker to alter the state of the context entities.
 -   An [Apache Spark cluster](https://spark.apache.org/docs/latest/cluster-overview.html) consisting of a single
@@ -81,7 +81,7 @@ Therefore, the overall architecture will consist of the following elements:
     -   Used by the **IoT Agent** to hold device information such as device URLs and Keys.
 -   Three **Context Providers**:
     -   A webserver acting as set of [dummy IoT devices](iot-sensors.md) using the
-        [Ultralight 2.0](https://fiware-iotagent-ul.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual)
+        [JSON](https://fiware-iotagent-json.readthedocs.io/en/latest/usermanual/index.html#user-programmers-manual)
         protocol running over HTTP.
     -   The **Stock Management Frontend** is not used in this tutorial. It does the following:
         -   Display store information and allow users to interact with the dummy IoT devices.

docs/crud-operations.md

@@ -151,9 +151,9 @@ Once an `<entity-id>` is known within the context, individual data entities can
 `/v2/entities/<entity-id>` endpoint.
 
 It is recommended that entity identifiers should be URNs following the
-[NGSI-LD specification](https://cim.etsi.org/NGSI-LD/official/front-page.html),
-therefore each `id` is a URN which follows a standard format: `urn:ngsi-ld:<entity-type>:<entity-id>`. This helps to
-make every `id` in the context data unique.
+[NGSI-LD specification](https://cim.etsi.org/NGSI-LD/official/front-page.html), therefore each `id` is a URN which
+follows a standard format: `urn:ngsi-ld:<entity-type>:<entity-id>`. This helps to make every `id` in the context data
+unique.
 
 | HTTP Verb  |                                               `/v2/entities`                                               |                                              `/v2/entities/<entity-id>`                                              |
 | ---------- | :--------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------: |