Updated documentation to reflect changes. Pegged build deps on v0.2 of dependant repos in rebar.config. Removed unsupported option from setup_rvi_node.sh screen

Signed-off-by: Magnus <mfeuer@jaguarlandrover.com>

6 files changed, 243 insertions, 188 deletions

diff --git a/BUILD.md b/BUILD.md
index 4617707..1444edc 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -3,6 +3,8 @@ Copyright (C) 2014, Jaguar Land Rover
 This document is licensed under Creative Commons
 Attribution-ShareAlike 4.0 International.
 
+**Version 0.2**
+
 # BUILD INSTRUCTIONS FOR RVI #
 
 This document describes the build process for the RVI project on an
@@ -102,3 +104,4 @@ The compiled code is available under ```ebin/``` and ```deps/*/ebin```.
 
 See ```CONFIGURE.md``` for details on configuring and creating a
 developer and production release that can be launched.
+
diff --git a/CONFIGURE.md b/CONFIGURE.md
index 2e52c47..0e97ed5 100644
--- a/CONFIGURE.md
+++ b/CONFIGURE.md
@@ -3,6 +3,8 @@ Copyright (C) 2014, Jaguar Land Rover
 This document is licensed under Creative Commons
 Attribution-ShareAlike 4.0 International.
 
+**Version 0.2**
+
 # CONFIGURING AN RVI NODE 
 
 This document describes the process of configuring an RVI node so that it
@@ -22,7 +24,7 @@ The reader is assumed to be able to:
 
 1. Erlang runtime R16B01 or later has to be installed on the hosting system.
 2. The ```setup_rvi_node.sh``` tool is available to build a release.
-3. (Recommended) ```priv/vehicle.config``` is used as a starting point for a customized setup.
+3. ```rvi_sample.config``` is used as a starting point for a customized setup.
 Root access is not needed.
 
 
@@ -62,15 +64,15 @@ and generate a development or production release.
 
 <b>6. Start the release</b><br>
 The ```rvi_node.sh``` is executed to launch the built development
-release.
+release. ```$REL_HOME/rvi/bin/rvi start``` is used to launch the
+production release.
 
 
 ## CONFIGURATION FILE LOCATION AND FORMATS
 
 There is a single configuration file, with the setup for all
-components and modules in the node, used for each release. All files
-are stored in the ```priv``` directory. A documented example file is
-provided as ```rvi_sample.config```
+components and modules in the node, used for each release. 
+A documented example file is provided as ```rvi_sample.config```
 
 The configuration file consists of an array of erlang tuples (records
 / structs / entries), where the ```env``` tuple contains configuration data for
@@ -82,18 +84,17 @@ The term tuple and entry will be intermixed throughout this document.
 
 
 # SPECIFY NODE SERVICE PREFIX #
-
-All RVI nodes with locally connected services will announce these
-toward other, external RCI as a part of the service discovery
-mechanism. When announcing its local services to external RVI nodes, a
-node will prefix each service with a static string that is system-wide
-unique.
+All RVI nodes hosting locally connected services will announce these
+services toward other, external RVI nodes as a part of the service
+discovery mechanism. When announcing its local services to external
+RVI nodes, a node will prefix each service with a static string that
+is system-wide unique.
 
 When a service sends traffic to another service, the local RVI node
 will prefix match the name of the destination service against the
 service prefix of all known nodes in the system. The node with the
 longest matching prefix will receive the traffic in order to have it
-forwarded to the targeted service that is connected to it.
+forwarded to the targeted service that is connected to it. 
 
 The prefix always starts with an organisational ID that identifies the
 entity that manages the service. Best practises is to use the domain
@@ -147,6 +148,10 @@ networks, this will be the MSISDN of the node's mobile subscription.
 Any traffic directed to the given address should be forwarded to the 
 Data Link component.
 
+If the node lives behind a firewall, or should for some reason not
+accept incoming connections from other nodes, the node external address
+should be set to ```"0.0.0.0:0"```. 
+
 The configuration element to set under the ```rvi``` tuple is 
 ```node_address```. 
 
@@ -159,7 +164,7 @@ An example tuple is given below:
     ...
     { rvi, [
       ...
-      <b>{ node_address, "92.52.72.132:9850" }</b>
+      <b>{ node_address, "92.52.72.132:8817 }</b>
     ]}
   ]}
 ] 
@@ -169,7 +174,7 @@ An example tuple is given below:
  network addresses.*
 
 In the default Data Link component, ```data_link_bert_rpc```, you also
-need to specify the port it should listen to, and possibly also the
+need to specify the port it should listen to, and optionally also the
 interface to use.
 
 This is done by editing the tuple ```rvi -> data_link ->
@@ -191,7 +196,7 @@ An example tuple is given below:
         { data_link, [ 
          ...
          { bert_rpc_server, [ 
-            <b>{ port, 9850 },
+            <b>{ port, 8817 },
             { ip, "192.168.11.234"}</b>
           ]}
         ]}
@@ -241,8 +246,8 @@ An example entry is gven below:
     { rvi, [
       ...
       <b>{ static_nodes, [
-        { "jaguarlandrover.com/sota/", "92.52.72.132:9850" },
-        { "jaguarlandrover.com/remote_diagnostic/", "92.52.72.132:9851" }
+        { "jaguarlandrover.com/sota/", "92.52.72.132:8817" },
+        { "jaguarlandrover.com/remote_diagnostic/", "92.52.72.132:8818" }
       ]}</b>
     ]}
   ]}
@@ -252,14 +257,6 @@ An example entry is gven below:
 *Please note that IP addresses, not DNS names, should be used in all
  network addresses.*
 
-**Please note that all nodes configured in ```static_nodes``` must be
-up and running, listening on their specified addresses, before the
-node with the ```static_nodes``` configuration entry comes up.  All
-static nodes are connected to during the startup sequence, and if one
-or more are not available, the startup sequence will fail. This will
-be fixed in future versions.**
-
-
 # SPECIFY SERVICE EDGE URL #
 
 The Service Edge URL is that which will be used by locally connected
@@ -350,17 +347,12 @@ external node address chapter:
 *Please note that IP addresses, not DNS names, should be used in all
  network addresses.*
 
-
-# RUNNING MULTIPLE NODES ON A HOST
-
-Multiple RVI nodes can be run simultaneously on a single host as long
-as their configured URLs and ports do not intefere with each other. 
-The data link external
-
-In the example below a second URL/port setup is shown, using port
-range 9011-9017, that can co-exist with the setup listed in the
-examples in the previous chapters.
-
+# SETTING UP WEBSOCKET SUPPORT ON A NODE
+The service edge can, optionally, turn on its websocket support in order to
+support locally connected services written in javascript. This allows an RVI node
+to host services running in a browser, on node.js or similar web environments.
+Websocket support is enabled by adding a ```websocket``` entry to the configuration data
+of ```servide_edge```. Below is the previous configuration example with such a setup.
 
 <pre>
 [
@@ -372,38 +364,17 @@ examples in the previous chapters.
       { components, [
         ...
         <b>{ service_edge, [ 
-          { url, "http://127.0.0.1:9011" },
-          { exo_http_opts, [ { port, 9011 } ]}
-        ]},
-        { service_discovery, [ 
-          { url, "http://127.0.0.1:9012" },
-          { exo_http_opts, [ { port, 9012 } ] }
-        ]},
-        { schedule, [
-          { url, "http://127.0.0.1:9013" },
-          { exo_http_opts, [ { port, 9013 } ] }
-        ]},
-        { authorize, [
-          { url, "http://127.0.0.1:9014" },
-          { exo_http_opts, [ { port, 9014 } ] }
-        ]},
-        { protocol, [ 
-          { url, "http://127.0.0.1:9015" },
-          { exo_http_opts, [ { port, 9015 } ] }
+          { websocket, [ { port, 8818}]},
+          { url, "http://127.0.0.1:8811" },
+          { exo_http_opts, [ { port, 8811 } ]}
         ]},
-        { data_link, [ 
-          { url, "http://127.0.0.1:9016" },
-          { exo_http_opts, [ { port, 9016 } ] },
-          { bert_rpc_server, [ {port, 9017 } ] } 
-        ]}</b>
-      ]}
-    ]}
-  ]}
-]
+...
 </pre>
 
-*Please note that IP addresses, not DNS names, should be used in all
- network addresses.*
+Websocket clients can now connect to:
+```ws://1.2.3.4:8818/websession``` and issue JSON-RPC commands to
+Service Edge. (Replace ```1.2.3.4``` with the IP address of the
+host).
 
 
 # COMPILING THE RVI SOURCE CODE
@@ -412,8 +383,9 @@ Before a development release can be built, the source code needs to be compiled.
 Please see BUILDING.md for details on this process.
 
 
-# CREATING THE DEVELOPMENT RELEASE
-*Please note that a new release must be created each time the configuration file has been updated*
+# CREATING A DEVELOPMENT RELEASE
+*Please note that a new release must be created each time the
+ configuration file has been updated*
 
 Once a configuration file has been completed, a development release is
 created.
@@ -424,22 +396,22 @@ tree to operate, while a production release is completely self
 contained (including the erlang runtime system) in its own
 subdirectory.
 
-
 Each release will have a name, which will also be the name of the
 newly created subdirectory containing the files necessary to start the
 release.
 
 If a configuration file, ```test.config``` is to be used when building
-release ```test_release```, the following command can be run from the build root:
+release ```test_rel```, the following command can be run from the
+build root:
 
-    ./script/setup_rvi_node.sh test_rel test.config
+    ./script/setup_rvi_node.sh -d -n test_rel -c test.config
 
 Once executed (and no errors were found in test.config), a
 subdirectory called ```test_rel``` has been created. This directory
 contains the erlang configuration and boot files necessary to bring up
 the RVI node.
 
-# STARTING THE DEVELOPMENT RELEASE
+# STARTING A DEVELOPMENT RELEASE
 
 The newly built development release is started using the
 ```rvi_node.sh``` tool.
@@ -458,9 +430,84 @@ inspection of the running system.
 Once the RVI node has been brought up, services can connect to its
 Service Edge and start routing traffic.
 
-# FAULT SEARCHING
 
-## TRAFFIC TARGETED FOR A SERVICE ON ANOHTER NODE IS NEVER FORWARDED
-TBD. Check that static node's service prefix matches that of the destination service.
+
+# CREATING A PRODUCTION RELEASE
+*Please note that a new release must be created each time the
+ configuration file has been updated*
+
+To create a self contained production release using ```prod.config```
+as the configuration file, and name the release ```prod_rel```, the
+following command can be run from the build root:
+
+    ./script/setup_rvi_node.sh -n prod_rel -c prod.config
+
+Once executed (and no errors were found in test.config), a
+subdirectory called ```rel/prod_rel``` has been created. 
+
+The ```prod_rel``` directory contains a complete erlang runtime
+system, the RVI application, and the configuration data generated from
+```prod.config``` the RVI node.
+
+The ```prod_rel``` directory can be moved to anywhere in the file
+system, or to another host with the same architecture and OS setup.
+
+
+# STARTING A PRODUCTION RELEASE
+
+The newly built product release is started using the
+```rel/prod_rel/rvi``` tool:
+
+    ./rel/prod_rel/rvi start
+	
+Stopping is done in a similar manner:
+
+    ./rel/prod_rel/rvi stop
+	
+
+To check if a node is up, retrieve its process ID with:
+
+    ./rel/prod_rel/rvi getpid
+	
+
+To attach to the console of a started node in order to inspect it run:
+
+    ./rel/prod_rel/rvi attach
+
+
+*Note that you need to exit from the console with Ctrl-d. Pressing
+Ctrl-c will bring down the node itself.* 
+
+# Loggings
+
+
+To get debug output on a console, start a development release, or attach to a
+production release, and set the log level manually:
+
+    1> lager:set_loglevel(lager_console_backend, debug)
+	
+Replace debug with info, notice, warning, or error for different log
+levels. A production release will also produce logs to
+```rel/[release]/log/erlang.log.?```.
+
+Check the file modification date to find which of the log files are currently written to.
+
+You can configure the log level through the lager configuration entry:
+
+<pre>
+ {env,
+  [
+   {lager, 
+   [ { handlers, 
+      [ {lager_console_backend, debug} ]
+      }
+   ]}
+   ...
+</pre>
+
+Additional handlers can also be added for different log destinations. 
+
+See Basho's lager documentation at [github](https://github.com/basho/lager) for details
+on logging.
 
 ## MORE
diff --git a/README.md b/README.md
index 0dbd11b..ae13fb9 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Copyright (C) 2014, Jaguar Land Rover
 This document is licensed under Creative Commons
 Attribution-ShareAlike 4.0 International.
 
-# REMOTE VEHICLE INTERACTION (RVI) #
+# REMOTE VEHICLE INTERACTION (RVI) 0.2 #
 
 This document gives a brief introduction to the codebase of the RVI
 project and explains the reasoning behind some of the technical
@@ -201,9 +201,10 @@ Only three external modules (lager, bert and exo) are used by the
 code, with two more (setup and edown) used for release and
 documentation management.
 
-The purpose is to make the code comprehensible and minimize the time a
-developer has to travesrse through obscure libraries trying to understand
-what a specific call flow actually does.
+The reason for minimizing external module usage is to make the code
+comprehensible and minimize the time a developer has to travesrse
+through obscure libraries trying to understand what a specific call
+flow actually does.
 
 The entire reference implementation (as of the first alpa release) is
 2800 lines of code, broken down into six standalone modules and one
diff --git a/hvac_demo/README.md b/hvac_demo/README.md
index a1b8ac7..a2a49af 100644
--- a/hvac_demo/README.md
+++ b/hvac_demo/README.md
@@ -3,7 +3,8 @@ Copyright (C) 2014, Jaguar Land Rover
 This document is licensed under Creative Commons
 Attribution-ShareAlike 4.0 International.
 
-# HVAC DEMO
+
+# HVAC DEMO - VERSION 0.2
 This document describes the purpose, setup, and launch of the HVAC
 demo that is the first milestone of the RVI project.
 
@@ -25,16 +26,10 @@ The reader is assumed to be able to:
 
 
 # PREREQUISITES
-1. Erlang runtime R16B01 or later has to be installed on the hosting
-system.
-
-2. The RVI system has been checked out from
-[gerrit](https://gerrit.automotivelinux.org/gerrit/#/admin/projects/RVI/rvi).
+1. Erlang runtime R16B01 or later has to be installed on the hosting system.
 
-3. The RVI system has been built. See
-[build instructions](../BUILD.md) for details.
+2. Git is installe don the hosting system.
 
-*Please do not execute the configuration instructions in [CONFIGURE.md](../CONFIGURE.md)*
 
 # DEMO COMPONENTS
 
@@ -51,86 +46,6 @@ Please see schematics below for an overview:
 *Figure 1. Demo schematics. See HVAC and mobile device emulator chapters for details*
 
 
-## HVAC EMULATOR TECHNICAL DETAILS
-The HVAC emulator simulates an HVAC application unit installed in a
-vehicle.
-
-The emulator connects to the Service Edge of the vehicle RVI node,
-started with "rvi_node -n vehicle" and registers two services with it:
-
-* ```jlr.com/vin/[vin]/hvac/subscribe```<br>
-  Used by the mobile emulator to subscribe to updates entered on the
-  HVAC emulator's command line.
-
-* ```jlr.com/vin/[vin]/hvac/publish```<br>
-   Used by the mobile emulator to report updated values entered on 
-   its command line
-
-In both cases, ```jlr.com/vin/[vin]``` is the vehicle RVI node's service
-prefix specified in
-```vehicle.configure```->```env```->```rvi```->```node_service_prefix```.
-
-
-The mobile emulator invokes the subscribe service above in order
-to receive new HVAC values published by the HVAC emulator.
-  
-When a new key/value pair is entered on the HVAC emulator's command line,
-The mobile emulator services registered through an /hvac/subscribe
-message will be invoked with the key, value, and VIN number
-of the HVAC's RVI node. The receiving mobile emulators will
-print out the information.
-
-If a new key/value pair is entered on a mobile emulator's command
-line, they will be sent to the HVAC emulator's /hvac/publish service, 
-which will print them on screen.
-
-
-## MOBILE DEVICE EMULATOR TECHNICAL DETAILS
-
-The mobile device emulator connects to Service Edge of the backend
-  server, started with "./rvi_node -n backend", and subscribes to
-  HVAC updates (temp, fan speed, etc) updates from the vehicle with a
-  given VIN. 
-
-At startup, the mobile emulator will do two things:
- 
-1. Register a service with the backend RVI node<br>
-   This service is invoked by the HVAC emulator to transmit 
-   key/value pairs entered on its commandd line.
-
-   The service name has the following layout:
-
-       ```jlr.com/backend/mobile/[phone_nr]/hvac/publish```
- 
-   The ```jlr.com/backend``` prefix is the backend RVI node's service prefix specified in
-   ```backend.configure```->```env```->```rvi```->```node_service_prefix```.
-
-   The ```[phone_nr]``` is the phone number specified on the command
-   line when the mobile emulator is started.
-
-2. Send a suscription request to the HVAC emulator<br>
-   The HVAC emulator's subscription service is invoked as
- 
-      ```jlr.com/vin/[vin]/hvac/subscribe```
-
-   where ```[vin]``` is the command-line specified VIN of the 
-   vehicle RVI node to connect to.
-   The subscription request's single parameter is the full name of
-   the publish service registered in step 1.  When the HVAC
-   emulator has a key/value pair entered at its command line, the
-   key/value/vin will be sent to the publish service on the mobile
-   emulator.
-    
-
-   When a new key/value pair is entered on the mobile emulator's
-   command line, simulating screen input on the HVAC app, the
-   key/value pair will be sent to:
-
-      ```jlr.com/vin/[vin]/hvac/publish```
-
-   The HVAC emulator will receive the published key/value pair and
-   print it on screen.
-
 
 # DEMO SETUP
 Two RVI nodes, both hosted by a single machine, will be involved in
@@ -140,16 +55,28 @@ The backend RVI node will the mobile emulator
 (mobile\_emulator.py). The vehicle RVI node will host the HVAC
 emulator (hvac\_emulator.py).
 
-## SWITCH TO V0.1 OF THE RVI SYSTEM ##
+See [build instructions](../BUILD.md) for details on the prerequisites
+for building and running the demo.
+
+
+## CHECK OUT THE RVI SYSTEM ##
+
+    git clone https://gerrit.automotivelinux.org/gerrit/RVI/rvi
+
+
+## SWITCH TO V0.2 OF THE RVI SYSTEM ##
 The cloned gerrit repo contains all tags and branches.
-Switch to tag v0.1 to get a release that does not contain
+Switch to tag v0.2 to get a release that does not contain
 daily snapshots.
 
-    git checkout v0.1
+    cd rvi
+    git checkout v0.2
 
 
 ## COMPILE THE RVI SYSTEM
-See ../BUILD.md for details.
+
+    make
+
 
 ## CREATE THE VEHICLE DEVELOPMENT RELEASE
 
@@ -157,7 +84,7 @@ See ../BUILD.md for details.
 
 From the rvi root directory, setup the vehicle node:
 
-    ./setup_rvi_node.sh vehicle hvac_demo/vehicle.config
+    ./scripts/setup_rvi_node.sh -d -n vehicle -c hvac_demo/vehicle.config
 
 The new developer release will be created in a subdiretory named
 ```vehicle```
@@ -166,7 +93,7 @@ The new developer release will be created in a subdiretory named
 ## CREATE THE BACKEND DEVELOPMENT RELEASE
 In a similar manner, setup the backend node:
 
-    ./setup_rvi_node.sh backend hvac_demo/backend.config
+    ./scripts/setup_rvi_node.sh -d -n backend -c hvac_demo/backend.config
 
 
 The release will be created in a subdiretory named ```backend```
@@ -178,7 +105,7 @@ The release will be created in a subdiretory named ```backend```
 In its own window, launch the backend rvi node that the subscription
 service and mobile device emulator will connect to.
 
-	./rvi_node.sh -n backend
+	./scripts/rvi_node.sh -n backend
 	
 Make a note of the Service Edge URL address printed out by the logging service.
 
@@ -189,7 +116,7 @@ Make a note of the Service Edge URL address printed out by the logging service.
 
 In its own window, launch the vehicle RVI node that will serve the HVAC emulator.
 
-	./rvi_node.sh -n vehicle
+	./scripts/rvi_node.sh -n vehicle
 
 The VIN number that will be used by the mobile device are the digits
 at the end of the "Node Service Prefix" printed out at the end of the
@@ -267,3 +194,86 @@ Terminate the subscription service by pressing Ctrl-c.
 Terminate the vehicle RVI node by pressing Ctrl-c Ctrl-c.
 
 Terminate the backend RVI node by pressing Ctrl-c Ctrl-c.
+
+
+
+## HVAC EMULATOR TECHNICAL DETAILS
+The HVAC emulator simulates an HVAC application unit installed in a
+vehicle.
+
+The emulator connects to the Service Edge of the vehicle RVI node,
+started with "rvi_node -n vehicle" and registers two services with it:
+
+* ```jlr.com/vin/[vin]/hvac/subscribe```<br>
+  Used by the mobile emulator to subscribe to updates entered on the
+  HVAC emulator's command line.
+
+* ```jlr.com/vin/[vin]/hvac/publish```<br>
+   Used by the mobile emulator to report updated values entered on 
+   its command line
+
+In both cases, ```jlr.com/vin/[vin]``` is the vehicle RVI node's service
+prefix specified in
+```vehicle.configure```->```env```->```rvi```->```node_service_prefix```.
+
+
+The mobile emulator invokes the subscribe service above in order
+to receive new HVAC values published by the HVAC emulator.
+  
+When a new key/value pair is entered on the HVAC emulator's command line,
+The mobile emulator services registered through an /hvac/subscribe
+message will be invoked with the key, value, and VIN number
+of the HVAC's RVI node. The receiving mobile emulators will
+print out the information.
+
+If a new key/value pair is entered on a mobile emulator's command
+line, they will be sent to the HVAC emulator's /hvac/publish service, 
+which will print them on screen.
+
+
+## MOBILE DEVICE EMULATOR TECHNICAL DETAILS
+
+The mobile device emulator connects to Service Edge of the backend
+  server, started with "./rvi_node -n backend", and subscribes to
+  HVAC updates (temp, fan speed, etc) updates from the vehicle with a
+  given VIN. 
+
+At startup, the mobile emulator will do two things:
+ 
+1. Register a service with the backend RVI node<br>
+   This service is invoked by the HVAC emulator to transmit 
+   key/value pairs entered on its commandd line.
+
+   The service name has the following layout:
+
+       ```jlr.com/backend/mobile/[phone_nr]/hvac/publish```
+ 
+   The ```jlr.com/backend``` prefix is the backend RVI node's service prefix specified in
+   ```backend.configure```->```env```->```rvi```->```node_service_prefix```.
+
+   The ```[phone_nr]``` is the phone number specified on the command
+   line when the mobile emulator is started.
+
+2. Send a suscription request to the HVAC emulator<br>
+   The HVAC emulator's subscription service is invoked as
+ 
+      ```jlr.com/vin/[vin]/hvac/subscribe```
+
+   where ```[vin]``` is the command-line specified VIN of the 
+   vehicle RVI node to connect to.
+   The subscription request's single parameter is the full name of
+   the publish service registered in step 1.  When the HVAC
+   emulator has a key/value pair entered at its command line, the
+   key/value/vin will be sent to the publish service on the mobile
+   emulator.
+    
+
+   When a new key/value pair is entered on the mobile emulator's
+   command line, simulating screen input on the HVAC app, the
+   key/value pair will be sent to:
+
+      ```jlr.com/vin/[vin]/hvac/publish```
+
+   The HVAC emulator will receive the published key/value pair and
+   print it on screen.
+
diff --git a/rebar.config b/rebar.config
index c49fb80..beb4dee 100644
--- a/rebar.config
+++ b/rebar.config
@@ -9,10 +9,10 @@
 {deps,
  [
 %%  {setup, ".*", {git, "https://github.com/uwiger/setup.git", "HEAD"}},
-  {protocol, ".*", {git, "https://gerrit.automotivelinux.org/gerrit/RVI/protocol", "master"}},
-  {data_link_bert_rpc, ".*", {git, "https://gerrit.automotivelinux.org/gerrit/RVI/data_link_bert_rpc", "master"}},  
-  {authorize, ".*", {git, "https://gerrit.automotivelinux.org/gerrit/RVI/authorize", "master"}},
-  {schedule, ".*", {git, "https://gerrit.automotivelinux.org/gerrit/RVI/schedule", "master"}},
-  {service_edge, ".*", {git, "https://gerrit.automotivelinux.org/gerrit/RVI/service_edge", "master"}},
-  {service_discovery, ".*", {git, "https://gerrit.automotivelinux.org/gerrit/RVI/service_discovery", "master"}}
+  {protocol, ".*", {git, "https://gerrit.automotivelinux.org/gerrit/RVI/protocol", "v0.2"}},
+  {data_link_bert_rpc, ".*", {git, "https://gerrit.automotivelinux.org/gerrit/RVI/data_link_bert_rpc", "v0.2"}},  
+  {authorize, ".*", {git, "https://gerrit.automotivelinux.org/gerrit/RVI/authorize", "v0.2"}},
+  {schedule, ".*", {git, "https://gerrit.automotivelinux.org/gerrit/RVI/schedule", "v0.2"}},
+  {service_edge, ".*", {git, "https://gerrit.automotivelinux.org/gerrit/RVI/service_edge", "v0.2"}},
+  {service_discovery, ".*", {git, "https://gerrit.automotivelinux.org/gerrit/RVI/service_discovery", "v0.2"}}
  ]}.
diff --git a/scripts/setup_rvi_node.sh b/scripts/setup_rvi_node.sh
index ba7c421..c8dd02e 100755
--- a/scripts/setup_rvi_node.sh
+++ b/scripts/setup_rvi_node.sh
@@ -36,9 +36,6 @@ usage() {
     echo 
     echo "  -d               Create a development release. See below."
     echo 
-    echo "  -r [rpm-file]    Pack up the release in an RPM file with the"
-    echo "                   given name."  
-    echo 
     echo "The generated node will be created in a subdirectory with the same"
     echo "name as the node name."
     echo 
@@ -78,9 +75,6 @@ while getopts "dn:c:" o; do
             build_type=dev
             ;;
 
-        r)
-            build_type=rpm
-            ;;
         *)
             usage
             ;;
@@ -101,7 +95,7 @@ export ERL_LIBS=$PWD/deps:$ERL_LIBS:$PWD
 echo  "Setting up node $NODE_NAME."
 $SETUP_GEN $NODE_NAME $CONFIG_NAME $NODE_NAME
 
-if [ "${build_type}" = "dev" -o  "${build_type}" = "rpm" ]
+if [ "${build_type}" = "dev" ]
 then
     echo "RVI Node $NODE_NAME has been setup."
     echo "Launch with $SELF_DIR/rvi_node.sh -n $NODE_NAME"