Tizen Directory Migration

Change-Id: I4372f3a3fa1c7d126d1b83847bb832c8f54bde2e
Signed-off-by: Younho Park <younho.park@samsung.com>

diff --git a/packaging/service-adaptor.spec b/packaging/service-adaptor.spec
index 18ac63a..cd79f18 100644 (file)
--- a/packaging/service-adaptor.spec
+++ b/packaging/service-adaptor.spec
@@ -24,6 +24,7 @@ BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(cynara-client)
 BuildRequires:  pkgconfig(cynara-session)
 BuildRequires:  pkgconfig(cynara-creds-gdbus)
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description
 Service Adaptor Framework Library/Binary package
@@ -75,9 +76,9 @@ mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/service-adaptor.service
 %install_service multi-user.target.wants service-adaptor.service
 
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE.APLv2 %{buildroot}/usr/share/license/service-adaptor
-cp LICENSE.APLv2 %{buildroot}/usr/share/license/service-adaptor-devel
+mkdir -p %{buildroot}/%{TZ_SYS_RO_SHARE}/license
+cp LICENSE.APLv2 %{buildroot}/%{TZ_SYS_RO_SHARE}/license/service-adaptor
+cp LICENSE.APLv2 %{buildroot}/%{TZ_SYS_RO_SHARE}/license/service-adaptor-devel
 
 %post -n service-adaptor
 /sbin/ldconfig
@@ -95,7 +96,7 @@ cp LICENSE.APLv2 %{buildroot}/usr/share/license/service-adaptor-devel
 %{_unitdir}/multi-user.target.wants/service-adaptor.service
 %{_datadir}/dbus-1/system-services/org.tizen.serviceadaptor.client.service
 %{_sysconfdir}/dbus-1/system.d/org.tizen.serviceadaptor.client.conf
-/usr/share/license/%{name}
+%{TZ_SYS_RO_SHARE}/license/%{name}
 %{_includedir}/*.h
 
 %files -n service-adaptor-devel
@@ -105,4 +106,4 @@ cp LICENSE.APLv2 %{buildroot}/usr/share/license/service-adaptor-devel
 %{_includedir}/*.h
 %{_includedir}/service-adaptor/*.h
 %{_includedir}/service-provider/*.h
-/usr/share/license/%{name}-devel
+%{TZ_SYS_RO_SHARE}/license/%{name}-devel

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 2d8b552..43b94ba 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -62,6 +62,7 @@ pkg_check_modules(main_pkgs REQUIRED
         cynara-client
         cynara-session
         cynara-creds-gdbus
+        libtzplatform-config
 )
 
 FOREACH(flag ${main_pkgs_CFLAGS})

diff --git a/server/inc/dbus/dbus-server.h b/server/inc/dbus/dbus-server.h
index cf1101a..b9b70b1 100644 (file)
--- a/server/inc/dbus/dbus-server.h
+++ b/server/inc/dbus/dbus-server.h
@@ -17,6 +17,8 @@
 #ifndef __DBUS_SERVER_H__
 #define __DBUS_SERVER_H__
 
+#include <tzplatform_config.h>
+
 /**
  * Service Adaptor D-Bus server bus name.
  */
@@ -35,7 +37,7 @@
 /**
  * Service Adaptor Activation start key path
  */
-#define SERVICE_ADAPTOR_START_KEY_PATH         "/opt/share/service-adaptor/.fingerprint"
+#define SERVICE_ADAPTOR_START_KEY_PATH         tzplatform_mkpath(TZ_SYS_SHARE, "/service-adaptor/.fingerprint")
 
 /////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////

diff --git a/server/src/service-adaptor-push.c b/server/src/service-adaptor-push.c
index 22f701c..aa9120f 100644 (file)
--- a/server/src/service-adaptor-push.c
+++ b/server/src/service-adaptor-push.c
@@ -16,6 +16,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <tzplatform_config.h>
 
 #include "service-adaptor.h"
 #include "service-adaptor-push.h"
@@ -39,8 +40,8 @@
 
 /*#define PUSH_PLUGIN_PATH     "/usr/lib/push-adaptor/plugins"*/
 #ifdef SA_PUSH_ON_DEMAND_ENABLE
-#define SERVICE_ADAPTOR_SERVICE_FILE_PATH      "/opt/share/service-adaptor/services/"
-#define SERVICE_ADAPTOR_PUSH_ENABLED_PATH      "/opt/share/service-adaptor/.push/"
+#define SERVICE_ADAPTOR_SERVICE_FILE_PATH      tzplatform_mkpath(TZ_SYS_SHARE, "/service-adaptor/services/")
+#define SERVICE_ADAPTOR_PUSH_ENABLED_PATH      tzplatform_mkpath(TZ_SYS_SHARE, "/service-adaptor/.push/")
 #endif
 
 #define PUSH_SERVICE_FILE_KEY_PLUGIN_URI       "PluginUri"

diff --git a/server/src/util/service_file_manager.c b/server/src/util/service_file_manager.c
index 28f8b80..39d9d1d 100644 (file)
--- a/server/src/util/service_file_manager.c
+++ b/server/src/util/service_file_manager.c
@@ -22,6 +22,7 @@
 #include <glib.h>
 
 #include <pluginConfig.h>
+#include <tzplatform_config.h>
 
 #include "util/service_file_manager.h"
 #include "service-adaptor-log.h"
@@ -34,10 +35,7 @@ typedef struct _service_file_s {
        ConfigHandle handle;
 } service_file_t;
 
-#define SERVICE_FILE_ROOT_PATH "/opt/share/service-adaptor/"
-#define SERVICE_FILE_SERVICES_PATH     SERVICE_FILE_ROOT_PATH "services/"
-#define SERVICE_FILE_AUTH_PATH         SERVICE_FILE_ROOT_PATH ".auth/"
-#define SERVICE_FILE_PUSH_PATH         SERVICE_FILE_ROOT_PATH ".push/"
+#define SERVICE_FILE_PUSH_PATH         tzplatform_mkpath(TZ_SYS_SHARE, "/service-adaptor/.push/")
 
 #define SERVICE_FILE_SECTION_STRING_GENERAL    "general"
 #define SERVICE_FILE_SECTION_STRING_BUS                "bus"
@@ -89,12 +87,10 @@ int service_file_get_list(service_file_directory_e directory, char ***file_names
                return -102;
        }
 
-       char *path = SERVICE_FILE_PUSH_PATH;
-
        DIR *dirp = NULL;
        struct dirent dent, *result = NULL;
 
-       dirp = opendir(path);
+       dirp = opendir(SERVICE_FILE_PUSH_PATH);
        if (NULL == dirp) {
                service_adaptor_error("dir open error");
                return -103;

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 456c0df..d2997f6 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES(
 )
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(test_pkgs REQUIRED dlog glib-2.0 capi-appfw-application)
+pkg_check_modules(test_pkgs REQUIRED dlog glib-2.0 capi-appfw-application libtzplatform-config)
 
 FOREACH(flag ${test_pkgs_CFLAGS})
         SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/test/test.c b/test/test.c
index 82b8c74..c29ee0c 100644 (file)
--- a/test/test.c
+++ b/test/test.c
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <glib-object.h>
 #include <glib-unix.h>
+#include <tzplatform-config.h>
 
 #include "service_adaptor_client.h"
 
@@ -50,7 +51,7 @@ void _service_plugin_login_callback(int result, void *user_data)
                printf("service_auth_oauth1_get_access_token() Request Successed\n");
        }
 
-       char *cloud_path = "/root/cloud";
+       char *cloud_path = tzplatform_mkstr(TZ_SYS_ROOT,"/cloud");
        service_storage_cloud_file_h file = NULL;
        ret = service_storage_cloud_file_create(service_plugin, &file);
        ret = service_storage_cloud_file_set_callback(file, _service_storage_cloud_file_cb, NULL);