Rename all com.contiautomotive to org.genivi

9 files changed, 12 insertions, 12 deletions

diff --git a/nsm-dummy/Makefile.am b/nsm-dummy/Makefile.am
index 2fee15a..d502c64 100644
--- 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
--- 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
index 240a0a0..349a9cb 100644
--- 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
--- 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
--- 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
--- 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
--- 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
index def8ad1..42ee17d 100644
--- 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
index def8ad1..42ee17d 100644
--- 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