Rework step/ directory structure

Steps are moved to subdirectories according to their namespace.

Submit together with:
 - https://review.tizen.org/gerrit/61795
 - https://review.tizen.org/gerrit/61796
 - https://review.tizen.org/gerrit/61797

Build to verify, no logic changes were made.

Change-Id: I08544506f807598467db6d046bfd6ecea815a85b

diff --git a/packaging/tpk-backend.spec b/packaging/tpk-backend.spec
index 569cbc3..62f2389 100644 (file)
--- a/packaging/tpk-backend.spec
+++ b/packaging/tpk-backend.spec
@@ -64,7 +64,7 @@ ln -s %{_bindir}/tpk-backend %{buildroot}%{_sysconfdir}/package-manager/backend/
 
 %files devel
 %{_includedir}/app-installers/tpk/*.h
-%{_includedir}/app-installers/tpk/*/*.h
+%{_includedir}/app-installers/tpk/*/*/*.h
 %{_libdir}/pkgconfig/tpk-installer.pc
 
 %files tests

diff --git a/src/tpk/CMakeLists.txt b/src/tpk/CMakeLists.txt
index a7c76a5..ffc4627 100644 (file)
--- a/src/tpk/CMakeLists.txt
+++ b/src/tpk/CMakeLists.txt
@@ -1,13 +1,13 @@
 SET(SRCS
-    step/step_check_tpk_background_category.cc
-    step/step_create_symbolic_link.cc
-    step/step_parse_preload.cc
-    step/step_convert_xml.cc
-    step/step_tpk_patch_icons.cc
-    step/step_manifest_adjustment.cc
-    step/step_check_pkg_directory_path.cc
-    tpk_app_query_interface.cc
-    tpk_installer.cc
+  step/configuration/step_parse_preload.cc
+  step/filesystem/step_check_pkg_directory_path.cc
+  step/filesystem/step_create_symbolic_link.cc
+  step/filesystem/step_tpk_patch_icons.cc
+  step/pkgmgr/step_convert_xml.cc
+  step/pkgmgr/step_manifest_adjustment.cc
+  step/security/step_check_tpk_background_category.cc
+  tpk_app_query_interface.cc
+  tpk_installer.cc
 )
 ADD_LIBRARY(${TARGET_LIBNAME_TPK} SHARED ${SRCS})
 ADD_EXECUTABLE(${TARGET_TPK_BACKEND} "tpk_backend.cc")

diff --git a/src/tpk/step/step_parse_preload.cc b/src/tpk/step/configuration/step_parse_preload.cc
similarity index 85%
rename from src/tpk/step/step_parse_preload.cc
rename to src/tpk/step/configuration/step_parse_preload.cc
index ae6d5cc..0d572ee 100644 (file)
--- a/src/tpk/step/step_parse_preload.cc
+++ b/src/tpk/step/configuration/step_parse_preload.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#include "tpk/step/step_parse_preload.h"
+#include "tpk/step/configuration/step_parse_preload.h"
 
 #include <pkgmgr-info.h>
 #include <unistd.h>
@@ -16,12 +16,13 @@
 #include "common/pkgmgr_interface.h"
 #include "common/utils/file_util.h"
 
-namespace common_installer {
-namespace tpk {
-
 namespace bf = boost::filesystem;
+namespace ci = common_installer;
+
+namespace tpk {
+namespace configuration {
 
-Step::Status StepParsePreload::process() {
+ci::Step::Status StepParsePreload::process() {
   const char* preload_manifest_val = context_->manifest_data.get()->preload;
 
   if (strcmp(preload_manifest_val, "true") != 0) {
@@ -44,5 +45,5 @@ Step::Status StepParsePreload::process() {
   return Status::OK;
 }
 
+}  // namespace configuration
 }  // namespace tpk
-}  // namespace common_installer

diff --git a/src/tpk/step/step_parse_preload.h b/src/tpk/step/configuration/step_parse_preload.h
similarity index 74%
rename from src/tpk/step/step_parse_preload.h
rename to src/tpk/step/configuration/step_parse_preload.h
index 3eb7606..d0e02b5 100644 (file)
--- a/src/tpk/step/step_parse_preload.h
+++ b/src/tpk/step/configuration/step_parse_preload.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef TPK_STEP_STEP_PARSE_PRELOAD_H_
-#define TPK_STEP_STEP_PARSE_PRELOAD_H_
+#ifndef TPK_STEP_CONFIGURATION_STEP_PARSE_PRELOAD_H_
+#define TPK_STEP_CONFIGURATION_STEP_PARSE_PRELOAD_H_
 
 #include <manifest_parser/utils/logging.h>
 
 #include "common/installer_context.h"
 #include "common/step/step.h"
 
-namespace common_installer {
 namespace tpk {
+namespace configuration {
 
 class StepParsePreload : public common_installer::Step {
  public:
@@ -25,7 +25,7 @@ class StepParsePreload : public common_installer::Step {
   SCOPE_LOG_TAG(ParsePreload)
 };
 
+}  // namespace configuration
 }  // namespace tpk
-}  // namespace common_installer
 
-#endif  // TPK_STEP_STEP_PARSE_PRELOAD_H_
+#endif  // TPK_STEP_CONFIGURATION_STEP_PARSE_PRELOAD_H_

diff --git a/src/tpk/step/step_check_pkg_directory_path.cc b/src/tpk/step/filesystem/step_check_pkg_directory_path.cc
similarity index 93%
rename from src/tpk/step/step_check_pkg_directory_path.cc
rename to src/tpk/step/filesystem/step_check_pkg_directory_path.cc
index b0e70ae..ac22541 100644 (file)
--- a/src/tpk/step/step_check_pkg_directory_path.cc
+++ b/src/tpk/step/filesystem/step_check_pkg_directory_path.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#include "tpk/step/step_check_pkg_directory_path.h"
+#include "tpk/step/filesystem/step_check_pkg_directory_path.h"
 
 #include <boost/filesystem.hpp>
 #include <string>

diff --git a/src/tpk/step/step_check_pkg_directory_path.h b/src/tpk/step/filesystem/step_check_pkg_directory_path.h
similarity index 78%
rename from src/tpk/step/step_check_pkg_directory_path.h
rename to src/tpk/step/filesystem/step_check_pkg_directory_path.h
index 79d4f40..98453ef 100644 (file)
--- a/src/tpk/step/step_check_pkg_directory_path.h
+++ b/src/tpk/step/filesystem/step_check_pkg_directory_path.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef TPK_STEP_STEP_CHECK_PKG_DIRECTORY_PATH_H_
-#define TPK_STEP_STEP_CHECK_PKG_DIRECTORY_PATH_H_
+#ifndef TPK_STEP_FILESYSTEM_STEP_CHECK_PKG_DIRECTORY_PATH_H_
+#define TPK_STEP_FILESYSTEM_STEP_CHECK_PKG_DIRECTORY_PATH_H_
 
 #include <manifest_parser/utils/logging.h>
 
@@ -28,4 +28,4 @@ class StepCheckPkgDirPath : public common_installer::Step {
 }  // namespace filesystem
 }  // namespace tpk
 
-#endif  // TPK_STEP_STEP_CHECK_PKG_DIRECTORY_PATH_H_
+#endif  // TPK_STEP_FILESYSTEM_STEP_CHECK_PKG_DIRECTORY_PATH_H_

diff --git a/src/tpk/step/step_create_symbolic_link.cc b/src/tpk/step/filesystem/step_create_symbolic_link.cc
similarity index 98%
rename from src/tpk/step/step_create_symbolic_link.cc
rename to src/tpk/step/filesystem/step_create_symbolic_link.cc
index 7ba86fe..6033e36 100644 (file)
--- a/src/tpk/step/step_create_symbolic_link.cc
+++ b/src/tpk/step/filesystem/step_create_symbolic_link.cc
@@ -1,5 +1,6 @@
 /* Copyright 2015 Samsung Electronics, license APACHE-2.0, see LICENSE file */
-#include "tpk/step/step_create_symbolic_link.h"
+
+#include "tpk/step/filesystem/step_create_symbolic_link.h"
 
 #include <boost/filesystem.hpp>
 #include <boost/system/error_code.hpp>

diff --git a/src/tpk/step/step_create_symbolic_link.h b/src/tpk/step/filesystem/step_create_symbolic_link.h
similarity index 75%
rename from src/tpk/step/step_create_symbolic_link.h
rename to src/tpk/step/filesystem/step_create_symbolic_link.h
index 999dbe1..8b9a6ac 100644 (file)
--- a/src/tpk/step/step_create_symbolic_link.h
+++ b/src/tpk/step/filesystem/step_create_symbolic_link.h
@@ -1,6 +1,7 @@
 /* Copyright 2015 Samsung Electronics, license APACHE-2.0, see LICENSE file */
-#ifndef TPK_STEP_STEP_CREATE_SYMBOLIC_LINK_H_
-#define TPK_STEP_STEP_CREATE_SYMBOLIC_LINK_H_
+
+#ifndef TPK_STEP_FILESYSTEM_STEP_CREATE_SYMBOLIC_LINK_H_
+#define TPK_STEP_FILESYSTEM_STEP_CREATE_SYMBOLIC_LINK_H_
 
 #include <manifest_parser/utils/logging.h>
 
@@ -23,4 +24,4 @@ class StepCreateSymbolicLink : public common_installer::Step {
 }  // namespace filesystem
 }  // namespace tpk
 
-#endif  // TPK_STEP_STEP_CREATE_SYMBOLIC_LINK_H_
+#endif  // TPK_STEP_FILESYSTEM_STEP_CREATE_SYMBOLIC_LINK_H_

diff --git a/src/tpk/step/step_tpk_patch_icons.cc b/src/tpk/step/filesystem/step_tpk_patch_icons.cc
similarity index 98%
rename from src/tpk/step/step_tpk_patch_icons.cc
rename to src/tpk/step/filesystem/step_tpk_patch_icons.cc
index 7058b57..8d2df81 100644 (file)
--- a/src/tpk/step/step_tpk_patch_icons.cc
+++ b/src/tpk/step/filesystem/step_tpk_patch_icons.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#include "tpk/step/step_tpk_patch_icons.h"
+#include "tpk/step/filesystem/step_tpk_patch_icons.h"
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/system/error_code.hpp>

diff --git a/src/tpk/step/step_tpk_patch_icons.h b/src/tpk/step/filesystem/step_tpk_patch_icons.h
similarity index 87%
rename from src/tpk/step/step_tpk_patch_icons.h
rename to src/tpk/step/filesystem/step_tpk_patch_icons.h
index 556da10..a3806b1 100644 (file)
--- a/src/tpk/step/step_tpk_patch_icons.h
+++ b/src/tpk/step/filesystem/step_tpk_patch_icons.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef TPK_STEP_STEP_TPK_PATCH_ICONS_H_
-#define TPK_STEP_STEP_TPK_PATCH_ICONS_H_
+#ifndef TPK_STEP_FILESYSTEM_STEP_TPK_PATCH_ICONS_H_
+#define TPK_STEP_FILESYSTEM_STEP_TPK_PATCH_ICONS_H_
 
 #include <boost/filesystem/path.hpp>
 
@@ -40,4 +40,4 @@ class StepTpkPatchIcons : public common_installer::Step {
 }  // namespace filesystem
 }  // namespace tpk
 
-#endif  // TPK_STEP_STEP_TPK_PATCH_ICONS_H_
+#endif  // TPK_STEP_FILESYSTEM_STEP_TPK_PATCH_ICONS_H_

diff --git a/src/tpk/step/step_convert_xml.cc b/src/tpk/step/pkgmgr/step_convert_xml.cc
similarity index 98%
rename from src/tpk/step/step_convert_xml.cc
rename to src/tpk/step/pkgmgr/step_convert_xml.cc
index 6d4fce7..3da2cef 100644 (file)
--- a/src/tpk/step/step_convert_xml.cc
+++ b/src/tpk/step/pkgmgr/step_convert_xml.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#include "tpk/step/step_convert_xml.h"
+#include "tpk/step/pkgmgr/step_convert_xml.h"
 
 #include <pkgmgr_parser.h>
 #include <pkgmgr-info.h>

diff --git a/src/tpk/step/step_convert_xml.h b/src/tpk/step/pkgmgr/step_convert_xml.h
similarity index 83%
rename from src/tpk/step/step_convert_xml.h
rename to src/tpk/step/pkgmgr/step_convert_xml.h
index 8a215a6..12332f6 100644 (file)
--- a/src/tpk/step/step_convert_xml.h
+++ b/src/tpk/step/pkgmgr/step_convert_xml.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef TPK_STEP_STEP_CONVERT_XML_H_
-#define TPK_STEP_STEP_CONVERT_XML_H_
+#ifndef TPK_STEP_PKGMGR_STEP_CONVERT_XML_H_
+#define TPK_STEP_PKGMGR_STEP_CONVERT_XML_H_
 
 #include <manifest_parser/utils/logging.h>
 
@@ -34,4 +34,4 @@ class StepConvertXml : public common_installer::Step {
 }  // namespace pkgmgr
 }  // namespace tpk
 
-#endif  // TPK_STEP_STEP_CONVERT_XML_H_
+#endif  // TPK_STEP_PKGMGR_STEP_CONVERT_XML_H_

diff --git a/src/tpk/step/step_manifest_adjustment.cc b/src/tpk/step/pkgmgr/step_manifest_adjustment.cc
similarity index 97%
rename from src/tpk/step/step_manifest_adjustment.cc
rename to src/tpk/step/pkgmgr/step_manifest_adjustment.cc
index 88f18ba..e26ebd5 100644 (file)
--- a/src/tpk/step/step_manifest_adjustment.cc
+++ b/src/tpk/step/pkgmgr/step_manifest_adjustment.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#include "tpk/step/step_manifest_adjustment.h"
+#include "tpk/step/pkgmgr/step_manifest_adjustment.h"
 
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>

diff --git a/src/tpk/step/step_manifest_adjustment.h b/src/tpk/step/pkgmgr/step_manifest_adjustment.h
similarity index 80%
rename from src/tpk/step/step_manifest_adjustment.h
rename to src/tpk/step/pkgmgr/step_manifest_adjustment.h
index 31f3314..9bac6ed 100644 (file)
--- a/src/tpk/step/step_manifest_adjustment.h
+++ b/src/tpk/step/pkgmgr/step_manifest_adjustment.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef TPK_STEP_STEP_MANIFEST_ADJUSTMENT_H_
-#define TPK_STEP_STEP_MANIFEST_ADJUSTMENT_H_
+#ifndef TPK_STEP_PKGMGR_STEP_MANIFEST_ADJUSTMENT_H_
+#define TPK_STEP_PKGMGR_STEP_MANIFEST_ADJUSTMENT_H_
 
 #include <manifest_parser/utils/logging.h>
 
@@ -32,4 +32,4 @@ class StepManifestAdjustment : public common_installer::Step {
 }  // namespace pkgmgr
 }  // namespace tpk
 
-#endif  // TPK_STEP_STEP_MANIFEST_ADJUSTMENT_H_
+#endif  // TPK_STEP_PKGMGR_STEP_MANIFEST_ADJUSTMENT_H_

diff --git a/src/tpk/step/step_check_tpk_background_category.cc b/src/tpk/step/security/step_check_tpk_background_category.cc
similarity index 90%
rename from src/tpk/step/step_check_tpk_background_category.cc
rename to src/tpk/step/security/step_check_tpk_background_category.cc
index 47c7729..30a207f 100644 (file)
--- a/src/tpk/step/step_check_tpk_background_category.cc
+++ b/src/tpk/step/security/step_check_tpk_background_category.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#include "tpk/step/step_check_tpk_background_category.h"
+#include "tpk/step/security/step_check_tpk_background_category.h"
 
 #include <common/installer_context.h>
 

diff --git a/src/tpk/step/step_check_tpk_background_category.h b/src/tpk/step/security/step_check_tpk_background_category.h
similarity index 74%
rename from src/tpk/step/step_check_tpk_background_category.h
rename to src/tpk/step/security/step_check_tpk_background_category.h
index e4bf312..445e4b7 100644 (file)
--- a/src/tpk/step/step_check_tpk_background_category.h
+++ b/src/tpk/step/security/step_check_tpk_background_category.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef TPK_STEP_STEP_CHECK_TPK_BACKGROUND_CATEGORY_H_
-#define TPK_STEP_STEP_CHECK_TPK_BACKGROUND_CATEGORY_H_
+#ifndef TPK_STEP_SECURITY_STEP_CHECK_TPK_BACKGROUND_CATEGORY_H_
+#define TPK_STEP_SECURITY_STEP_CHECK_TPK_BACKGROUND_CATEGORY_H_
 
 #include <manifest_parser/utils/version_number.h>
 
-#include <common/step/step_check_background_category.h>
+#include <common/step/security/step_check_background_category.h>
 
 namespace tpk {
 namespace security {
@@ -29,4 +29,4 @@ class StepCheckTpkBackgroundCategory :
 }  // namespace security
 }  // namespace tpk
 
-#endif  // TPK_STEP_STEP_CHECK_TPK_BACKGROUND_CATEGORY_H_
+#endif  // TPK_STEP_SECURITY_STEP_CHECK_TPK_BACKGROUND_CATEGORY_H_

diff --git a/src/tpk/tpk_installer.cc b/src/tpk/tpk_installer.cc
index 27c3e67..1268042 100644 (file)
--- a/src/tpk/tpk_installer.cc
+++ b/src/tpk/tpk_installer.cc
@@ -2,57 +2,57 @@
 #include "tpk/tpk_installer.h"
 
 #include <common/app_installer.h>
-#include <common/step/step_configure.h>
-#include <common/step/step_backup_icons.h>
-#include <common/step/step_backup_manifest.h>
-#include <common/step/step_clear_data.h>
-#include <common/step/step_create_icons.h>
-#include <common/step/step_create_storage_directories.h>
-#include <common/step/step_create_per_user_storage_directories.h>
-#include <common/step/step_copy.h>
-#include <common/step/step_copy_tep.h>
-#include <common/step/step_copy_backup.h>
-#include <common/step/step_copy_storage_directories.h>
-#include <common/step/step_check_old_certificate.h>
-#include <common/step/step_check_blacklist.h>
-#include <common/step/step_check_removable.h>
-#include <common/step/step_delta_patch.h>
-#include <common/step/step_fail.h>
-#include <common/step/step_kill_apps.h>
-#include <common/step/step_open_recovery_file.h>
-#include <common/step/step_parse_manifest.h>
-#include <common/step/step_privilege_compatibility.h>
-#include <common/step/step_recover_application.h>
-#include <common/step/step_recover_files.h>
-#include <common/step/step_recover_icons.h>
-#include <common/step/step_recover_manifest.h>
-#include <common/step/step_recover_security.h>
-#include <common/step/step_recover_storage_directories.h>
-#include <common/step/step_register_app.h>
-#include <common/step/step_remove_icons.h>
-#include <common/step/step_remove_files.h>
-#include <common/step/step_revoke_security.h>
-#include <common/step/step_remove_temporary_directory.h>
-#include <common/step/step_remove_per_user_storage_directories.h>
-#include <common/step/step_register_security.h>
-#include <common/step/step_rollback_deinstallation_security.h>
-#include <common/step/step_rollback_installation_security.h>
-#include <common/step/step_run_parser_plugins.h>
-#include <common/step/step_check_signature.h>
-#include <common/step/step_unregister_app.h>
-#include <common/step/step_unzip.h>
-#include <common/step/step_update_app.h>
-#include <common/step/step_update_security.h>
-#include <common/step/step_update_tep.h>
-#include "common/step/step_remove_manifest.h"
+#include <common/step/backup/step_backup_icons.h>
+#include <common/step/backup/step_backup_manifest.h>
+#include <common/step/backup/step_copy_backup.h>
+#include <common/step/configuration/step_configure.h>
+#include <common/step/configuration/step_fail.h>
+#include <common/step/configuration/step_parse_manifest.h>
+#include <common/step/filesystem/step_clear_data.h>
+#include <common/step/filesystem/step_copy.h>
+#include <common/step/filesystem/step_copy_storage_directories.h>
+#include <common/step/filesystem/step_copy_tep.h>
+#include <common/step/filesystem/step_create_icons.h>
+#include <common/step/filesystem/step_create_per_user_storage_directories.h>
+#include <common/step/filesystem/step_create_storage_directories.h>
+#include <common/step/filesystem/step_delta_patch.h>
+#include <common/step/filesystem/step_recover_files.h>
+#include <common/step/filesystem/step_recover_icons.h>
+#include <common/step/filesystem/step_recover_manifest.h>
+#include <common/step/filesystem/step_recover_storage_directories.h>
+#include <common/step/filesystem/step_remove_files.h>
+#include <common/step/filesystem/step_remove_icons.h>
+#include <common/step/filesystem/step_remove_per_user_storage_directories.h>
+#include <common/step/filesystem/step_remove_temporary_directory.h>
+#include <common/step/filesystem/step_unzip.h>
+#include <common/step/pkgmgr/step_check_blacklist.h>
+#include <common/step/pkgmgr/step_check_removable.h>
+#include <common/step/pkgmgr/step_kill_apps.h>
+#include <common/step/pkgmgr/step_recover_application.h>
+#include <common/step/pkgmgr/step_register_app.h>
+#include <common/step/pkgmgr/step_remove_manifest.h>
+#include <common/step/pkgmgr/step_run_parser_plugins.h>
+#include <common/step/pkgmgr/step_unregister_app.h>
+#include <common/step/pkgmgr/step_update_app.h>
+#include <common/step/pkgmgr/step_update_tep.h>
+#include <common/step/recovery/step_open_recovery_file.h>
+#include <common/step/security/step_check_old_certificate.h>
+#include <common/step/security/step_check_signature.h>
+#include <common/step/security/step_privilege_compatibility.h>
+#include <common/step/security/step_recover_security.h>
+#include <common/step/security/step_register_security.h>
+#include <common/step/security/step_revoke_security.h>
+#include <common/step/security/step_rollback_deinstallation_security.h>
+#include <common/step/security/step_rollback_installation_security.h>
+#include <common/step/security/step_update_security.h>
 
-#include "tpk/step/step_check_tpk_background_category.h"
-#include "tpk/step/step_create_symbolic_link.h"
-#include "tpk/step/step_manifest_adjustment.h"
-#include "tpk/step/step_parse_preload.h"
-#include "tpk/step/step_convert_xml.h"
-#include "tpk/step/step_tpk_patch_icons.h"
-#include "tpk/step/step_check_pkg_directory_path.h"
+#include "tpk/step/configuration/step_parse_preload.h"
+#include "tpk/step/filesystem/step_create_symbolic_link.h"
+#include "tpk/step/filesystem/step_tpk_patch_icons.h"
+#include "tpk/step/filesystem/step_check_pkg_directory_path.h"
+#include "tpk/step/pkgmgr/step_convert_xml.h"
+#include "tpk/step/pkgmgr/step_manifest_adjustment.h"
+#include "tpk/step/security/step_check_tpk_background_category.h"
 
 namespace ci = common_installer;
 
@@ -110,11 +110,11 @@ void TpkInstaller::Prepare() {
 void TpkInstaller::InstallSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
   AddStep<ci::filesystem::StepUnzip>();
-  AddStep<ci::parse::StepParseManifest>(
-      ci::parse::StepParseManifest::ManifestLocation::PACKAGE,
-      ci::parse::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::tpk::StepParsePreload>();
-  AddStep<ci::blacklist::StepCheckBlacklist>();
+  AddStep<ci::configuration::StepParseManifest>(
+      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
+      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<tpk::configuration::StepParsePreload>();
+  AddStep<ci::pkgmgr::StepCheckBlacklist>();
   AddStep<ci::security::StepCheckSignature>();
   AddStep<ci::security::StepPrivilegeCompatibility>();
   AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
@@ -137,18 +137,18 @@ void TpkInstaller::InstallSteps() {
 void TpkInstaller::UpdateSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
   AddStep<ci::filesystem::StepUnzip>();
-  AddStep<ci::parse::StepParseManifest>(
-      ci::parse::StepParseManifest::ManifestLocation::PACKAGE,
-      ci::parse::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::tpk::StepParsePreload>();
-  AddStep<ci::blacklist::StepCheckBlacklist>();
+  AddStep<ci::configuration::StepParseManifest>(
+      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
+      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<tpk::configuration::StepParsePreload>();
+  AddStep<ci::pkgmgr::StepCheckBlacklist>();
   AddStep<ci::security::StepCheckSignature>();
   AddStep<ci::security::StepPrivilegeCompatibility>();
   AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
   AddStep<ci::security::StepCheckOldCertificate>();
-  AddStep<ci::parse::StepParseManifest>(
-      ci::parse::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::parse::StepParseManifest::StoreLocation::BACKUP);
+  AddStep<ci::configuration::StepParseManifest>(
+      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
+      ci::configuration::StepParseManifest::StoreLocation::BACKUP);
   AddStep<ci::pkgmgr::StepKillApps>();
   AddStep<ci::backup::StepBackupManifest>();
   AddStep<ci::backup::StepBackupIcons>();
@@ -171,9 +171,9 @@ void TpkInstaller::UpdateSteps() {
 void TpkInstaller::UninstallSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
   AddStep<ci::pkgmgr::StepCheckRemovable>();
-  AddStep<ci::parse::StepParseManifest>(
-      ci::parse::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::parse::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<ci::configuration::StepParseManifest>(
+      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
+      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Uninstall);
   AddStep<ci::pkgmgr::StepKillApps>();
@@ -193,18 +193,18 @@ void TpkInstaller::ReinstallSteps() {
 void TpkInstaller::DeltaSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
   AddStep<ci::filesystem::StepUnzip>();
-  AddStep<ci::parse::StepParseManifest>(
-      ci::parse::StepParseManifest::ManifestLocation::PACKAGE,
-      ci::parse::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<ci::configuration::StepParseManifest>(
+      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
+      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   AddStep<ci::filesystem::StepDeltaPatch>();
-  AddStep<ci::blacklist::StepCheckBlacklist>();
+  AddStep<ci::pkgmgr::StepCheckBlacklist>();
   AddStep<ci::security::StepCheckSignature>();
   AddStep<ci::security::StepPrivilegeCompatibility>();
   AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
   AddStep<ci::security::StepCheckOldCertificate>();
-  AddStep<ci::parse::StepParseManifest>(
-      ci::parse::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::parse::StepParseManifest::StoreLocation::BACKUP);
+  AddStep<ci::configuration::StepParseManifest>(
+      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
+      ci::configuration::StepParseManifest::StoreLocation::BACKUP);
   AddStep<ci::pkgmgr::StepKillApps>();
   AddStep<ci::backup::StepBackupManifest>();
   AddStep<ci::backup::StepBackupIcons>();
@@ -222,9 +222,9 @@ void TpkInstaller::DeltaSteps() {
 void TpkInstaller::RecoverySteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
   AddStep<ci::recovery::StepOpenRecoveryFile>();
-  AddStep<ci::parse::StepParseManifest>(
-      ci::parse::StepParseManifest::ManifestLocation::RECOVERY,
-      ci::parse::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<ci::configuration::StepParseManifest>(
+      ci::configuration::StepParseManifest::ManifestLocation::RECOVERY,
+      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   AddStep<ci::pkgmgr::StepRecoverApplication>();
   AddStep<ci::filesystem::StepRemoveTemporaryDirectory>();
   AddStep<ci::filesystem::StepRecoverIcons>();
@@ -237,10 +237,10 @@ void TpkInstaller::RecoverySteps() {
 void TpkInstaller::ManifestDirectInstallSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
   AddStep<tpk::filesystem::StepCheckPkgDirPath>();
-  AddStep<ci::parse::StepParseManifest>(
-      ci::parse::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::parse::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::tpk::StepParsePreload>();
+  AddStep<ci::configuration::StepParseManifest>(
+      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
+      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<tpk::configuration::StepParsePreload>();
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
   AddStep<ci::security::StepCheckSignature>();
   AddStep<ci::security::StepPrivilegeCompatibility>();
@@ -255,10 +255,10 @@ void TpkInstaller::ManifestDirectInstallSteps() {
 
 void TpkInstaller::ManifestDirectUpdateSteps() {
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::parse::StepParseManifest>(
-      ci::parse::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::parse::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::tpk::StepParsePreload>();
+  AddStep<ci::configuration::StepParseManifest>(
+      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
+      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+  AddStep<tpk::configuration::StepParsePreload>();
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
   AddStep<ci::security::StepCheckSignature>();
   AddStep<ci::security::StepPrivilegeCompatibility>();

diff --git a/src/unit_tests/manifest_test.cc b/src/unit_tests/manifest_test.cc
index 05cff1a..312cc4f 100644 (file)
--- a/src/unit_tests/manifest_test.cc
+++ b/src/unit_tests/manifest_test.cc
@@ -18,9 +18,9 @@ const char kManifestTestcaseData[] =
 
 bool StepParseRunner::Run() {
   PrepareContext();
-  ci::parse::StepParseManifest step(context_.get(),
-      ci::parse::StepParseManifest::ManifestLocation::PACKAGE,
-      ci::parse::StepParseManifest::StoreLocation::NORMAL);
+  ci::configuration::StepParseManifest step(context_.get(),
+      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
+      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   return step.process() == ci::Step::Status::OK;
 }
 

diff --git a/src/unit_tests/manifest_test.h b/src/unit_tests/manifest_test.h
index 08f5c55..761dd69 100644 (file)
--- a/src/unit_tests/manifest_test.h
+++ b/src/unit_tests/manifest_test.h
@@ -9,7 +9,7 @@
 
 #include <common/installer_context.h>
 #include <common/request.h>
-#include <common/step/step_parse_manifest.h>
+#include <common/step/configuration/step_parse_manifest.h>
 #include <common/utils/glist_range.h>
 
 #include <glib.h>

diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc
index 4fedfa1..799ad2b 100644 (file)
--- a/src/unit_tests/smoke_test.cc
+++ b/src/unit_tests/smoke_test.cc
@@ -11,7 +11,7 @@
 #include <common/pkgmgr_interface.h>
 #include <common/pkgmgr_registration.h>
 #include <common/request.h>
-#include <common/step/step_fail.h>
+#include <common/step/configuration/step_fail.h>
 #include <common/utils/subprocess.h>
 
 #include <gtest/gtest.h>