Remove redundant code

This is due to change made in this following commit
- https://review.tizen.org/gerrit/#/c/52917/

This change depend on following change:
- https://review.tizen.org/gerrit/#/c/53081/

please merge it first.

Change-Id: I8dc188c3af27f42396187b7ef44e2cfe2545857d

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 157524ec4528fe3816f736006ae2507bdbbb6f50..5e15d150b1df040de984e16e4ae64b5192dddac5 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -50,7 +50,6 @@ SET(SRCS
   step/step_update_security.cc
   step/step_update_tep.cc
   utils/file_util.cc
-  utils/string_util.cc
 )
 # Target - definition
 ADD_LIBRARY(${TARGET_LIBNAME_COMMON} SHARED ${SRCS})

diff --git a/src/common/app_installer.cc b/src/common/app_installer.cc
index 83e843379f0b44042e70cba7ff8e53384001c27b..9c07a1c48cc5867cd509ef622e74bccd0cb82386 100644 (file)
--- a/src/common/app_installer.cc
+++ b/src/common/app_installer.cc
@@ -9,7 +9,6 @@
 #include "common/installer_context.h"
 #include "common/pkgmgr_interface.h"
 #include "common/pkgmgr_signal.h"
-#include "common/utils/logging.h"
 
 namespace {
 

diff --git a/src/common/app_installer.h b/src/common/app_installer.h
index 6933fe24a6dc72304a0793bfae46092f4b138e92..d925df10bf9709ded15ed75ddb3010e5ad43dc95 100644 (file)
--- a/src/common/app_installer.h
+++ b/src/common/app_installer.h
@@ -6,13 +6,14 @@
 #ifndef COMMON_APP_INSTALLER_H_
 #define COMMON_APP_INSTALLER_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include <list>
 #include <memory>
 
 #include "common/pkgmgr_interface.h"
 #include "common/pkgmgr_signal.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 #include "common/utils/macros.h"
 
 namespace common_installer {

diff --git a/src/common/pkgmgr_interface.h b/src/common/pkgmgr_interface.h
index 2e8a1ba9279963a5416056e2222424a2b58aa66f..4429a00b3b8fb6ca07290578650a85baffe43182 100644 (file)
--- a/src/common/pkgmgr_interface.h
+++ b/src/common/pkgmgr_interface.h
@@ -5,14 +5,15 @@
 #ifndef COMMON_PKGMGR_INTERFACE_H_
 #define COMMON_PKGMGR_INTERFACE_H_
 
+#include <manifest_parser/utils/logging.h>
 #include <pkgmgr_installer.h>
+
 #include <boost/filesystem/path.hpp>
 #include <memory>
 
 #include "common/app_query_interface.h"
 #include "common/request.h"
 #include "common/utils/macros.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 

diff --git a/src/common/pkgmgr_registration.cc b/src/common/pkgmgr_registration.cc
index 120e03acf7f6254836939494c8ad0202f2247ff3..b839add1a74ad969e306db6cb32c4c7dcfd71b9c 100644 (file)
--- a/src/common/pkgmgr_registration.cc
+++ b/src/common/pkgmgr_registration.cc
@@ -4,12 +4,11 @@
 
 #include "common/pkgmgr_registration.h"
 
+#include <manifest_parser/utils/logging.h>
 #include <pkgmgr_installer.h>
 #include <tzplatform_config.h>
 #include <unistd.h>
 
-#include "common/utils/logging.h"
-
 namespace bf = boost::filesystem;
 
 namespace {

diff --git a/src/common/pkgmgr_signal.cc b/src/common/pkgmgr_signal.cc
index 4253004f22684d8e1af622acfe65df49d0c9656d..26d266c1c517fe2b6919bcebfe328fc640bf4f09 100644 (file)
--- a/src/common/pkgmgr_signal.cc
+++ b/src/common/pkgmgr_signal.cc
@@ -4,6 +4,8 @@
 
 #include "common/pkgmgr_signal.h"
 
+#include <manifest_parser/utils/logging.h>
+
 #include <unistd.h>
 #include <sys/types.h>
 
@@ -12,7 +14,6 @@
 #include <vector>
 
 #include "common/pkgmgr_registration.h"
-#include "common/utils/logging.h"
 
 namespace {
 

diff --git a/src/common/recovery_file.cc b/src/common/recovery_file.cc
index 22f267140683e789b3636e90d70227c93db3fd2f..2b9c164ae4cf2d496a6ece93b42346187f23bf9c 100644 (file)
--- a/src/common/recovery_file.cc
+++ b/src/common/recovery_file.cc
@@ -7,12 +7,13 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/system/error_code.hpp>
 
+#include <manifest_parser/utils/logging.h>
+
 #include <array>
 #include <cstring>
 #include <map>
 
 #include "common/installer_context.h"
-#include "common/utils/logging.h"
 
 namespace bf = boost::filesystem;
 namespace bs = boost::system;

diff --git a/src/common/security_registration.cc b/src/common/security_registration.cc
index 723cd885abc35a27a0335ac07378237074e5eeb0..b446e137a827dd64c323c907fabed0b6d3ec3642 100644 (file)
--- a/src/common/security_registration.cc
+++ b/src/common/security_registration.cc
@@ -5,6 +5,8 @@
 #include "common/security_registration.h"
 
 #include <boost/filesystem/operations.hpp>
+
+#include <manifest_parser/utils/logging.h>
 #include <security-manager.h>
 
 #include <utility>
@@ -12,7 +14,6 @@
 #include <algorithm>
 
 #include "common/utils/glist_range.h"
-#include "common/utils/logging.h"
 
 namespace bf = boost::filesystem;
 

diff --git a/src/common/step/step_backup_icons.h b/src/common/step/step_backup_icons.h
index 606fcf384003121064887a7f2bf21e71d53c5e4e..2c21fdabd8f1f3cee132be18afa2a05ce4cf121f 100644 (file)
--- a/src/common/step/step_backup_icons.h
+++ b/src/common/step/step_backup_icons.h
@@ -9,9 +9,10 @@
 #include <utility>
 #include <vector>
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace backup {

diff --git a/src/common/step/step_backup_manifest.cc b/src/common/step/step_backup_manifest.cc
index 51a6012bc7180af37accee157574460b57b5bfcc..6b81ef031df13b07b6233341a450793822142087 100644 (file)
--- a/src/common/step/step_backup_manifest.cc
+++ b/src/common/step/step_backup_manifest.cc
@@ -16,7 +16,6 @@
 
 #include "common/backup_paths.h"
 #include "common/utils/file_util.h"
-#include "common/utils/logging.h"
 
 namespace bf = boost::filesystem;
 namespace bs = boost::system;

diff --git a/src/common/step/step_backup_manifest.h b/src/common/step/step_backup_manifest.h
index 0472c79c4965e752f5c2686aab2d3c582d488823..b06ef7b14fa040d21801818c83c83d703cb34997 100644 (file)
--- a/src/common/step/step_backup_manifest.h
+++ b/src/common/step/step_backup_manifest.h
@@ -5,9 +5,10 @@
 #ifndef COMMON_STEP_STEP_BACKUP_MANIFEST_H_
 #define COMMON_STEP_STEP_BACKUP_MANIFEST_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace backup {

diff --git a/src/common/step/step_check_background_category.h b/src/common/step/step_check_background_category.h
index dca14e9ed8a3e787b299b5209b72e2cc9aa79224..9bf3da2d8e9dc83ed68465bc2d630fc89ded325b 100644 (file)
--- a/src/common/step/step_check_background_category.h
+++ b/src/common/step/step_check_background_category.h
@@ -5,6 +5,7 @@
 #ifndef COMMON_STEP_STEP_CHECK_BACKGROUND_CATEGORY_H_
 #define COMMON_STEP_STEP_CHECK_BACKGROUND_CATEGORY_H_
 
+#include <manifest_parser/utils/logging.h>
 #include <manifest_parser/utils/version_number.h>
 
 #include <glib.h>
@@ -12,7 +13,6 @@
 #include <string>
 
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace security {

diff --git a/src/common/step/step_check_old_certificate.cc b/src/common/step/step_check_old_certificate.cc
index ef34ab84181bfb25912bb92ba944ccd1c0ee99a7..8767b47d8476033c6d202008a6e6abc9b8002304 100644 (file)
--- a/src/common/step/step_check_old_certificate.cc
+++ b/src/common/step/step_check_old_certificate.cc
@@ -4,6 +4,7 @@
 
 #include "common/step/step_check_old_certificate.h"
 
+#include <manifest_parser/utils/logging.h>
 #include <pkgmgr-info.h>
 #include <unistd.h>
 
@@ -11,7 +12,6 @@
 #include <string>
 
 #include "common/pkgmgr_registration.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace security {

diff --git a/src/common/step/step_check_old_certificate.h b/src/common/step/step_check_old_certificate.h
index 5abf0040ca09e784cdd109e7646006d91f3ac50a..8a9ff3c0b86f3292e213ece6d363b30442152ad2 100644 (file)
--- a/src/common/step/step_check_old_certificate.h
+++ b/src/common/step/step_check_old_certificate.h
@@ -5,9 +5,10 @@
 #ifndef COMMON_STEP_STEP_CHECK_OLD_CERTIFICATE_H_
 #define COMMON_STEP_STEP_CHECK_OLD_CERTIFICATE_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace security {

diff --git a/src/common/step/step_check_signature.h b/src/common/step/step_check_signature.h
index 35446928d3e10710ff705f29b0191caa6fa97487..9f8c2e0340f269de541ac81c6c7977b7de42b395 100644 (file)
--- a/src/common/step/step_check_signature.h
+++ b/src/common/step/step_check_signature.h
@@ -5,9 +5,10 @@
 #ifndef COMMON_STEP_STEP_CHECK_SIGNATURE_H_
 #define COMMON_STEP_STEP_CHECK_SIGNATURE_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace security {

diff --git a/src/common/step/step_configure.h b/src/common/step/step_configure.h
index 760d872f7f81564246387da8f2c5af70995e6b17..96a77d728fbf8a4352fc703fc1e86ac7023652c2 100644 (file)
--- a/src/common/step/step_configure.h
+++ b/src/common/step/step_configure.h
@@ -5,11 +5,12 @@
 #ifndef COMMON_STEP_STEP_CONFIGURE_H_
 #define COMMON_STEP_STEP_CONFIGURE_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 
 #include "common/pkgmgr_interface.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace configuration {

diff --git a/src/common/step/step_copy.h b/src/common/step/step_copy.h
index 59e543213de0ca29acb423ff09ffdad1c3af9ceb..f646daea03ded7503f999b1093b5493b1dc17e07 100644 (file)
--- a/src/common/step/step_copy.h
+++ b/src/common/step/step_copy.h
@@ -6,10 +6,11 @@
 #ifndef COMMON_STEP_STEP_COPY_H_
 #define COMMON_STEP_STEP_COPY_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_copy_backup.h b/src/common/step/step_copy_backup.h
index 7e77aa7b75f5c436b727d79161e750fc048c1856..778efa0714b4c47c35df9bc2ff9d0131df0bf96f 100644 (file)
--- a/src/common/step/step_copy_backup.h
+++ b/src/common/step/step_copy_backup.h
@@ -7,9 +7,10 @@
 
 #include <boost/filesystem/path.hpp>
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace backup {

diff --git a/src/common/step/step_copy_storage_directories.h b/src/common/step/step_copy_storage_directories.h
index 3bcd5a513697d57f9582a8ff3864d4376c4aae95..dcd223df805508816002ffd612b11d20955d357b 100644 (file)
--- a/src/common/step/step_copy_storage_directories.h
+++ b/src/common/step/step_copy_storage_directories.h
@@ -7,8 +7,9 @@
 
 #include <boost/filesystem/path.hpp>
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/step/step.h"
-#include "utils/logging.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_copy_tep.h b/src/common/step/step_copy_tep.h
index 79fbb055fc8425c08aed390ed8f4385c978ee38a..8d16319211d0b99d2aff38d1ae2dc4681584c7ff 100644 (file)
--- a/src/common/step/step_copy_tep.h
+++ b/src/common/step/step_copy_tep.h
@@ -6,10 +6,11 @@
 #ifndef COMMON_STEP_STEP_COPY_TEP_H_
 #define COMMON_STEP_STEP_COPY_TEP_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_create_icons.h b/src/common/step/step_create_icons.h
index bc8e49ab54911044d64ef1c1bf7e951ce72bd3c1..9a73061055e9da8807ca075716e59fb5747d050a 100644 (file)
--- a/src/common/step/step_create_icons.h
+++ b/src/common/step/step_create_icons.h
@@ -6,12 +6,14 @@
 #define COMMON_STEP_STEP_CREATE_ICONS_H_
 
 #include <boost/filesystem/path.hpp>
+
+#include <manifest_parser/utils/logging.h>
+
 #include <utility>
 #include <vector>
 
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_create_storage_directories.h b/src/common/step/step_create_storage_directories.h
index 16d038549d72cb570ff1d2895af92d58cec7173c..072f85c52bfec3bac540f44201d19c1d66aa5c23 100644 (file)
--- a/src/common/step/step_create_storage_directories.h
+++ b/src/common/step/step_create_storage_directories.h
@@ -5,8 +5,9 @@
 #ifndef COMMON_STEP_STEP_CREATE_STORAGE_DIRECTORIES_H_
 #define COMMON_STEP_STEP_CREATE_STORAGE_DIRECTORIES_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/step/step.h"
-#include "utils/logging.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_delta_patch.h b/src/common/step/step_delta_patch.h
index cc9cf788508edc09e2cce40ce87633927d398373..2e686fdf304aeadc818c930e05083e5e7329e316 100644 (file)
--- a/src/common/step/step_delta_patch.h
+++ b/src/common/step/step_delta_patch.h
@@ -5,11 +5,12 @@
 #ifndef COMMON_STEP_STEP_DELTA_PATCH_H_
 #define COMMON_STEP_STEP_DELTA_PATCH_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include <string>
 
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_fail.h b/src/common/step/step_fail.h
index 82bd573d200fa36f261319b04fea8174e1cd21cb..06196607a6f8a27f43cf8729a972d9a24da7993b 100644 (file)
--- a/src/common/step/step_fail.h
+++ b/src/common/step/step_fail.h
@@ -5,10 +5,11 @@
 #ifndef COMMON_STEP_STEP_FAIL_H_
 #define COMMON_STEP_STEP_FAIL_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace configuration {

diff --git a/src/common/step/step_generate_xml.h b/src/common/step/step_generate_xml.h
index f706b32a38d6a5afd22d3f15b7bbc7c459d2ffdd..22787536db922ea7716bf6c59482ce7c7b346f4d 100644 (file)
--- a/src/common/step/step_generate_xml.h
+++ b/src/common/step/step_generate_xml.h
@@ -6,11 +6,12 @@
 #ifndef  COMMON_STEP_STEP_GENERATE_XML_H_
 #define  COMMON_STEP_STEP_GENERATE_XML_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include <libxml/xmlwriter.h>
 
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace pkgmgr {

diff --git a/src/common/step/step_kill_apps.h b/src/common/step/step_kill_apps.h
index e5d5633b8e114e0fbe4bfee6083a0133a91e05d6..90c91730195d0755b2ecc3fd6b381a581ad88653 100644 (file)
--- a/src/common/step/step_kill_apps.h
+++ b/src/common/step/step_kill_apps.h
@@ -5,9 +5,10 @@
 #ifndef COMMON_STEP_STEP_KILL_APPS_H_
 #define COMMON_STEP_STEP_KILL_APPS_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace pkgmgr {

diff --git a/src/common/step/step_old_manifest.cc b/src/common/step/step_old_manifest.cc
index 88da33b28eb135258f20844ba1958eb85a6b68bb..a85240597354861ef823b5b78fc966fc265c6656 100644 (file)
--- a/src/common/step/step_old_manifest.cc
+++ b/src/common/step/step_old_manifest.cc
@@ -5,10 +5,11 @@
 #include "common/step/step_old_manifest.h"
 
 #include <boost/filesystem.hpp>
+
+#include <manifest_parser/utils/logging.h>
 #include <pkgmgr-info.h>
-#include <string>
 
-#include "common/utils/logging.h"
+#include <string>
 
 namespace common_installer {
 namespace backup {

diff --git a/src/common/step/step_old_manifest.h b/src/common/step/step_old_manifest.h
index 35785c31dbf6efd7c8dc51dd1c895e38f4c9d963..b7b8f5fbac00c02833fe6a4f01dd465386d05388 100644 (file)
--- a/src/common/step/step_old_manifest.h
+++ b/src/common/step/step_old_manifest.h
@@ -5,10 +5,11 @@
 #ifndef COMMON_STEP_STEP_OLD_MANIFEST_H_
 #define COMMON_STEP_STEP_OLD_MANIFEST_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace backup {

diff --git a/src/common/step/step_open_recovery_file.h b/src/common/step/step_open_recovery_file.h
index 9afa862b44ea80c288170462718810fab7332034..7aa476258cbd2501c803ad9ffab1bbe7674cd163 100644 (file)
--- a/src/common/step/step_open_recovery_file.h
+++ b/src/common/step/step_open_recovery_file.h
@@ -5,10 +5,11 @@
 #ifndef COMMON_STEP_STEP_OPEN_RECOVERY_FILE_H_
 #define COMMON_STEP_STEP_OPEN_RECOVERY_FILE_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace recovery {

diff --git a/src/common/step/step_parse.h b/src/common/step/step_parse.h
index e0fe4b706e23be9802b873fa9381f7f59eb7d924..7376554e339adeed98320ddfe0c4976c5b2e049c 100644 (file)
--- a/src/common/step/step_parse.h
+++ b/src/common/step/step_parse.h
@@ -6,10 +6,11 @@
 #ifndef COMMON_STEP_STEP_PARSE_H_
 #define COMMON_STEP_STEP_PARSE_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace parse {

diff --git a/src/common/step/step_privilege_compatibility.h b/src/common/step/step_privilege_compatibility.h
index d9c7b36925415babd18ab01e40f781fc2e26f39d..b9982f019eee5846aab960c515385312b2f781cb 100644 (file)
--- a/src/common/step/step_privilege_compatibility.h
+++ b/src/common/step/step_privilege_compatibility.h
@@ -5,9 +5,10 @@
 #ifndef COMMON_STEP_STEP_PRIVILEGE_COMPATIBILITY_H_
 #define COMMON_STEP_STEP_PRIVILEGE_COMPATIBILITY_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace security {

diff --git a/src/common/step/step_recover_application.h b/src/common/step/step_recover_application.h
index b79e08fd675697ed237af6892c7d019b07bf9628..fad6dc3a39fc1350eb03e27e1cdd77e9c267f6c3 100644 (file)
--- a/src/common/step/step_recover_application.h
+++ b/src/common/step/step_recover_application.h
@@ -5,9 +5,10 @@
 #ifndef COMMON_STEP_STEP_RECOVER_APPLICATION_H_
 #define COMMON_STEP_STEP_RECOVER_APPLICATION_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step_recovery.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace pkgmgr {

diff --git a/src/common/step/step_recover_files.h b/src/common/step/step_recover_files.h
index a1ca73cf3da4717561601c8551c65034b91c06fc..cf0a606a3da567be13c70179d3b60333da25338d 100644 (file)
--- a/src/common/step/step_recover_files.h
+++ b/src/common/step/step_recover_files.h
@@ -5,9 +5,10 @@
 #ifndef COMMON_STEP_STEP_RECOVER_FILES_H_
 #define COMMON_STEP_STEP_RECOVER_FILES_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step_recovery.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_recover_icons.h b/src/common/step/step_recover_icons.h
index 16ca97abb2a957a8354833dd3b26c21cffcd3b05..ce41987e96c5a44adb7df41be917e1f646d53b3b 100644 (file)
--- a/src/common/step/step_recover_icons.h
+++ b/src/common/step/step_recover_icons.h
@@ -6,12 +6,14 @@
 #define COMMON_STEP_STEP_RECOVER_ICONS_H_
 
 #include <boost/filesystem/path.hpp>
+
+#include <manifest_parser/utils/logging.h>
+
 #include <utility>
 #include <vector>
 
 #include "common/installer_context.h"
 #include "common/step/step_recovery.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_recover_manifest.h b/src/common/step/step_recover_manifest.h
index 4bfb3797a99c2d2742007967ddfeaf4322dca073..d9c34f6644398e2ab16dc8818e4a8c62f881c221 100644 (file)
--- a/src/common/step/step_recover_manifest.h
+++ b/src/common/step/step_recover_manifest.h
@@ -5,9 +5,10 @@
 #ifndef COMMON_STEP_STEP_RECOVER_MANIFEST_H_
 #define COMMON_STEP_STEP_RECOVER_MANIFEST_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step_recovery.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_recover_security.h b/src/common/step/step_recover_security.h
index 38bc2c0dd249265b3bfef9059d4fa7ac1b1b5596..f2850d63b9965811716f1f34001eec1bf8231c97 100644 (file)
--- a/src/common/step/step_recover_security.h
+++ b/src/common/step/step_recover_security.h
@@ -5,9 +5,10 @@
 #ifndef COMMON_STEP_STEP_RECOVER_SECURITY_H_
 #define COMMON_STEP_STEP_RECOVER_SECURITY_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step_recovery.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace security {

diff --git a/src/common/step/step_recover_storage_directories.h b/src/common/step/step_recover_storage_directories.h
index 9584c3be73848f596d071b1dfb9fc38891e7d3be..4d85e5cdb0e33116c085e1563bf9f5fb392811a9 100644 (file)
--- a/src/common/step/step_recover_storage_directories.h
+++ b/src/common/step/step_recover_storage_directories.h
@@ -5,9 +5,10 @@
 #ifndef COMMON_STEP_STEP_RECOVER_STORAGE_DIRECTORIES_H_
 #define COMMON_STEP_STEP_RECOVER_STORAGE_DIRECTORIES_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step_recovery.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_recovery.cc b/src/common/step/step_recovery.cc
index ad371cda97ea4e6cb85b1facb486a4ea66c8b5f7..3517b4fdc8378be09d0a8692dbf71856d0205594 100644 (file)
--- a/src/common/step/step_recovery.cc
+++ b/src/common/step/step_recovery.cc
@@ -4,8 +4,9 @@
 
 #include "common/step/step_recovery.h"
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/request.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace recovery {

diff --git a/src/common/step/step_register_app.h b/src/common/step/step_register_app.h
index f7ff7f3042d6f81652b4cb8679f2ab18f07c9366..5461eff1db59eeb2e29accf7793538ab273bbc10 100644 (file)
--- a/src/common/step/step_register_app.h
+++ b/src/common/step/step_register_app.h
@@ -3,9 +3,10 @@
 #ifndef COMMON_STEP_STEP_REGISTER_APP_H_
 #define COMMON_STEP_STEP_REGISTER_APP_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace pkgmgr {

diff --git a/src/common/step/step_register_security.h b/src/common/step/step_register_security.h
index 75fabc997a5a5daf681535824e3b905a458ecaa2..3e7bd708ab892c314cb940b1f6c1206c8a27e7ec 100644 (file)
--- a/src/common/step/step_register_security.h
+++ b/src/common/step/step_register_security.h
@@ -5,8 +5,9 @@
 #ifndef COMMON_STEP_STEP_REGISTER_SECURITY_H_
 #define COMMON_STEP_STEP_REGISTER_SECURITY_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace security {

diff --git a/src/common/step/step_remove_files.h b/src/common/step/step_remove_files.h
index 84ffffbe2a3f2846b1a8cb04d0a6030da4f37102..0b6a67127b5a5155dc5bc50a020f0e306897962e 100644 (file)
--- a/src/common/step/step_remove_files.h
+++ b/src/common/step/step_remove_files.h
@@ -5,10 +5,11 @@
 #ifndef COMMON_STEP_STEP_REMOVE_FILES_H_
 #define COMMON_STEP_STEP_REMOVE_FILES_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_remove_icons.h b/src/common/step/step_remove_icons.h
index a5822502f5b23b0dc03226bbc1e229c0aef00a25..1782044d3017fe14595cfdc41ec1985eca3dbeee 100644 (file)
--- a/src/common/step/step_remove_icons.h
+++ b/src/common/step/step_remove_icons.h
@@ -7,12 +7,13 @@
 
 #include <boost/filesystem/path.hpp>
 
+#include <manifest_parser/utils/logging.h>
+
 #include <utility>
 #include <vector>
 
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_remove_temporary_directory.h b/src/common/step/step_remove_temporary_directory.h
index cb6b6c35e25fd1e230938c0795fd518f2f245dda..091cf6bc91605b6ea87e78f7fbb6db168d7aac80 100644 (file)
--- a/src/common/step/step_remove_temporary_directory.h
+++ b/src/common/step/step_remove_temporary_directory.h
@@ -5,8 +5,9 @@
 #ifndef COMMON_STEP_STEP_REMOVE_TEMPORARY_DIRECTORY_H_
 #define COMMON_STEP_STEP_REMOVE_TEMPORARY_DIRECTORY_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/step/step_recovery.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_revoke_security.h b/src/common/step/step_revoke_security.h
index a652b3dcf9c59ba46a37360cd79d2aa27fec163e..6b291d604007f5bc7af82513cf6d199f4c452453 100644 (file)
--- a/src/common/step/step_revoke_security.h
+++ b/src/common/step/step_revoke_security.h
@@ -5,8 +5,9 @@
 #ifndef COMMON_STEP_STEP_REVOKE_SECURITY_H_
 #define COMMON_STEP_STEP_REVOKE_SECURITY_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace security {

diff --git a/src/common/step/step_rollback_deinstallation_security.h b/src/common/step/step_rollback_deinstallation_security.h
index 9100d179351ef5bd9bcfc675d56b8057f63339da..412485adee424be9324777560cff4eddd4580f60 100644 (file)
--- a/src/common/step/step_rollback_deinstallation_security.h
+++ b/src/common/step/step_rollback_deinstallation_security.h
@@ -5,8 +5,9 @@
 #ifndef COMMON_STEP_STEP_ROLLBACK_DEINSTALLATION_SECURITY_H_
 #define COMMON_STEP_STEP_ROLLBACK_DEINSTALLATION_SECURITY_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace security {

diff --git a/src/common/step/step_rollback_installation_security.h b/src/common/step/step_rollback_installation_security.h
index afde537b30276b16732e8ecd2e9769a5cb12b26a..64bc04f358cb52d1569b1ed3a6fea6e6df79f593 100644 (file)
--- a/src/common/step/step_rollback_installation_security.h
+++ b/src/common/step/step_rollback_installation_security.h
@@ -5,8 +5,9 @@
 #ifndef COMMON_STEP_STEP_ROLLBACK_INSTALLATION_SECURITY_H_
 #define COMMON_STEP_STEP_ROLLBACK_INSTALLATION_SECURITY_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace security {

diff --git a/src/common/step/step_unregister_app.h b/src/common/step/step_unregister_app.h
index 876885d473e6b0d5b8738374865677cdeffdf30a..aac1e509b57957519d67981ae3361f7560ed420c 100644 (file)
--- a/src/common/step/step_unregister_app.h
+++ b/src/common/step/step_unregister_app.h
@@ -5,9 +5,10 @@
 #ifndef COMMON_STEP_STEP_UNREGISTER_APP_H_
 #define COMMON_STEP_STEP_UNREGISTER_APP_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace pkgmgr {

diff --git a/src/common/step/step_unzip.h b/src/common/step/step_unzip.h
index c9658a7787bda126b5a3d7f49d8a60ea0a24c3a1..71f359d90b01032723f502ff9d24257a097c05d6 100644 (file)
--- a/src/common/step/step_unzip.h
+++ b/src/common/step/step_unzip.h
@@ -8,9 +8,10 @@
 
 #include <boost/filesystem/path.hpp>
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_update_app.h b/src/common/step/step_update_app.h
index ae1da1fff8c56527d77efa54e586aaee90a039a3..d823cc41661eaa4f958a79f53368a204152e4eb0 100644 (file)
--- a/src/common/step/step_update_app.h
+++ b/src/common/step/step_update_app.h
@@ -5,9 +5,10 @@
 #ifndef COMMON_STEP_STEP_UPDATE_APP_H_
 #define COMMON_STEP_STEP_UPDATE_APP_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace pkgmgr {

diff --git a/src/common/step/step_update_security.h b/src/common/step/step_update_security.h
index 1ffe7b6f083b186f765793ef1e266f05f0e1c361..d29a765919ed727134c762e635e62615f6cb3898 100644 (file)
--- a/src/common/step/step_update_security.h
+++ b/src/common/step/step_update_security.h
@@ -5,8 +5,9 @@
 #ifndef COMMON_STEP_STEP_UPDATE_SECURITY_H_
 #define COMMON_STEP_STEP_UPDATE_SECURITY_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace security {

diff --git a/src/common/step/step_update_tep.h b/src/common/step/step_update_tep.h
index adf19eb277d13d60fdbdcf347a5c432522b9df74..57b0a9778c8fc9bca0e7b64430ce9c72d7751123 100644 (file)
--- a/src/common/step/step_update_tep.h
+++ b/src/common/step/step_update_tep.h
@@ -5,9 +5,10 @@
 #ifndef COMMON_STEP_STEP_UPDATE_TEP_H_
 #define COMMON_STEP_STEP_UPDATE_TEP_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace common_installer {
 namespace pkgmgr {

diff --git a/src/common/utils/file_util.cc b/src/common/utils/file_util.cc
index 1b974753fc38be86e066bf296f8e232692e578c9..4924ce69c10793e7c2824abf4b8ae523b7727dae 100644 (file)
--- a/src/common/utils/file_util.cc
+++ b/src/common/utils/file_util.cc
@@ -12,12 +12,13 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/system/error_code.hpp>
 
+#include <manifest_parser/utils/logging.h>
+
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "common/utils/byte_size_literals.h"
-#include "common/utils/logging.h"
 
 namespace ba = boost::algorithm;
 namespace bs = boost::system;

diff --git a/src/common/utils/logging.h b/src/common/utils/logging.h
deleted file mode 100644 (file)
index a70d194..0000000
--- a/src/common/utils/logging.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
-// Use of this source code is governed by a apache 2.0 license that can be
-// found in the LICENSE file.
-
-#ifndef COMMON_UTILS_LOGGING_H_
-#define COMMON_UTILS_LOGGING_H_
-
-#include <cassert>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <string>
-
-namespace common_installer {
-
-enum class LogLevel {
-  LOG_ERROR,
-  LOG_WARNING,
-  LOG_INFO,
-  LOG_DEBUG,
-};
-
-template<LogLevel> struct LogTag;
-template<> struct LogTag<LogLevel::LOG_ERROR> {
-  static constexpr const char* value = "\033[1;31m| ERROR   |\033[0m";
-};
-template<> struct LogTag<LogLevel::LOG_WARNING> {
-  static constexpr const char* value = "\033[1;33m| WARNING |\033[0m";
-};
-template<> struct LogTag<LogLevel::LOG_INFO>  {
-  static constexpr const char* value = "\033[1;32m| INFO    |\033[0m";
-};
-template<> struct LogTag<LogLevel::LOG_DEBUG> {
-  static constexpr const char* value = "\033[0m| DEBUG   |\033[0m";
-};
-
-class LogCatcher {
- public:
-  LogCatcher() { }
-  void operator&(const std::ostream& str) const {
-    // TODO(tiwanek): this cast is error-prone - fix it
-    std::cerr << static_cast<const std::ostringstream*>(&str)->str()
-              << std::endl;
-  }
-};
-
-}  // namespace common_installer
-
-inline static const constexpr char* __tag_for_logging() {
-  return "";
-}
-
-// To be defined in class namespace if user want different log tag for given
-// scope
-#define SCOPE_LOG_TAG(TAG)                                                     \
-  inline static const constexpr char* __tag_for_logging() {                    \
-    return #TAG;                                                               \
-  }                                                                            \
-
-// Simple logging macro of following usage:
-//   LOG(LEVEL) << object_1 << object_2 << object_n;
-//     where:
-//       LEVEL = ERROR | WARNING | INFO | DEBUG
-#define LOG(LEVEL)                                                             \
-    ::common_installer::LogCatcher() & std::ostringstream()                    \
-      << std::string(::common_installer::LogTag<                               \
-         ::common_installer::LogLevel::LOG_ ## LEVEL>::value)                  \
-      << " " << std::setw(20) << std::left << __tag_for_logging()              \
-      << std::setw(0) << " : "                                                 \
-
-#endif  // COMMON_UTILS_LOGGING_H_

diff --git a/src/common/utils/string_util.cc b/src/common/utils/string_util.cc
deleted file mode 100644 (file)
index d800a17..0000000
--- a/src/common/utils/string_util.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
-// Use of this source code is governed by a apache 2.0 license that can be
-// found in the LICENSE file.
-
-// This file was rewritten completely in
-// 7c807fc0d4561d178b7c2d8b8d532f48e78ab1bc so fixing license.
-
-#include "common/utils/string_util.h"
-
-#include <cstdlib>
-#include <string>
-#include <vector>
-
-namespace common_installer {
-
-std::string DecodePercentEscapedCharacter(const std::string& path) {
-  std::vector<int> input(path.begin(), path.end());
-  std::vector<char> output;
-  unsigned i = 0;
-  while (i < input.size()) {
-    if ('%' == input[i]) {
-      if (i + 2 >= input.size())
-        return std::string();
-      char str[3] = {"\0", };
-      str[0] = input[i + 1];
-      str[1] = input[i + 2];
-      int result = strtol(str, nullptr, 16);
-      // RFC 1738 - octets 80 to FF are not allowed
-      if (result >= 128)
-        return std::string();
-      output.push_back(static_cast<char>(result));
-      i += 3;
-    } else {
-      output.push_back(static_cast<char>(input[i]));
-      ++i;
-    }
-  }
-  return std::string(output.begin(), output.end());
-}
-
-}  // namespace common_installer

diff --git a/src/common/utils/string_util.h b/src/common/utils/string_util.h
deleted file mode 100644 (file)
index d1bcba5..0000000
--- a/src/common/utils/string_util.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
-// Use of this source code is governed by a apache 2.0 license that can be
-// found in the LICENSE file.
-
-#ifndef COMMON_UTILS_STRING_UTIL_H_
-#define COMMON_UTILS_STRING_UTIL_H_
-
-#include <string>
-
-namespace common_installer {
-
-std::string DecodePercentEscapedCharacter(const std::string& path);
-
-}  // namespace common_installer
-
-#endif  // COMMON_UTILS_STRING_UTIL_H_

diff --git a/src/pkgdir_tool/pkgdir_tool.cc b/src/pkgdir_tool/pkgdir_tool.cc
index bec82316d56908137ed7204bcda0aa09dbcd5a65..65382607c6b1e794deba1c9540f9787f9c52f253 100644 (file)
--- a/src/pkgdir_tool/pkgdir_tool.cc
+++ b/src/pkgdir_tool/pkgdir_tool.cc
@@ -7,6 +7,7 @@
 #include <boost/program_options.hpp>
 #include <boost/system/error_code.hpp>
 
+#include <manifest_parser/utils/logging.h>
 #include <pkgmgr-info.h>
 #include <pwd.h>
 #include <sys/types.h>
@@ -26,7 +27,7 @@
 #include "common/pkgmgr_registration.h"
 #include "common/utils/file_util.h"
 #include "common/utils/glist_range.h"
-#include "common/utils/logging.h"
+
 
 namespace bf = boost::filesystem;
 namespace bpo = boost::program_options;

diff --git a/src/tpk/step/step_create_symbolic_link.cc b/src/tpk/step/step_create_symbolic_link.cc
index cb75a7558dcea3459a68ed2a29649164e49418fb..aab7b0d470ca406d2728c91bba3d21e199d50b07 100644 (file)
--- a/src/tpk/step/step_create_symbolic_link.cc
+++ b/src/tpk/step/step_create_symbolic_link.cc
@@ -11,7 +11,6 @@
 #include "common/installer_context.h"
 #include "common/utils/file_util.h"
 #include "common/utils/glist_range.h"
-#include "common/utils/logging.h"
 
 namespace tpk {
 namespace filesystem {

diff --git a/src/tpk/step/step_create_symbolic_link.h b/src/tpk/step/step_create_symbolic_link.h
index a763f6801a85120f0e737b4d704705993a04bb44..0339cf7de266cf689f702ae2d55a8f43e9666d72 100644 (file)
--- a/src/tpk/step/step_create_symbolic_link.h
+++ b/src/tpk/step/step_create_symbolic_link.h
@@ -2,8 +2,9 @@
 #ifndef TPK_STEP_STEP_CREATE_SYMBOLIC_LINK_H_
 #define TPK_STEP_STEP_CREATE_SYMBOLIC_LINK_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/app_installer.h"
-#include "common/utils/logging.h"
 
 namespace tpk {
 namespace filesystem {

diff --git a/src/tpk/step/step_parse.h b/src/tpk/step/step_parse.h
index f4dcff58be3ac9e2a233591a6efd75f0c13757a7..297e90d959984dd30480e0e9a6ae3bb29123b6cb 100644 (file)
--- a/src/tpk/step/step_parse.h
+++ b/src/tpk/step/step_parse.h
@@ -6,6 +6,8 @@
 #define TPK_STEP_STEP_PARSE_H_
 
 #include <boost/filesystem.hpp>
+
+#include <manifest_parser/utils/logging.h>
 #include <tpk_manifest_handlers/privileges_handler.h>
 #include <tpk_manifest_handlers/tpk_config_parser.h>
 #include <tpk_manifest_handlers/ui_and_service_application_infos.h>
@@ -17,7 +19,6 @@
 #include "common/app_installer.h"
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace tpk {
 namespace parse {

diff --git a/src/tpk/step/step_parse_recovery.h b/src/tpk/step/step_parse_recovery.h
index 9047af5f54603834f2a67569b7b378b753728ffb..5522ed056e44b4e0993ec2726dc9b538bb4c1a46 100644 (file)
--- a/src/tpk/step/step_parse_recovery.h
+++ b/src/tpk/step/step_parse_recovery.h
@@ -7,7 +7,8 @@
 
 #include <boost/filesystem/path.hpp>
 
-#include "common/utils/logging.h"
+#include <manifest_parser/utils/logging.h>
+
 #include "tpk/step/step_parse.h"
 
 namespace tpk {

diff --git a/src/tpk/tpk_app_query_interface.cc b/src/tpk/tpk_app_query_interface.cc
index ce2f514b9d362ec973d8d1535106e7fb652913dc..228aea74a8ad6ab65a51e8c0f87838013fdc7a02 100644 (file)
--- a/src/tpk/tpk_app_query_interface.cc
+++ b/src/tpk/tpk_app_query_interface.cc
@@ -10,6 +10,8 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/system/error_code.hpp>
+
+#include <manifest_parser/utils/logging.h>
 #include <tpk_manifest_handlers/application_manifest_constants.h>
 #include <tpk_manifest_handlers/package_handler.h>
 #include <tpk_manifest_handlers/tpk_config_parser.h>
@@ -20,7 +22,6 @@
 #include "common/pkgmgr_registration.h"
 #include "common/request.h"
 #include "common/utils/file_util.h"
-#include "common/utils/logging.h"
 
 namespace bf = boost::filesystem;
 namespace bs = boost::system;

diff --git a/src/tpk/tpk_backend.cc b/src/tpk/tpk_backend.cc
index 09c127015ea605d7a3fd2afe94fb655be4362990..2df73d099123d12a7234598752c349b1442184dd 100644 (file)
--- a/src/tpk/tpk_backend.cc
+++ b/src/tpk/tpk_backend.cc
@@ -1,9 +1,10 @@
 /* Copyright 2015 Samsung Electronics, license APACHE-2.0, see LICENSE file */
 
+#include <manifest_parser/utils/logging.h>
+
 #include <iostream>
 
 #include "common/pkgmgr_interface.h"
-#include "common/utils/logging.h"
 #include "tpk/tpk_app_query_interface.h"
 #include "tpk/tpk_installer.h"
 

diff --git a/src/tpk/tpk_installer.cc b/src/tpk/tpk_installer.cc
index f67d229bb68db7957f59f88c3241aa22f54ef08a..2cb4a64e5c99098177f128d747b2aa294a825d5b 100644 (file)
--- a/src/tpk/tpk_installer.cc
+++ b/src/tpk/tpk_installer.cc
@@ -38,7 +38,6 @@
 #include "common/step/step_update_app.h"
 #include "common/step/step_update_security.h"
 #include "common/step/step_update_tep.h"
-#include "common/utils/logging.h"
 #include "tpk/step/step_check_tpk_background_category.h"
 #include "tpk/step/step_create_symbolic_link.h"
 #include "tpk/step/step_parse.h"

diff --git a/src/tpk/tpk_installer.h b/src/tpk/tpk_installer.h
index 1cfd78a5478dc87cb8f1ceb18854f657aedeeb11..43acab53e57969bc838b7ccfb3ebebd659883bdc 100644 (file)
--- a/src/tpk/tpk_installer.h
+++ b/src/tpk/tpk_installer.h
@@ -3,9 +3,10 @@
 #ifndef TPK_TPK_INSTALLER_H_
 #define TPK_TPK_INSTALLER_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/app_installer.h"
 #include "common/pkgmgr_interface.h"
-#include "common/utils/logging.h"
 
 namespace tpk {
 

diff --git a/src/wgt/step/step_add_default_privileges.h b/src/wgt/step/step_add_default_privileges.h
index b9be9f9e98d4c522d1e361c6942b3e037a698610..1fd1d79bc846cb30f950a9b3c28f76e4ba741ec2 100644 (file)
--- a/src/wgt/step/step_add_default_privileges.h
+++ b/src/wgt/step/step_add_default_privileges.h
@@ -5,10 +5,11 @@
 #ifndef WGT_STEP_STEP_ADD_DEFAULT_PRIVILEGES_H_
 #define WGT_STEP_STEP_ADD_DEFAULT_PRIVILEGES_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/app_installer.h"
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace wgt {
 namespace security {

diff --git a/src/wgt/step/step_check_settings_level.cc b/src/wgt/step/step_check_settings_level.cc
index 374499b46b7b802283b68fe8988e2f5a1af09930..664e376f3ed909eef1b395d91b29be17691caeab 100644 (file)
--- a/src/wgt/step/step_check_settings_level.cc
+++ b/src/wgt/step/step_check_settings_level.cc
@@ -5,11 +5,10 @@
 #include "wgt/step/step_check_settings_level.h"
 
 #include <manifest_handlers/setting_handler.h>
+#include <manifest_parser/utils/logging.h>
 
 #include <map>
 
-#include "common/utils/logging.h"
-
 #include "wgt/wgt_backend_data.h"
 
 namespace {

diff --git a/src/wgt/step/step_check_settings_level.h b/src/wgt/step/step_check_settings_level.h
index 4267ab58d90b5902a96cbd2a1d711f56a847523f..9e903de7d2f7bb559a817c05c3d9bb67e9657599 100644 (file)
--- a/src/wgt/step/step_check_settings_level.h
+++ b/src/wgt/step/step_check_settings_level.h
@@ -5,10 +5,11 @@
 #ifndef WGT_STEP_STEP_CHECK_SETTINGS_LEVEL_H_
 #define WGT_STEP_STEP_CHECK_SETTINGS_LEVEL_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/app_installer.h"
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace wgt {
 namespace security {

diff --git a/src/wgt/step/step_create_symbolic_link.h b/src/wgt/step/step_create_symbolic_link.h
index 3b03bf7800566e4a39038ce1c5a55723dc86a015..470c0658c0fdbbf6ea40039c12200109534c0d8e 100644 (file)
--- a/src/wgt/step/step_create_symbolic_link.h
+++ b/src/wgt/step/step_create_symbolic_link.h
@@ -7,10 +7,11 @@
 
 #include <boost/filesystem.hpp>
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/app_installer.h"
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace wgt {
 namespace filesystem {

diff --git a/src/wgt/step/step_encrypt_resources.cc b/src/wgt/step/step_encrypt_resources.cc
index 0f5041d45913991996f0c62b7ebf21ecdfc45c02..482b3242eb15ed0b8ac4e1e8536c9c4c7b891bad 100644 (file)
--- a/src/wgt/step/step_encrypt_resources.cc
+++ b/src/wgt/step/step_encrypt_resources.cc
@@ -8,6 +8,9 @@
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/system/error_code.hpp>
+
+#include <manifest_parser/utils/logging.h>
+
 #include <algorithm>
 #include <cstdio>
 #include <cstdlib>
@@ -15,7 +18,6 @@
 #include <string>
 
 #include "common/utils/file_util.h"
-#include "common/utils/logging.h"
 
 namespace {
 

diff --git a/src/wgt/step/step_encrypt_resources.h b/src/wgt/step/step_encrypt_resources.h
index 1f3b6334c937f4058d28e47bd878d06d6fd321a6..9692c05e59eb4fb6b620abc2596ac5fb69b316f6 100644 (file)
--- a/src/wgt/step/step_encrypt_resources.h
+++ b/src/wgt/step/step_encrypt_resources.h
@@ -7,8 +7,9 @@
 
 #include <boost/filesystem/path.hpp>
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 #include "wgt/wgt_backend_data.h"
 
 namespace wgt {

diff --git a/src/wgt/step/step_parse.h b/src/wgt/step/step_parse.h
index 4009e491023212d716c2f7d27ce215b3da2cee7f..69df372b225c32f935beefe66543069510de259b 100644 (file)
--- a/src/wgt/step/step_parse.h
+++ b/src/wgt/step/step_parse.h
@@ -6,8 +6,10 @@
 #define WGT_STEP_STEP_PARSE_H_
 
 #include <boost/filesystem.hpp>
+
 #include <manifest_handlers/permissions_handler.h>
 #include <manifest_handlers/widget_config_parser.h>
+#include <manifest_parser/utils/logging.h>
 
 #include <memory>
 #include <set>
@@ -16,7 +18,6 @@
 #include "common/app_installer.h"
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace wgt {
 namespace parse {

diff --git a/src/wgt/step/step_parse_recovery.h b/src/wgt/step/step_parse_recovery.h
index e3e3c861d834a84761c173b31078672d9b2a6392..b5ed147d67f9c3e32463ce41afe99bff1ee8976e 100644 (file)
--- a/src/wgt/step/step_parse_recovery.h
+++ b/src/wgt/step/step_parse_recovery.h
@@ -5,7 +5,8 @@
 #ifndef WGT_STEP_STEP_PARSE_RECOVERY_H_
 #define WGT_STEP_STEP_PARSE_RECOVERY_H_
 
-#include "common/utils/logging.h"
+#include <manifest_parser/utils/logging.h>
+
 #include "wgt/step/step_parse.h"
 
 namespace wgt {

diff --git a/src/wgt/step/step_rds_modify.cc b/src/wgt/step/step_rds_modify.cc
index 9400bd6c2a0965207dce4106650f9afcad396bf7..2bf3ef29eb275063391f942800aba652b92b5217 100644 (file)
--- a/src/wgt/step/step_rds_modify.cc
+++ b/src/wgt/step/step_rds_modify.cc
@@ -6,8 +6,9 @@
 
 #include <boost/system/error_code.hpp>
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/utils/file_util.h"
-#include "common/utils/logging.h"
 
 namespace wgt {
 namespace rds {

diff --git a/src/wgt/step/step_rds_parse.cc b/src/wgt/step/step_rds_parse.cc
index b7243cca221e80024a2f36b39caf1fdb09128312..b98900ea1616145b3da0d68e6865eff5504699a5 100644 (file)
--- a/src/wgt/step/step_rds_parse.cc
+++ b/src/wgt/step/step_rds_parse.cc
@@ -4,9 +4,10 @@
 
 #include "wgt/step/step_rds_parse.h"
 
+#include <manifest_parser/utils/logging.h>
+
 #include <memory>
 
-#include "common/utils/logging.h"
 #include "wgt/rds_parser.h"
 #include "wgt/wgt_backend_data.h"
 

diff --git a/src/wgt/step/step_remove_encryption_data.cc b/src/wgt/step/step_remove_encryption_data.cc
index 6281d42a26df103ae73489f5974faf3239662201..452f32be1e5d500b09de17d467e0fb723324cdeb 100644 (file)
--- a/src/wgt/step/step_remove_encryption_data.cc
+++ b/src/wgt/step/step_remove_encryption_data.cc
@@ -6,8 +6,7 @@
 
 #include <web_app_enc.h>
 
-#include "common/utils/logging.h"
-
+#include <manifest_parser/utils/logging.h>
 
 namespace wgt {
 namespace encrypt {

diff --git a/src/wgt/step/step_remove_encryption_data.h b/src/wgt/step/step_remove_encryption_data.h
index 63068ca95444661c1329e5361cf9fb2b99b840d7..16f10861856cb81bae29ba9070ab8e1ec3bcac89 100644 (file)
--- a/src/wgt/step/step_remove_encryption_data.h
+++ b/src/wgt/step/step_remove_encryption_data.h
@@ -5,8 +5,9 @@
 #ifndef WGT_STEP_STEP_REMOVE_ENCRYPTION_DATA_H_
 #define WGT_STEP_STEP_REMOVE_ENCRYPTION_DATA_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace wgt {
 namespace encrypt {

diff --git a/src/wgt/step/step_wgt_copy_storage_directories.h b/src/wgt/step/step_wgt_copy_storage_directories.h
index 43764df5026a0a906cc606670109ae87c1b39195..3977a333ee7e572c35157ee44c5383263f4ff027 100644 (file)
--- a/src/wgt/step/step_wgt_copy_storage_directories.h
+++ b/src/wgt/step/step_wgt_copy_storage_directories.h
@@ -5,8 +5,9 @@
 #ifndef WGT_STEP_STEP_WGT_COPY_STORAGE_DIRECTORIES_H_
 #define WGT_STEP_STEP_WGT_COPY_STORAGE_DIRECTORIES_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/step/step_copy_storage_directories.h"
-#include "utils/logging.h"
 
 namespace wgt {
 namespace filesystem {

diff --git a/src/wgt/step/step_wgt_create_icons.h b/src/wgt/step/step_wgt_create_icons.h
index b29f7cf7ecfecfc3e2110dc5c09d5f80d3edd363..d8fe7a560faa6d9b0b7e5ab99f11dd8ab4352107 100644 (file)
--- a/src/wgt/step/step_wgt_create_icons.h
+++ b/src/wgt/step/step_wgt_create_icons.h
@@ -5,7 +5,8 @@
 #ifndef WGT_STEP_STEP_WGT_CREATE_ICONS_H_
 #define WGT_STEP_STEP_WGT_CREATE_ICONS_H_
 
-#include "common/utils/logging.h"
+#include <manifest_parser/utils/logging.h>
+
 #include "common/step/step_create_icons.h"
 
 namespace wgt {

diff --git a/src/wgt/step/step_wgt_create_storage_directories.h b/src/wgt/step/step_wgt_create_storage_directories.h
index e48be3aa109d920e4bea14d78bb93b3b0a3e106e..44015c1b46bbbd50e90d16ad8574ecdd2f08feee 100644 (file)
--- a/src/wgt/step/step_wgt_create_storage_directories.h
+++ b/src/wgt/step/step_wgt_create_storage_directories.h
@@ -5,8 +5,9 @@
 #ifndef WGT_STEP_STEP_WGT_CREATE_STORAGE_DIRECTORIES_H_
 #define WGT_STEP_STEP_WGT_CREATE_STORAGE_DIRECTORIES_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/step/step_create_storage_directories.h"
-#include "utils/logging.h"
 
 namespace wgt {
 namespace filesystem {

diff --git a/src/wgt/step/step_wgt_resource_directory.cc b/src/wgt/step/step_wgt_resource_directory.cc
index 617fc46075d2724cf5739390e7ff7ecea83b8059..26332e42157b999995969f01385b817aeab7d526 100644 (file)
--- a/src/wgt/step/step_wgt_resource_directory.cc
+++ b/src/wgt/step/step_wgt_resource_directory.cc
@@ -7,7 +7,6 @@
 #include <boost/filesystem/path.hpp>
 
 #include "common/utils/file_util.h"
-#include "common/utils/logging.h"
 
 namespace bf = boost::filesystem;
 namespace bs = boost::system;

diff --git a/src/wgt/step/step_wgt_resource_directory.h b/src/wgt/step/step_wgt_resource_directory.h
index 9689dcee4953f9a73fbadbd19db818537f88c25e..3ff82896b8fcfb2d8da22514b50fc6a04bc6fe2f 100644 (file)
--- a/src/wgt/step/step_wgt_resource_directory.h
+++ b/src/wgt/step/step_wgt_resource_directory.h
@@ -5,10 +5,11 @@
 #ifndef WGT_STEP_STEP_WGT_RESOURCE_DIRECTORY_H_
 #define WGT_STEP_STEP_WGT_RESOURCE_DIRECTORY_H_
 
+#include <manifest_parser/utils/logging.h>
+
 #include "common/app_installer.h"
 #include "common/installer_context.h"
 #include "common/step/step.h"
-#include "common/utils/logging.h"
 
 namespace wgt {
 namespace filesystem {

diff --git a/src/wgt/wgt_app_query_interface.cc b/src/wgt/wgt_app_query_interface.cc
index 4631d7c33c82d5475a07440d850e9616588b172c..cbd921aa14804427a69d09ad09f7d62690e466c5 100644 (file)
--- a/src/wgt/wgt_app_query_interface.cc
+++ b/src/wgt/wgt_app_query_interface.cc
@@ -15,6 +15,7 @@
 #include <manifest_handlers/tizen_application_handler.h>
 #include <manifest_handlers/widget_handler.h>
 #include <manifest_parser/manifest_parser.h>
+#include <manifest_parser/utils/logging.h>
 
 #include <memory>
 #include <string>
@@ -23,7 +24,6 @@
 #include "common/pkgmgr_registration.h"
 #include "common/request.h"
 #include "common/utils/file_util.h"
-#include "common/utils/logging.h"
 
 namespace bf = boost::filesystem;
 namespace bs = boost::system;