Change *epc* to *actd* in file names and paths

Change-Id: I22d308704f640d4f93e5b01f70b058e7d74e441b
Signed-off-by: Maciej Slodczyk <m.slodczyk2@partner.samsung.com>

diff --git a/Makefile.am b/Makefile.am
index 038cd537c22063081bcefcdc529b1b6f6704e0e5..ca36ab2a24daba9e0ba8e0dfd6cf1db2e8d69563 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,11 +7,11 @@ AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
        -DDBDIR=\""$(dbdir)"\" \
-       -DEPC_CUSTOM_CONFIG_FILE=\""${sysconfdir}/epc/epc.conf"\" \
-       -DEPC_CUSTOM_MODULES_CONFIG_PATH=\""${sysconfdir}/epc/modules.conf.d/"\" \
-       -DEPC_DEFAULT_CONFIG_FILE=\""${prefix}/lib/epc/epc.conf"\" \
-       -DEPC_DEFAULT_MODULES_CONFIG_PATH=\""${prefix}/lib/epc/modules.conf.d/"\" \
-       -DEPC_MODULES_PATH=\""${sysconfdir}/epc/enabled-modules"\" \
+       -DEPC_CUSTOM_CONFIG_FILE=\""${sysconfdir}/actd/actd.conf"\" \
+       -DEPC_CUSTOM_MODULES_CONFIG_PATH=\""${sysconfdir}/actd/modules.conf.d/"\" \
+       -DEPC_DEFAULT_CONFIG_FILE=\""${prefix}/lib/actd/actd.conf"\" \
+       -DEPC_DEFAULT_MODULES_CONFIG_PATH=\""${prefix}/lib/actd/modules.conf.d/"\" \
+       -DEPC_MODULES_PATH=\""${sysconfdir}/actd/enabled-modules"\" \
        -I${top_srcdir}/include
 
 if FORCED_REBOOT
@@ -67,19 +67,19 @@ SED_PROCESS = \
        < $< > $@ || rm $@
 
 unitdir = $(prefix)/lib/systemd/system
-configdir = $(prefix)/lib/epc
+configdir = $(prefix)/lib/actd
 modulesconfigdir = $(configdir)/modules.conf.d
-dbdir = $(localstatedir)/db/epc
+dbdir = $(localstatedir)/db/actd
 
 nodist_unit_DATA = \
-    epc.service
+    actd.service
 
 config_DATA = \
-    epc.conf
+    actd.conf
 
-sbin_PROGRAMS = epcd
+sbin_PROGRAMS = actd
 
-epclib_SOURCES = \
+actdlib_SOURCES = \
     src/action/action_executed_handler.c \
     src/action/action_executor.c \
     src/core/action.c \
@@ -99,26 +99,27 @@ epclib_SOURCES = \
     src/util/systemd_dbus.c
 
 if GLIB_MAINLOOP
-epclib_SOURCES += src/core/epc-glib.c
+actdlib_SOURCES += src/core/epc-glib.c
 endif
 
-epcd_SOURCES = \
-    $(epclib_SOURCES) \
+actd_SOURCES = \
+    $(actdlib_SOURCES) \
     src/epc.c
 
 # Add here source files of modules that must have ability to enable/disable during build
 # This variable is parsed by Autoconf
-EXTRA_epcd_SOURCES = \
+EXTRA_actd_SOURCES = \
     src/action/service_restart.c \
     src/action/unit_start.c
 
-epcd_CFLAGS = $(AM_CFLAGS)
-epcd_LDFLAGS = -ldl
+actd_CFLAGS = $(AM_CFLAGS)
+actd_LDFLAGS = -ldl
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = src/epc.pc
+pkgconfig_DATA = src/actd.pc
 
-modulesdir = $(pkglibdir)/available-modules
+# modulesdir = $(pkglibdir)/available-modules
+modulesdir = ${prefix}/lib/actd/available-modules
 modules_LTLIBRARIES = \
                  service_restart_action.la \
                  unit_start_action.la \
@@ -145,10 +146,10 @@ dbus_listener_config_DATA = modules.conf.d/dbus_listener.conf.d/50-default.conf
 dbus_listener_config_DATA += modules.conf.d/dbus_listener.conf.d/99-acceptance-test.conf
 dbus_listener_configdir = $(modulesconfigdir)/dbus_listener.conf.d
 
-epcd_LDADD = $(LIBSYSTEMD_LIBS) $(GLIB_LIBS) $(JSON_C_LIBS)
+actd_LDADD = $(LIBSYSTEMD_LIBS) $(GLIB_LIBS) $(JSON_C_LIBS)
 
-epcdevelincludedir = $(includedir)/epc
-epcdevelinclude_HEADERS = \
+actdevelincludedir = $(includedir)/epc
+actdevelinclude_HEADERS = \
                        include/action.h \
                        include/action_executed_event.h \
                        include/action_executor.h \
@@ -180,8 +181,8 @@ install-data-local:
        $(MKDIR_P) $(DESTDIR)$(dbdir)
        $(MKDIR_P) $(DESTDIR)$(modulesconfigdir)
        $(MKDIR_P) $(DESTDIR)$(pkglibdir)/available-modules
-       $(MKDIR_P) $(DESTDIR)$(sysconfdir)/epc/available-modules
-       $(MKDIR_P) $(DESTDIR)$(sysconfdir)/epc/enabled-modules
+       $(MKDIR_P) $(DESTDIR)$(sysconfdir)/actd/available-modules
+       $(MKDIR_P) $(DESTDIR)$(sysconfdir)/actd/enabled-modules
 
 
 bin_PROGRAMS = activationd_acceptance_checker
@@ -216,7 +217,7 @@ unit_DATA = \
                        tests/activationd-acceptance-test-b-p.service \
                        tests/activationd-acceptance-test-b-n.service
 
-configdir = $(prefix)/lib/epc
+configdir = $(prefix)/lib/actd
 modulesconfigdir = $(configdir)/modules.conf.d
 
 install-data-local:

diff --git a/actd.conf b/actd.conf
new file mode 100644 (file)
index 0000000..2c63c08
--- /dev/null
+++ b/actd.conf
@@ -0,0 +1,2 @@
+{
+}

diff --git a/actd.service.in b/actd.service.in
new file mode 100644 (file)
index 0000000..5ce9c73
--- /dev/null
+++ b/actd.service.in
@@ -0,0 +1,13 @@
+[Unit]
+Description=Service Monitoring
+DefaultDependencies=no
+Before=basic.target
+After=local-fs.target
+ConditionPathExists=!/opt/.factoryreset
+
+[Service]
+ExecStart=@sbindir@/actd
+SmackProcessLabel=System
+
+[Install]
+WantedBy=basic.target

diff --git a/epc.conf b/epc.conf
deleted file mode 100644 (file)
index 2c63c08..0000000
--- a/epc.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}

diff --git a/epc.service.in b/epc.service.in
deleted file mode 100644 (file)
index e2b1ce5..0000000
--- a/epc.service.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Service Monitoring
-DefaultDependencies=no
-Before=basic.target
-After=local-fs.target
-ConditionPathExists=!/opt/.factoryreset
-
-[Service]
-ExecStart=@sbindir@/epcd
-SmackProcessLabel=System
-
-[Install]
-WantedBy=basic.target

diff --git a/packaging/activationd.spec b/packaging/activationd.spec
index 42bcb401e8b91f7dacc50a5016027807fbda7460..b9194f500a728544bb7a1a98d43ec923fe6357f1 100644 (file)
--- a/packaging/activationd.spec
+++ b/packaging/activationd.spec
@@ -98,13 +98,13 @@ make check
 %make_install
 
 mkdir -p %{buildroot}/%{_unitdir}/basic.target.wants
-ln -s epc.service %{buildroot}/%{_unitdir}/basic.target.wants
+ln -s actd.service %{buildroot}/%{_unitdir}/basic.target.wants
 
-ln -s %{_sbindir}/epcd %{buildroot}/%{_sbindir}/epcctl
+ln -s %{_sbindir}/actd %{buildroot}/%{_sbindir}/actdctl
 
-%define moduledir %{_libdir}/epc/available-modules/
-%define moduleconfdir %{_sysconfdir}/epc/available-modules/
-%define enabled_moduledir %{_sysconfdir}/epc/enabled-modules/
+%define moduledir %{_libdir}/actd/available-modules/
+%define moduleconfdir %{_sysconfdir}/actd/available-modules/
+%define enabled_moduledir %{_sysconfdir}/actd/enabled-modules/
 
 mkdir -p %{buildroot}/%{moduledir}
 mkdir -p %{buildroot}/%{moduleconfdir}
@@ -135,13 +135,13 @@ mkdir -p %{buildroot}/%{enabled_moduledir}
 
 %files -n event-processing-activation-dm -f activation-dm-files
 %license COPYING
-%{_prefix}/lib/epc/modules.conf.d/activation_eh.conf.d/activation_eh.conf
+%{_prefix}/lib/actd/modules.conf.d/activation_eh.conf.d/activation_eh.conf
 
 %files -n event-processing-vconf -f vconf-files
-%{_prefix}/lib/epc/modules.conf.d/vconf_listener.conf.d/50-default.conf
+%{_prefix}/lib/actd/modules.conf.d/vconf_listener.conf.d/50-default.conf
 
 %files -n event-processing-dbus -f dbus-files
-%{_prefix}/lib/epc/modules.conf.d/dbus_listener.conf.d/50-default.conf
+%{_prefix}/lib/actd/modules.conf.d/dbus_listener.conf.d/50-default.conf
 
 %files -n activationd-test-services
 %license COPYING
@@ -157,18 +157,18 @@ mkdir -p %{buildroot}/%{enabled_moduledir}
 %{_unitdir}/activationd-acceptance-test-d-n.service
 %{_unitdir}/activationd-acceptance-test-b-p.service
 %{_unitdir}/activationd-acceptance-test-b-n.service
-%{_prefix}/lib/epc/modules.conf.d/vconf_listener.conf.d/99-acceptance-test.conf
-%{_prefix}/lib/epc/modules.conf.d/activation_eh.conf.d/99-acceptance-test.conf
+%{_prefix}/lib/actd/modules.conf.d/vconf_listener.conf.d/99-acceptance-test.conf
+%{_prefix}/lib/actd/modules.conf.d/activation_eh.conf.d/99-acceptance-test.conf
 
 %files -n event-processing-core
 %license COPYING
 %manifest %{name}.manifest
-%{_sbindir}/epcd
-%{_sbindir}/epcctl
-%{_prefix}/lib/epc/epc.conf
-%{_unitdir}/epc.service
-%{_unitdir}/basic.target.wants/epc.service
-%{_prefix}/lib/epc/modules.conf.d
+%{_sbindir}/actd
+%{_sbindir}/actdctl
+%{_prefix}/lib/actd/actd.conf
+%{_unitdir}/actd.service
+%{_unitdir}/basic.target.wants/actd.service
+%{_prefix}/lib/actd/modules.conf.d
 
 %files -n event-processing-extra -f extra-files
 

diff --git a/src/actd.pc.in b/src/actd.pc.in
new file mode 100644 (file)
index 0000000..eb0aa0b
--- /dev/null
+++ b/src/actd.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: epc
+Description: Event processing core - external modules development files
+Version: @VERSION@
+Libs: -L${libdir}
+Libs.private:
+Cflags: -I${includedir}/epc

diff --git a/src/epc.c b/src/epc.c
index 960327d88be7e7e28e47ce955c8f8480eb21d0e3..ed44c00bf89b4fde6970b311627ceafd87019925 100644 (file)
--- a/src/epc.c
+++ b/src/epc.c
@@ -111,7 +111,7 @@ static int parse_argv(int ac, char *av[])
        struct epc_module *module;
        const char *custom_config_file = EPC_CUSTOM_CONFIG_FILE;
 
-       if (strcmp(basename(av[0]), "epcctl") == 0)
+       if (strcmp(basename(av[0]), "actdctl") == 0)
                running_mode = EPC_MODE_CTL;
 
        while ((c = getopt_long(ac, av, "Dc:d:h", options, NULL)) >= 0) {

diff --git a/src/epc.pc.in b/src/epc.pc.in
deleted file mode 100644 (file)
index eb0aa0b..0000000
--- a/src/epc.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: epc
-Description: Event processing core - external modules development files
-Version: @VERSION@
-Libs: -L${libdir}
-Libs.private:
-Cflags: -I${includedir}/epc

diff --git a/tests/activationd_acceptance_test b/tests/activationd_acceptance_test
index 96ad897e422e40181686553d81c5a06e5c364eca..b241f2defcf04d8bc23c6edaac5b5935ace0b82c 100755 (executable)
--- a/tests/activationd_acceptance_test
+++ b/tests/activationd_acceptance_test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-EPCD_PID=-1
+ACTD_PID=-1
 
 stop_services() {
        systemctl stop activationd-acceptance-test-s-p
@@ -14,7 +14,7 @@ stop_services() {
 }
 
 cleanup() {
-       [ $EPCD_PID -ne -1 ] && kill $EPCD_PID > /dev/null 2>&1
+       [ $ACTD_PID -ne -1 ] && kill $ACTD_PID > /dev/null 2>&1
        vconftool unset  file/activationd/acceptance
        exit 0
 }
@@ -31,8 +31,8 @@ vconftool -f set -t bool file/activationd/acceptance_bool_p 0
 vconftool -f set -t bool file/activationd/acceptance_bool_n 0
 
 # assumes there's no epcd service running
-epcd > /dev/null 2>&1 &
-EPCD_PID=$!
+actd > /dev/null 2>&1 &
+ACTD_PID=$!
 sleep 2
 
 echo "Testing vconf:"