Modified some name

Change-Id: Ica16f6be4e040c5f43b87f431afe2b12a9ea0dd2
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>

diff --git a/README.md b/README.md
index de68df845d0fd6b47ee5da816100c4041e1e178f..bb53025760747583e2b247cdd0950371f1e343b8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-# nm_daemon
+# inm-daemon

diff --git a/include/inm-daemon-log.h b/include/inm-daemon-log.h
index 7744dbfe8c617e19ac070c55ba2625a02c15298b..d21e2c02e5d55109e7a47aa256aa1a1ff2b2db41 100644 (file)
--- a/include/inm-daemon-log.h
+++ b/include/inm-daemon-log.h
@@ -20,7 +20,7 @@
 /**
  * This file declares macros for logging.
  *
- * @file        nm-daemon-log.h
+ * @file        inm-daemon-log.h
  * @author      Jiung Yu (jiung.yu@samsung.com)
  * @version     0.1
  */

diff --git a/include/inm-daemon.h b/include/inm-daemon.h
index 8577c76bb8731eeb0f1989e8dedbc7afc7d45b49..2171f1af41037faa54111e88cd1bc4805cfd7a28 100644 (file)
--- a/include/inm-daemon.h
+++ b/include/inm-daemon.h
@@ -20,7 +20,7 @@
 /**
  * This file defines macros and declares funcitons for Network Monitoring Daemon.
  *
- * @file        nm-daemon.h
+ * @file        inm-daemon.h
  * @author      Jiung Yu (jiung.yu@samsung.com)
  * @version     0.1
  */

diff --git a/include/inm-gdbus.h b/include/inm-gdbus.h
index de395835863fdba8ceaa3be20dc2e714c368983c..6ff22934f60aeac3844745dcc3b22fb9469a8ad0 100644 (file)
--- a/include/inm-gdbus.h
+++ b/include/inm-gdbus.h
@@ -43,8 +43,8 @@ extern "C" {
 #define DBUS_SIGNAL_PROPERTY_CHANGED   "PropertyChanged"
 #define DBUS_SIGNAL_PROPERTIES_CHANGED "PropertiesChanged"
 
-#define NM_DAEMON_SERVICE "net.nm_damon"
-#define NM_DAEMON_OBJ "/net.nm_damon"
+#define NM_DAEMON_SERVICE "net.nm_daemon"
+#define NM_DAEMON_OBJ "/net.nm_daemon"
 
 #define NM_WIFI_SERVICE NM_DAEMON_SERVICE ".wifi"
 #define NM_WIFI_IFACE NM_DAEMON_SERVICE ".wifi"

diff --git a/packaging/dbus-inm-manager.conf b/packaging/dbus-inm-manager.conf
index affd8a84c4a490cccc40ed023e89feea6227b981..b5bb769fb6f6548f2c53ca1f97013767d25c95e4 100644 (file)
--- a/packaging/dbus-inm-manager.conf
+++ b/packaging/dbus-inm-manager.conf
@@ -2,14 +2,14 @@
        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
        <policy user="network_fw">
-               <allow own="net.nm_damon"/>
-               <allow send_destination="net.nm_damon"/>
-               <allow receive_sender="net.nm_damon"/>
+               <allow own="net.nm_daemon"/>
+               <allow send_destination="net.nm_daemon"/>
+               <allow receive_sender="net.nm_daemon"/>
        </policy>
        <policy user="root">
-               <allow own="net.nm_damon"/>
-               <allow send_destination="net.nm_damon"/>
-               <allow receive_sender="net.nm_damon"/>
+               <allow own="net.nm_daemon"/>
+               <allow send_destination="net.nm_daemon"/>
+               <allow receive_sender="net.nm_daemon"/>
        </policy>
        <policy context="default">
        </policy>

diff --git a/packaging/inm-manager.service b/packaging/inm-manager.service
index f4aa5895acb1a35f8d4be616698f0af9033e02e5..dc7e0e89715cf4976b0b9bced6e46f27f7934031 100644 (file)
--- a/packaging/inm-manager.service
+++ b/packaging/inm-manager.service
@@ -5,9 +5,9 @@ After=dbus.socket
 
 [Service]
 Type=dbus
-BusName=net.nm_damon
+BusName=net.nm_daemon
 SmackProcessLabel=System
-ExecStart=/usr/bin/nm-daemon
+ExecStart=/usr/bin/inm-daemon
 User=root
 Group=root
 

diff --git a/packaging/inm-manager.spec b/packaging/inm-manager.spec
index 66f9c54ecd7b3b82d4b6d518b9ab8e9d9490b7e1..da13a086fad8eaadb1ba54517e05630a176fb809 100755 (executable)
--- a/packaging/inm-manager.spec
+++ b/packaging/inm-manager.spec
@@ -6,7 +6,7 @@ Group:      Network & Connectivity/Other
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    dbus-%{name}.conf
-Source2:    net.inm_manager.service
+Source2:    net.inm-manager.service
 Source3:       %{name}.service
 
 BuildRequires:  cmake
@@ -64,7 +64,7 @@ rm -rf %{buildroot}
 %make_install
 
 mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/
-cp net.inm_manager.service %{buildroot}%{_datadir}/dbus-1/system-services/
+cp net.inm-manager.service %{buildroot}%{_datadir}/dbus-1/system-services/
 
 #DBus DAC (net-config.manifest enables DBus SMACK)
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
@@ -98,7 +98,7 @@ cp resources/usr/lib/udev/rules.d/99-wifiusb-dev.rules %{buildroot}%{_libdir}/ud
 
 #DBus DAC
 %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/inm-manager.conf
-%attr(644,root,root) %{_datadir}/dbus-1/system-services/net.inm_manager.service
+%attr(644,root,root) %{_datadir}/dbus-1/system-services/net.inm-manager.service
 %attr(644,root,root) %{_libdir}/systemd/system/*
 %if "%{?_lib}" == "lib64"
 %attr(644,root,root) %{_unitdir}/inm-manager.service

diff --git a/packaging/net.inm-manager.service b/packaging/net.inm-manager.service
new file mode 100644 (file)
index 0000000..56e79c7
--- /dev/null
+++ b/packaging/net.inm-manager.service
@@ -0,0 +1,7 @@
+[D-BUS Service]
+Name=net.nm_daemon
+
+Exec=/bin/false
+User=root
+Group=root
+SystemdService=inm-daemon.service

diff --git a/packaging/net.inm_manager.service b/packaging/net.inm_manager.service
deleted file mode 100644 (file)
index 04834c4..0000000
--- a/packaging/net.inm_manager.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[D-BUS Service]
-Name=net.nm_damon
-
-Exec=/bin/false
-User=root
-Group=root
-SystemdService=nm-daemon.service

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5ea96df1184c00d0710a8914f4eb966a1cad3528..10f54a52f853de4b52b0b3459485d2891baef6ef 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,7 +16,7 @@
 #
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(nm-daemon C)
+PROJECT(inm-daemon C)
 SET(PACKAGE ${PROJECT_NAME})
 
 INCLUDE(FindPkgConfig)

diff --git a/src/inm-daemon-main.c b/src/inm-daemon-main.c
index 5532facd547c6aa9b426471ae638917707031811..e524f5c0cf33d38382b1b1d0e1aebd633bbdaf66 100644 (file)
--- a/src/inm-daemon-main.c
+++ b/src/inm-daemon-main.c
@@ -20,7 +20,7 @@
 /**
  * This file implements Network Monitoring Daemon Main function.
  *
- * @file        nm-daemon-main.c
+ * @file        inm-daemon-main.c
  * @author      Jiung Yu (jiung.yu@samsung.com)
  * @version     0.1
  */

diff --git a/src/inm-daemon.c b/src/inm-daemon.c
index 4c1c731bdf52d5076604e048249e9e98a2b2558b..f34a27591a3e8ffb68aa967a90ceadcb65ee8475 100644 (file)
--- a/src/inm-daemon.c
+++ b/src/inm-daemon.c
@@ -20,7 +20,7 @@
 /**
  * This file implements Network Monitoring Daemon functions.
  *
- * @file        nm-daemon.c
+ * @file        inm-daemon.c
  * @author      Jiung Yu (jiung.yu@samsung.com)
  * @version     0.1
  */

diff --git a/src/inm-gdbus.c b/src/inm-gdbus.c
index 5d3ddb9dc913952d73988eeb5495abad6a57d36a..446bb936b4775c608b882fdb9cc07d618e438fe2 100644 (file)
--- a/src/inm-gdbus.c
+++ b/src/inm-gdbus.c
@@ -124,7 +124,7 @@ typedef enum {
 
 static const gchar nm_daemon_introspection_xml[] = {
                "<node>"
-               "<interface name='net.nm_damon'>"
+               "<interface name='net.nm_daemon'>"
                "<method name='GetStatistics'>"
                "<arg type='i' name='connection_type' direction='in'/>"
                "<arg type='i' name='statistics_type' direction='in'/>"
@@ -167,7 +167,7 @@ static const gchar nm_daemon_introspection_xml[] = {
 
 static const gchar nm_wifi_introspection_xml[] = {
        "<node>"
-               "<interface name='net.nm_damon.wifi'>"
+               "<interface name='net.nm_daemon.wifi'>"
                        "<method name='GetConnectedAp'>"
                                "<arg type='a{sv}' name='ap' direction='out'/>"
                        "</method>"
@@ -186,7 +186,7 @@ static const gchar nm_wifi_introspection_xml[] = {
 
 static const gchar nm_conn_introspection_xml[] = {
        "<node>"
-               "<interface name='net.nm_damon.conn'>"
+               "<interface name='net.nm_daemon.conn'>"
                        "<method name='GetAll'>"
                        "<arg type='a{sv}' name='connection' direction='out'/>"
                        "</method>"

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index cbc5471f6ef70b08a90a0e523d31be261164d01d..d61be8125a852e47e2c600d580707c10ea315164 100644 (file)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -18,7 +18,7 @@
 LINK_DIRECTORIES(${CMAKE_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
-SET(GTEST_TEST "gtest-nm-daemon")
+SET(GTEST_TEST "gtest-inm-daemon")
 
 IF(BUILD_GTESTS)
        ADD_DEFINITIONS(-DBUILD_GTESTS)