Rename all com.contiautomotive to org.genivi

diff --git a/common/Makefile.am b/common/Makefile.am
index 64f1fef..ce37f16 100644 (file)
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -77,20 +77,20 @@ $(la_handler_built_sources): la-handler-dbus.xml Makefile
 
 $(nsm_consumer_built_sources): nsm-consumer-dbus.xml Makefile
        $(AM_V_GEN) $(GDBUS_CODEGEN)                                    \
-           --interface-prefix com.contiautomotive.NodeStateManager     \
+           --interface-prefix org.genivi.NodeStateManager              \
            --c-namespace ""                                            \
            --generate-c-code nsm-consumer-dbus                         \
            --annotate                                                  \
-             com.contiautomotive.NodeStateManager.Consumer             \
+             org.genivi.NodeStateManager.Consumer                      \
              org.gtk.GDBus.C.Name NSM_Consumer $<
 
 $(nsm_lifecycle_control_built_sources): nsm-lifecycle-control-dbus.xml Makefile
        $(AM_V_GEN) $(GDBUS_CODEGEN)                                    \
-           --interface-prefix com.contiautomotive.NodeStateManager     \
+           --interface-prefix org.genivi.NodeStateManager              \
            --c-namespace ""                                            \
            --generate-c-code nsm-lifecycle-control-dbus                \
            --annotate                                                  \
-             com.contiautomotive.NodeStateManager.LifecycleControl     \
+             org.genivi.NodeStateManager.LifecycleControl              \
              org.gtk.GDBus.C.Name NSM_Lifecycle_Control $<
 
 $(shutdown_consumer_built_sources): shutdown-consumer-dbus.xml Makefile
@@ -99,5 +99,5 @@ $(shutdown_consumer_built_sources): shutdown-consumer-dbus.xml Makefile
            --c-namespace ""                                            \
            --generate-c-code shutdown-consumer-dbus                    \
            --annotate                                                  \
-             com.contiautomotive.NodeStateManager.LifeCycleConsumer    \
+             org.genivi.NodeStateManager.LifeCycleConsumer             \
              org.gtk.GDBus.C.Name Shutdown_Consumer $<

diff --git a/common/nsm-consumer-dbus.xml b/common/nsm-consumer-dbus.xml
index dd459f2..a2e242c 100644 (file)
--- a/common/nsm-consumer-dbus.xml
+++ b/common/nsm-consumer-dbus.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node>
   <!--
-    com.contiautomotive.NodeStateManager.Consumer:
+    org.genivi.NodeStateManager.Consumer:
     @short_description: Interface for testing the interaction between the
                         Node Startup Controller and the Node State Manager.
                         It is an excerpt of
-                        "com.contiautomotive.NodeStateManager.LifecycleControl"
+                        "org.genivi.NodeStateManager.LifecycleControl"
                         using only the methods needed to test the NSC.
   -->
-  <interface name="com.contiautomotive.NodeStateManager.Consumer">
+  <interface name="org.genivi.NodeStateManager.Consumer">
     <!--
       RegisterShutdownClient:
       @BusName: Bus name of remote application.

diff --git a/common/nsm-lifecycle-control-dbus.xml b/common/nsm-lifecycle-control-dbus.xml
index 9a85ffc..160c78a 100644 (file)
--- a/common/nsm-lifecycle-control-dbus.xml
+++ b/common/nsm-lifecycle-control-dbus.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node>
   <!--
-    com.contiautomotive.NodeStateManager.LifecycleControl:
+    org.genivi.NodeStateManager.LifecycleControl:
     @short_description: Interface for testing the interaction between the
                         Node Startup Controller and the Node State Manager.
                         It is an excerpt of
-                        "com.conti.NodeStateManager.LifecycleControl"
+                        "org.genivi.NodeStateManager.LifecycleControl"
                         using only the methods needed to test the NSC.
   -->
-  <interface name="com.contiautomotive.NodeStateManager.LifecycleControl">
+  <interface name="org.genivi.NodeStateManager.LifecycleControl">
     <!--
       SetNodeState:
       @NodeStateId: The passed value will be based upon the enum

diff --git a/common/shutdown-consumer-dbus.xml b/common/shutdown-consumer-dbus.xml
index ae41676..8b9e2c1 100644 (file)
--- a/common/shutdown-consumer-dbus.xml
+++ b/common/shutdown-consumer-dbus.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node>
   <!--
-    com.contiautomotive.NodeStateManager.LifeCycleConsumer:
+    org.genivi.NodeStateManager.LifeCycleConsumer:
     @short_description: Interface for receiving LifecycleRequest commands from the NSM
 
     Lifecycle Consumers are D-Bus object which are created to shut down apps
@@ -9,7 +9,7 @@
     with the Node State Manager (NSM) instead of the apps and respond to any 
     LifecycleRequest() in the app's place.
   -->
-  <interface name="com.contiautomotive.NodeStateManager.LifeCycleConsumer">
+  <interface name="org.genivi.NodeStateManager.LifeCycleConsumer">
     <!--
       Shutdown:
       @Request: The code for this request, either normal, fast or runup.

diff --git a/docs/reference/node-startup-controller/test-nsm-dummy.xml b/docs/reference/node-startup-controller/test-nsm-dummy.xml
index 322a050..90a94e8 100644 (file)
--- a/docs/reference/node-startup-controller/test-nsm-dummy.xml
+++ b/docs/reference/node-startup-controller/test-nsm-dummy.xml
@@ -33,14 +33,14 @@
     </para>
     <itemizedlist>
       <listitem>
-        <literal>com.contiautomotive.NodeStateManager.LifecycleControl.CheckLucRequired</literal>
+        <literal>org.genivi.NodeStateManager.LifecycleControl.CheckLucRequired</literal>
         will alternate between returning <literal>TRUE</literal> and
         <literal>FALSE</literal> with every call. This way it is possible to test how the
         Node Startup Controller behaves with and without starting the LUC simply by
         starting it twice.
       </listitem>
       <listitem>
-        <literal>com.contiautomotive.NodeStateManager.LifecycleControl.SetNodeState</literal>
+        <literal>org.genivi.NodeStateManager.LifecycleControl.SetNodeState</literal>
         will alternate between accepting the state and not accepting the state with
         every call. This way it is possible to test how the Node Startup Controller
         handles both scenarios.

diff --git a/node-startup-controller/la-handler-service.c b/node-startup-controller/la-handler-service.c
index 06b9569..97a79b1 100644 (file)
--- a/node-startup-controller/la-handler-service.c
+++ b/node-startup-controller/la-handler-service.c
@@ -212,8 +212,8 @@ la_handler_service_constructed (GObject *object)
   /* connect to the node state manager */
   service->nsm_consumer =
     nsm_consumer_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE,
-                                         "com.contiautomotive.NodeStateManager",
-                                         "/com/contiautomotive/NodeStateManager/Consumer",
+                                         "org.genivi.NodeStateManager",
+                                         "/org/genivi/NodeStateManager/Consumer",
                                           NULL, &error);
   if (error != NULL)
     {

diff --git a/node-startup-controller/luc-starter.c b/node-startup-controller/luc-starter.c
index 8032dc7..c52a22c 100644 (file)
--- a/node-startup-controller/luc-starter.c
+++ b/node-startup-controller/luc-starter.c
@@ -222,8 +222,8 @@ luc_starter_constructed (GObject *object)
   starter->nsm_lifecycle_control =
     nsm_lifecycle_control_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
                                                   G_DBUS_PROXY_FLAGS_NONE,
-                                                  "com.contiautomotive.NodeStateManager",
-                                                  "/com/contiautomotive/NodeStateManager/LifecycleControl",
+                                                  "org.genivi.NodeStateManager",
+                                                  "/org/genivi/NodeStateManager/LifecycleControl",
                                                   NULL, &error);
   if (error != NULL)
     {

diff --git a/node-startup-controller/target-startup-monitor.c b/node-startup-controller/target-startup-monitor.c
index dd93873..8dd74ab 100644 (file)
--- a/node-startup-controller/target-startup-monitor.c
+++ b/node-startup-controller/target-startup-monitor.c
@@ -164,8 +164,8 @@ target_startup_monitor_init (TargetStartupMonitor *monitor)
   monitor->nsm_lifecycle_control =
     nsm_lifecycle_control_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
                                                   G_DBUS_PROXY_FLAGS_NONE,
-                                                  "com.contiautomotive.NodeStateManager",
-                                                  "/com/contiautomotive/NodeStateManager/LifecycleControl",
+                                                  "org.genivi.NodeStateManager",
+                                                  "/org/genivi/NodeStateManager/LifecycleControl",
                                                   NULL, &error);
   if (error != NULL)
     {

diff --git a/nsm-dummy/Makefile.am b/nsm-dummy/Makefile.am
index 2fee15a..d502c64 100644 (file)
--- a/nsm-dummy/Makefile.am
+++ b/nsm-dummy/Makefile.am
@@ -51,8 +51,8 @@ nsm_dummy_LDADD =                                                     \
 dbus_servicedir = $(datadir)/dbus-1/system-services
 
 dbus_service_in_files =                                                        \
-       com.contiautomotive.NodeStateManager.Consumer.service.in        \
-       com.contiautomotive.NodeStateManager.LifecycleControl.service.in
+       org.genivi.NodeStateManager.Consumer.service.in \
+       org.genivi.NodeStateManager.LifecycleControl.service.in
 
 dbus_service_DATA = $(dbus_service_in_files:.service.in=.service)
 

diff --git a/nsm-dummy/busconf/Makefile.am b/nsm-dummy/busconf/Makefile.am
index aa05965..58bc0d1 100644 (file)
--- a/nsm-dummy/busconf/Makefile.am
+++ b/nsm-dummy/busconf/Makefile.am
@@ -3,7 +3,7 @@
 nsm_dummy_confdir = $(sysconfdir)/dbus-1/system.d
 
 nsm_dummy_conf_DATA =                                                  \
-       com.contiautomotive.NodeStateManager.conf
+       org.genivi.NodeStateManager.conf
 
 EXTRA_DIST =                                                           \
        $(nsm_dummy_conf_DATA)

diff --git a/nsm-dummy/busconf/com.contiautomotive.NodeStateManager.conf b/nsm-dummy/busconf/org.genivi.NodeStateManager.conf
similarity index 51%
rename from nsm-dummy/busconf/com.contiautomotive.NodeStateManager.conf
rename to nsm-dummy/busconf/org.genivi.NodeStateManager.conf
index 240a0a0..349a9cb 100644 (file)
--- a/nsm-dummy/busconf/com.contiautomotive.NodeStateManager.conf
+++ b/nsm-dummy/busconf/org.genivi.NodeStateManager.conf
@@ -2,8 +2,8 @@
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
   <policy user="root">
-    <allow own="com.contiautomotive.NodeStateManager"/>
-    <allow send_destination="com.contiautomotive.NodeStateManager" />
-    <allow receive_sender="com.contiautomotive.NodeStateManager" />
+    <allow own="org.genivi.NodeStateManager"/>
+    <allow send_destination="org.genivi.NodeStateManager" />
+    <allow receive_sender="org.genivi.NodeStateManager" />
   </policy>
 </busconfig>

diff --git a/nsm-dummy/nsm-consumer-service.c b/nsm-dummy/nsm-consumer-service.c
index 0cae168..431bffa 100644 (file)
--- a/nsm-dummy/nsm-consumer-service.c
+++ b/nsm-dummy/nsm-consumer-service.c
@@ -779,7 +779,7 @@ nsm_consumer_service_start (NSMConsumerService *service,
   /* announce the Consumer service on the bus */
   return g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (service->interface),
                                            service->connection,
-                                           "/com/contiautomotive/NodeStateManager/Consumer",
+                                           "/org/genivi/NodeStateManager/Consumer",
                                            error);
 }
 

diff --git a/nsm-dummy/nsm-dummy-application.c b/nsm-dummy/nsm-dummy-application.c
index 41847c1..fbb11db 100644 (file)
--- a/nsm-dummy/nsm-dummy-application.c
+++ b/nsm-dummy/nsm-dummy-application.c
@@ -231,7 +231,7 @@ nsm_dummy_application_constructed (GObject *object)
   /* get a bus name on the given connection */
   application->bus_name_id =
     g_bus_own_name_on_connection (application->connection,
-                                  "com.contiautomotive.NodeStateManager",
+                                  "org.genivi.NodeStateManager",
                                   G_BUS_NAME_OWNER_FLAGS_NONE,
                                   nsm_dummy_application_bus_name_acquired,
                                   nsm_dummy_application_bus_name_lost, NULL, NULL);

diff --git a/nsm-dummy/nsm-dummy.service.in b/nsm-dummy/nsm-dummy.service.in
index f328f49..e454ba0 100644 (file)
--- a/nsm-dummy/nsm-dummy.service.in
+++ b/nsm-dummy/nsm-dummy.service.in
@@ -1,5 +1,5 @@
 [Service]
 Type = dbus
-BusName = com.contiautomotive.NodeStateManager
+BusName = org.genivi.NodeStateManager
 ExecStart = @libdir@/node-startup-controller-@NODE_STARTUP_CONTROLLER_VERSION_API@/nsm-dummy
 WatchdogSec = 5

diff --git a/nsm-dummy/nsm-lifecycle-control-service.c b/nsm-dummy/nsm-lifecycle-control-service.c
index 0b30778..04fac09 100644 (file)
--- a/nsm-dummy/nsm-lifecycle-control-service.c
+++ b/nsm-dummy/nsm-lifecycle-control-service.c
@@ -272,6 +272,6 @@ nsm_lifecycle_control_service_start (NSMLifecycleControlService *service,
   /* announce the LifecycleControl service on the bus */
   return g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (service->interface),
                                            service->connection,
-                                           "/com/contiautomotive/NodeStateManager/LifecycleControl",
+                                           "/org/genivi/NodeStateManager/LifecycleControl",
                                            error);
 }

diff --git a/nsm-dummy/com.contiautomotive.NodeStateManager.Consumer.service.in b/nsm-dummy/org.genivi.NodeStateManager.Consumer.service.in
similarity index 76%
rename from nsm-dummy/com.contiautomotive.NodeStateManager.Consumer.service.in
rename to nsm-dummy/org.genivi.NodeStateManager.Consumer.service.in
index def8ad1..42ee17d 100644 (file)
--- a/nsm-dummy/com.contiautomotive.NodeStateManager.Consumer.service.in
+++ b/nsm-dummy/org.genivi.NodeStateManager.Consumer.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
-Name=com.contiautomotive.NodeStateManager
+Name=org.genivi.NodeStateManager
 SystemdService = nsm-dummy.service
 Exec=@libdir@/node-startup-controller-@NODE_STARTUP_CONTROLLER_VERSION_API@/nsm-dummy

diff --git a/nsm-dummy/com.contiautomotive.NodeStateManager.LifecycleControl.service.in b/nsm-dummy/org.genivi.NodeStateManager.LifecycleControl.service.in
similarity index 76%
rename from nsm-dummy/com.contiautomotive.NodeStateManager.LifecycleControl.service.in
rename to nsm-dummy/org.genivi.NodeStateManager.LifecycleControl.service.in
index def8ad1..42ee17d 100644 (file)
--- a/nsm-dummy/com.contiautomotive.NodeStateManager.LifecycleControl.service.in
+++ b/nsm-dummy/org.genivi.NodeStateManager.LifecycleControl.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
-Name=com.contiautomotive.NodeStateManager
+Name=org.genivi.NodeStateManager
 SystemdService = nsm-dummy.service
 Exec=@libdir@/node-startup-controller-@NODE_STARTUP_CONTROLLER_VERSION_API@/nsm-dummy