rvi renamed rvi_core. MErged with release-next

11 files changed, 14 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 7ae9814..5cc44bf 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ rpmclean:
 
 # Create a SOURCES tarball for RPM
 rpm_tarball: rpmclean clean
-	tar czf /tmp/rvi-$(VERSION).tgz BUILD.md CONFIGURE.md doc \
+	tar czf /tmp/rvi_core-$(VERSION).tgz BUILD.md CONFIGURE.md doc \
 		LICENSE Makefile README.md rebar rebar.config rel \
 		RELEASE.md rpm scripts/setup_gen scripts/rvi \
 		scripts/rvi.service scripts/rvi_node.sh  components \
diff --git a/backend.config b/backend.config
index 317d894..77cf90e 100644
--- a/backend.config
+++ b/backend.config
@@ -28,7 +28,6 @@
    compiler,
    ssl,
    asn1,
-   wse,
    %% RVI-specific apps.
 
    %% Do not touch unless you are replacing apps with your own
@@ -41,7 +40,7 @@
    %% with
    %%     { schedule, load },
    %%
-   rvi, 
+   rvi_core, 
    rvi_common,
    service_discovery,
    service_edge,
diff --git a/components/authorize/src/authorize_keys.erl b/components/authorize/src/authorize_keys.erl
index 61dd2ab..a4e7473 100644
--- a/components/authorize/src/authorize_keys.erl
+++ b/components/authorize/src/authorize_keys.erl
@@ -302,7 +302,7 @@ match_dest_(_, _) ->
     false.
 
 get_env(K) ->
-    case application:get_env(rvi, K) of
+    case application:get_env(rvi_core, K) of
 	{ok, V} ->
 	    V;
 	_ ->
diff --git a/components/dlink_tcp/src/dlink_tcp_rpc.erl b/components/dlink_tcp/src/dlink_tcp_rpc.erl
index ab191f5..3bf863c 100644
--- a/components/dlink_tcp/src/dlink_tcp_rpc.erl
+++ b/components/dlink_tcp/src/dlink_tcp_rpc.erl
@@ -110,7 +110,7 @@ start_connection_manager() ->
     case listener:add_listener(Pid, IP, Port, CompSpec) of
 	ok ->
 	    ?notice("---- RVI Node External Address: ~s", 
-		    [ application:get_env(rvi, node_address, undefined)]);
+		    [ application:get_env(rvi_core, node_address, undefined)]);
 
 	Err -> 	
 	    ?error("dlink_tcp:init_rvi_component(): Failed to launch listener: ~p", [ Err ]),
diff --git a/components/rvi_common/src/rvi_common.erl b/components/rvi_common/src/rvi_common.erl
index 70a8a85..130bddb 100644
--- a/components/rvi_common/src/rvi_common.erl
+++ b/components/rvi_common/src/rvi_common.erl
@@ -400,7 +400,7 @@ remote_service_to_string(Type, Service) ->
 
 local_service_prefix() ->
     Prefix = 
-	case application:get_env(rvi, ?NODE_SERVICE_PREFIX) of
+	case application:get_env(rvi_core, ?NODE_SERVICE_PREFIX) of
 	    {ok, P} when is_atom(P) -> atom_to_list(P);
 	    {ok, P} when is_list(P) -> P;
 	    undefined -> 
@@ -418,7 +418,7 @@ local_service_prefix() ->
 
 
 node_address_string() ->
-    case application:get_env(rvi, ?NODE_ADDRESS) of
+    case application:get_env(rvi_core, ?NODE_ADDRESS) of
 	{ok, P} when is_atom(P) -> atom_to_list(P);
 	{ok, P} when is_list(P) -> P;
 	undefined -> 
@@ -449,7 +449,7 @@ get_component_config_(Component, Default, CompList) ->
     end.
 
 get_component_specification() ->
-    case application:get_env(rvi, components, undefined) of
+    case application:get_env(rvi_core, components, undefined) of
 	undefined -> 
 	    #component_spec { 
 	       service_edge = ?COMP_SPEC_SERVICE_EDGE_DEFAULT,
diff --git a/components/schedule/src/rvi_routing.erl b/components/schedule/src/rvi_routing.erl
index d5bf645..a27fb49 100644
--- a/components/schedule/src/rvi_routing.erl
+++ b/components/schedule/src/rvi_routing.erl
@@ -73,7 +73,7 @@ start_link() ->
 %%--------------------------------------------------------------------
 
 init([]) ->
-    {ok, Routes } = application:get_env(rvi, ?ROUTING_RULES),
+    {ok, Routes } = application:get_env(rvi_core, ?ROUTING_RULES),
 
     {ok, #st {
 	    routes = Routes
diff --git a/packaging/tizen.config b/packaging/tizen.config
index 8fd7198..743139d 100644
--- a/packaging/tizen.config
+++ b/packaging/tizen.config
@@ -40,7 +40,7 @@
    %% with
    %%     { schedule, load },
    %%
-   rvi, 
+   rvi_core, 
    rvi_common,
    service_discovery,
    service_edge,
diff --git a/priv/config/rvi_common.config b/priv/config/rvi_common.config
index ad60c89..f76252a 100644
--- a/priv/config/rvi_common.config
+++ b/priv/config/rvi_common.config
@@ -25,8 +25,6 @@ Out = filename:absname(proplists:get_value(outdir, OPTIONS)).
    compiler,
    ssl,
    asn1,
-   wse,
-   bt,
    %% RVI-specific apps.
 
    %% Do not touch unless you are replacing apps with your own
@@ -39,7 +37,7 @@ Out = filename:absname(proplists:get_value(outdir, OPTIONS)).
    %% with
    %%     { schedule, load },
    %%
-   rvi, 
+   rvi_core, 
    rvi_common,
    service_discovery,
    service_edge,
diff --git a/rvi_backend.config b/rvi_backend.config
index 7b8d3d6..fab77cd 100644
--- a/rvi_backend.config
+++ b/rvi_backend.config
@@ -43,10 +43,10 @@ LogLevel = Env("RVI_LOGLEVEL", notice).
     ]
    },
       
-   {rvi, 
+   {rvi_core, 
     [
      { node_address, IPPort(MyIP, Port+7) }, 
-     { node_service_prefix, "jaguarlandrover.com/cloud/"},
+     { node_service_prefix, "jlr.com/backend/"},
 
 
      { routing_rules,
diff --git a/scripts/setup_rvi_node.sh b/scripts/setup_rvi_node.sh
index 8dbd290..e49a2bc 100755
--- a/scripts/setup_rvi_node.sh
+++ b/scripts/setup_rvi_node.sh
@@ -110,7 +110,7 @@ else
     cp $NODE_NAME/sys.config rel/files/sys.config
     ./rebar generate 
     # Rename the release after the node name
-    mv rel/rvi rel/$NODE_NAME
+    mv rel/rvi_core rel/$NODE_NAME
     echo "Stand alone release for $NODE_NAME created under project "
     echo "root directory's ./rel/$NODE_NAME."
     echo
diff --git a/src/rvi.app.src b/src/rvi_core.app.src
index 2ba8088..ee85629 100644
--- a/src/rvi.app.src
+++ b/src/rvi_core.app.src
@@ -8,7 +8,7 @@
 
 
 %% -*- erlang -*-
-{application, rvi,
+{application, rvi_core,
  [
   {description, ""},
   {vsn, "0.4.0"},