From 6c322d9d2f91dc4fe298bae8d52ce720e825fbcf Mon Sep 17 00:00:00 2001 From: Tomasz Iwanek Date: Thu, 10 Mar 2016 13:08:12 +0100 Subject: [PATCH] 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: I52132e9bff5efa6ede8f43c3ef6cd6bbd3064097 --- src/common/CMakeLists.txt | 90 +++++++++++----------- src/common/step/{ => backup}/step_backup_icons.cc | 2 +- src/common/step/{ => backup}/step_backup_icons.h | 6 +- .../step/{ => backup}/step_backup_manifest.cc | 2 +- .../step/{ => backup}/step_backup_manifest.h | 6 +- src/common/step/{ => backup}/step_copy_backup.cc | 2 +- src/common/step/{ => backup}/step_copy_backup.h | 6 +- .../step/{ => configuration}/step_configure.cc | 2 +- .../step/{ => configuration}/step_configure.h | 6 +- src/common/step/{ => configuration}/step_fail.cc | 2 +- src/common/step/{ => configuration}/step_fail.h | 6 +- .../{ => configuration}/step_parse_manifest.cc | 6 +- .../step/{ => configuration}/step_parse_manifest.h | 10 +-- .../step/{ => filesystem}/step_clear_data.cc | 2 +- src/common/step/{ => filesystem}/step_clear_data.h | 6 +- src/common/step/{ => filesystem}/step_copy.cc | 2 +- src/common/step/{ => filesystem}/step_copy.h | 6 +- .../step_copy_storage_directories.cc | 2 +- .../step_copy_storage_directories.h | 6 +- src/common/step/{ => filesystem}/step_copy_tep.cc | 2 +- src/common/step/{ => filesystem}/step_copy_tep.h | 6 +- .../step/{ => filesystem}/step_create_icons.cc | 2 +- .../step/{ => filesystem}/step_create_icons.h | 6 +- .../step_create_per_user_storage_directories.cc | 2 +- .../step_create_per_user_storage_directories.h | 6 +- .../step_create_storage_directories.cc | 2 +- .../step_create_storage_directories.h | 6 +- .../step/{ => filesystem}/step_delta_patch.cc | 2 +- .../step/{ => filesystem}/step_delta_patch.h | 6 +- .../step/{ => filesystem}/step_recover_files.cc | 2 +- .../step/{ => filesystem}/step_recover_files.h | 8 +- .../step/{ => filesystem}/step_recover_icons.cc | 2 +- .../step/{ => filesystem}/step_recover_icons.h | 8 +- .../step/{ => filesystem}/step_recover_manifest.cc | 2 +- .../step/{ => filesystem}/step_recover_manifest.h | 8 +- .../step_recover_storage_directories.cc | 2 +- .../step_recover_storage_directories.h | 8 +- .../step/{ => filesystem}/step_remove_files.cc | 2 +- .../step/{ => filesystem}/step_remove_files.h | 6 +- .../step/{ => filesystem}/step_remove_icons.cc | 2 +- .../step/{ => filesystem}/step_remove_icons.h | 6 +- .../step_remove_per_user_storage_directories.cc | 2 +- .../step_remove_per_user_storage_directories.h | 6 +- .../step_remove_temporary_directory.cc | 2 +- .../step_remove_temporary_directory.h | 8 +- src/common/step/{ => filesystem}/step_unzip.cc | 2 +- src/common/step/{ => filesystem}/step_unzip.h | 6 +- .../step/{ => pkgmgr}/step_check_blacklist.cc | 6 +- .../step/{ => pkgmgr}/step_check_blacklist.h | 10 +-- .../step/{ => pkgmgr}/step_check_removable.cc | 2 +- .../step/{ => pkgmgr}/step_check_removable.h | 6 +- src/common/step/{ => pkgmgr}/step_kill_apps.cc | 2 +- src/common/step/{ => pkgmgr}/step_kill_apps.h | 6 +- .../step/{ => pkgmgr}/step_recover_application.cc | 2 +- .../step/{ => pkgmgr}/step_recover_application.h | 8 +- src/common/step/{ => pkgmgr}/step_register_app.cc | 2 +- src/common/step/{ => pkgmgr}/step_register_app.h | 6 +- .../step/{ => pkgmgr}/step_remove_manifest.cc | 2 +- .../step/{ => pkgmgr}/step_remove_manifest.h | 6 +- .../step/{ => pkgmgr}/step_run_parser_plugins.cc | 2 +- .../step/{ => pkgmgr}/step_run_parser_plugins.h | 6 +- .../step/{ => pkgmgr}/step_unregister_app.cc | 3 +- src/common/step/{ => pkgmgr}/step_unregister_app.h | 6 +- src/common/step/{ => pkgmgr}/step_update_app.cc | 2 +- src/common/step/{ => pkgmgr}/step_update_app.h | 6 +- src/common/step/{ => pkgmgr}/step_update_tep.cc | 2 +- src/common/step/{ => pkgmgr}/step_update_tep.h | 6 +- .../step/{ => recovery}/step_open_recovery_file.cc | 2 +- .../step/{ => recovery}/step_open_recovery_file.h | 6 +- src/common/step/{ => recovery}/step_recovery.cc | 2 +- src/common/step/{ => recovery}/step_recovery.h | 6 +- .../step_check_background_category.cc | 2 +- .../step_check_background_category.h | 6 +- .../{ => security}/step_check_old_certificate.cc | 2 +- .../{ => security}/step_check_old_certificate.h | 6 +- .../step/{ => security}/step_check_signature.cc | 2 +- .../step/{ => security}/step_check_signature.h | 6 +- .../{ => security}/step_privilege_compatibility.cc | 2 +- .../{ => security}/step_privilege_compatibility.h | 6 +- .../step/{ => security}/step_recover_security.cc | 2 +- .../step/{ => security}/step_recover_security.h | 8 +- .../step/{ => security}/step_register_security.cc | 2 +- .../step/{ => security}/step_register_security.h | 6 +- .../step/{ => security}/step_revoke_security.cc | 2 +- .../step/{ => security}/step_revoke_security.h | 6 +- .../step_rollback_deinstallation_security.cc | 2 +- .../step_rollback_deinstallation_security.h | 6 +- .../step_rollback_installation_security.cc | 2 +- .../step_rollback_installation_security.h | 6 +- .../step/{ => security}/step_update_security.cc | 2 +- .../step/{ => security}/step_update_security.h | 6 +- src/unit_tests/signature_unittest.cc | 2 +- 92 files changed, 242 insertions(+), 241 deletions(-) rename src/common/step/{ => backup}/step_backup_icons.cc (97%) rename src/common/step/{ => backup}/step_backup_icons.h (90%) rename src/common/step/{ => backup}/step_backup_manifest.cc (97%) rename src/common/step/{ => backup}/step_backup_manifest.h (87%) rename src/common/step/{ => backup}/step_copy_backup.cc (98%) rename src/common/step/{ => backup}/step_copy_backup.h (91%) rename src/common/step/{ => configuration}/step_configure.cc (99%) rename src/common/step/{ => configuration}/step_configure.h (91%) rename src/common/step/{ => configuration}/step_fail.cc (89%) rename src/common/step/{ => configuration}/step_fail.h (85%) rename src/common/step/{ => configuration}/step_parse_manifest.cc (99%) rename src/common/step/{ => configuration}/step_parse_manifest.h (94%) rename src/common/step/{ => filesystem}/step_clear_data.cc (96%) rename src/common/step/{ => filesystem}/step_clear_data.h (83%) rename src/common/step/{ => filesystem}/step_copy.cc (98%) rename src/common/step/{ => filesystem}/step_copy.h (90%) rename src/common/step/{ => filesystem}/step_copy_storage_directories.cc (97%) rename src/common/step/{ => filesystem}/step_copy_storage_directories.h (88%) rename src/common/step/{ => filesystem}/step_copy_tep.cc (97%) rename src/common/step/{ => filesystem}/step_copy_tep.h (89%) rename src/common/step/{ => filesystem}/step_create_icons.cc (97%) rename src/common/step/{ => filesystem}/step_create_icons.h (87%) rename src/common/step/{ => filesystem}/step_create_per_user_storage_directories.cc (92%) rename src/common/step/{ => filesystem}/step_create_per_user_storage_directories.h (82%) rename src/common/step/{ => filesystem}/step_create_storage_directories.cc (97%) rename src/common/step/{ => filesystem}/step_create_storage_directories.h (86%) rename src/common/step/{ => filesystem}/step_delta_patch.cc (99%) rename src/common/step/{ => filesystem}/step_delta_patch.h (91%) rename src/common/step/{ => filesystem}/step_recover_files.cc (97%) rename src/common/step/{ => filesystem}/step_recover_files.h (80%) rename src/common/step/{ => filesystem}/step_recover_icons.cc (97%) rename src/common/step/{ => filesystem}/step_recover_icons.h (83%) rename src/common/step/{ => filesystem}/step_recover_manifest.cc (97%) rename src/common/step/{ => filesystem}/step_recover_manifest.h (80%) rename src/common/step/{ => filesystem}/step_recover_storage_directories.cc (94%) rename src/common/step/{ => filesystem}/step_recover_storage_directories.h (82%) rename src/common/step/{ => filesystem}/step_remove_files.cc (97%) rename src/common/step/{ => filesystem}/step_remove_files.h (80%) rename src/common/step/{ => filesystem}/step_remove_icons.cc (96%) rename src/common/step/{ => filesystem}/step_remove_icons.h (82%) rename src/common/step/{ => filesystem}/step_remove_per_user_storage_directories.cc (92%) rename src/common/step/{ => filesystem}/step_remove_per_user_storage_directories.h (82%) rename src/common/step/{ => filesystem}/step_remove_temporary_directory.cc (93%) rename src/common/step/{ => filesystem}/step_remove_temporary_directory.h (77%) rename src/common/step/{ => filesystem}/step_unzip.cc (98%) rename src/common/step/{ => filesystem}/step_unzip.h (90%) rename src/common/step/{ => pkgmgr}/step_check_blacklist.cc (92%) rename src/common/step/{ => pkgmgr}/step_check_blacklist.h (72%) rename src/common/step/{ => pkgmgr}/step_check_removable.cc (95%) rename src/common/step/{ => pkgmgr}/step_check_removable.h (78%) rename src/common/step/{ => pkgmgr}/step_kill_apps.cc (97%) rename src/common/step/{ => pkgmgr}/step_kill_apps.h (87%) rename src/common/step/{ => pkgmgr}/step_recover_application.cc (97%) rename src/common/step/{ => pkgmgr}/step_recover_application.h (79%) rename src/common/step/{ => pkgmgr}/step_register_app.cc (97%) rename src/common/step/{ => pkgmgr}/step_register_app.h (78%) rename src/common/step/{ => pkgmgr}/step_remove_manifest.cc (94%) rename src/common/step/{ => pkgmgr}/step_remove_manifest.h (85%) rename src/common/step/{ => pkgmgr}/step_run_parser_plugins.cc (97%) rename src/common/step/{ => pkgmgr}/step_run_parser_plugins.h (86%) rename src/common/step/{ => pkgmgr}/step_unregister_app.cc (98%) rename src/common/step/{ => pkgmgr}/step_unregister_app.h (82%) rename src/common/step/{ => pkgmgr}/step_update_app.cc (98%) rename src/common/step/{ => pkgmgr}/step_update_app.h (82%) rename src/common/step/{ => pkgmgr}/step_update_tep.cc (96%) rename src/common/step/{ => pkgmgr}/step_update_tep.h (82%) rename src/common/step/{ => recovery}/step_open_recovery_file.cc (96%) rename src/common/step/{ => recovery}/step_open_recovery_file.h (79%) rename src/common/step/{ => recovery}/step_recovery.cc (93%) rename src/common/step/{ => recovery}/step_recovery.h (87%) rename src/common/step/{ => security}/step_check_background_category.cc (99%) rename src/common/step/{ => security}/step_check_background_category.h (95%) rename src/common/step/{ => security}/step_check_old_certificate.cc (96%) rename src/common/step/{ => security}/step_check_old_certificate.h (84%) rename src/common/step/{ => security}/step_check_signature.cc (99%) rename src/common/step/{ => security}/step_check_signature.h (88%) rename src/common/step/{ => security}/step_privilege_compatibility.cc (98%) rename src/common/step/{ => security}/step_privilege_compatibility.h (82%) rename src/common/step/{ => security}/step_recover_security.cc (97%) rename src/common/step/{ => security}/step_recover_security.h (80%) rename src/common/step/{ => security}/step_register_security.cc (96%) rename src/common/step/{ => security}/step_register_security.h (78%) rename src/common/step/{ => security}/step_revoke_security.cc (96%) rename src/common/step/{ => security}/step_revoke_security.h (82%) rename src/common/step/{ => security}/step_rollback_deinstallation_security.cc (95%) rename src/common/step/{ => security}/step_rollback_deinstallation_security.h (78%) rename src/common/step/{ => security}/step_rollback_installation_security.cc (94%) rename src/common/step/{ => security}/step_rollback_installation_security.h (80%) rename src/common/step/{ => security}/step_update_security.cc (96%) rename src/common/step/{ => security}/step_update_security.h (79%) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 7edd833..09ded5c 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -18,51 +18,51 @@ SET(SRCS recovery_file.cc request.cc security_registration.cc - step/step_backup_icons.cc - step/step_backup_manifest.cc - step/step_unzip.cc - step/step_create_icons.cc - step/step_check_background_category.cc - step/step_check_blacklist.cc - step/step_check_removable.cc - step/step_check_old_certificate.cc - step/step_check_signature.cc - step/step_clear_data.cc - step/step_configure.cc - step/step_copy.cc - step/step_copy_tep.cc - step/step_copy_backup.cc - step/step_copy_storage_directories.cc - step/step_create_storage_directories.cc - step/step_create_per_user_storage_directories.cc - step/step_delta_patch.cc - step/step_fail.cc - step/step_kill_apps.cc - step/step_parse_manifest.cc - step/step_recover_application.cc - step/step_recover_files.cc - step/step_recover_icons.cc - step/step_recover_manifest.cc - step/step_recover_security.cc - step/step_recover_storage_directories.cc - step/step_recovery.cc - step/step_register_app.cc - step/step_open_recovery_file.cc - step/step_privilege_compatibility.cc - step/step_remove_icons.cc - step/step_remove_files.cc - step/step_remove_per_user_storage_directories.cc - step/step_remove_temporary_directory.cc - step/step_revoke_security.cc - step/step_register_security.cc - step/step_rollback_deinstallation_security.cc - step/step_rollback_installation_security.cc - step/step_run_parser_plugins.cc - step/step_unregister_app.cc - step/step_update_app.cc - step/step_update_security.cc - step/step_update_tep.cc - step/step_remove_manifest.cc + step/backup/step_backup_icons.cc + step/backup/step_backup_manifest.cc + step/backup/step_copy_backup.cc + step/configuration/step_configure.cc + step/configuration/step_fail.cc + step/configuration/step_parse_manifest.cc + step/filesystem/step_clear_data.cc + step/filesystem/step_copy.cc + step/filesystem/step_copy_storage_directories.cc + step/filesystem/step_copy_tep.cc + step/filesystem/step_create_icons.cc + step/filesystem/step_create_per_user_storage_directories.cc + step/filesystem/step_create_storage_directories.cc + step/filesystem/step_delta_patch.cc + step/filesystem/step_recover_files.cc + step/filesystem/step_recover_icons.cc + step/filesystem/step_recover_manifest.cc + step/filesystem/step_recover_storage_directories.cc + step/filesystem/step_remove_files.cc + step/filesystem/step_remove_icons.cc + step/filesystem/step_remove_per_user_storage_directories.cc + step/filesystem/step_remove_temporary_directory.cc + step/filesystem/step_unzip.cc + step/pkgmgr/step_check_blacklist.cc + step/pkgmgr/step_check_removable.cc + step/pkgmgr/step_kill_apps.cc + step/pkgmgr/step_recover_application.cc + step/pkgmgr/step_register_app.cc + step/pkgmgr/step_remove_manifest.cc + step/pkgmgr/step_run_parser_plugins.cc + step/pkgmgr/step_unregister_app.cc + step/pkgmgr/step_update_app.cc + step/pkgmgr/step_update_tep.cc + step/recovery/step_open_recovery_file.cc + step/recovery/step_recovery.cc + step/security/step_check_background_category.cc + step/security/step_check_old_certificate.cc + step/security/step_check_signature.cc + step/security/step_privilege_compatibility.cc + step/security/step_recover_security.cc + step/security/step_register_security.cc + step/security/step_revoke_security.cc + step/security/step_rollback_deinstallation_security.cc + step/security/step_rollback_installation_security.cc + step/security/step_update_security.cc utils/base64.cc utils/file_util.cc utils/subprocess.cc diff --git a/src/common/step/step_backup_icons.cc b/src/common/step/backup/step_backup_icons.cc similarity index 97% rename from src/common/step/step_backup_icons.cc rename to src/common/step/backup/step_backup_icons.cc index f2b8d1b..73c61f4 100644 --- a/src/common/step/step_backup_icons.cc +++ b/src/common/step/backup/step_backup_icons.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 "common/step/step_backup_icons.h" +#include "common/step/backup/step_backup_icons.h" #include diff --git a/src/common/step/step_backup_icons.h b/src/common/step/backup/step_backup_icons.h similarity index 90% rename from src/common/step/step_backup_icons.h rename to src/common/step/backup/step_backup_icons.h index cb9f1e9..843c916 100644 --- a/src/common/step/step_backup_icons.h +++ b/src/common/step/backup/step_backup_icons.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 COMMON_STEP_STEP_BACKUP_ICONS_H_ -#define COMMON_STEP_STEP_BACKUP_ICONS_H_ +#ifndef COMMON_STEP_BACKUP_STEP_BACKUP_ICONS_H_ +#define COMMON_STEP_BACKUP_STEP_BACKUP_ICONS_H_ #include #include @@ -59,4 +59,4 @@ class StepBackupIcons : public Step { } // namespace backup } // namespace common_installer -#endif // COMMON_STEP_STEP_BACKUP_ICONS_H_ +#endif // COMMON_STEP_BACKUP_STEP_BACKUP_ICONS_H_ diff --git a/src/common/step/step_backup_manifest.cc b/src/common/step/backup/step_backup_manifest.cc similarity index 97% rename from src/common/step/step_backup_manifest.cc rename to src/common/step/backup/step_backup_manifest.cc index d927eb5..994024e 100644 --- a/src/common/step/step_backup_manifest.cc +++ b/src/common/step/backup/step_backup_manifest.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 "common/step/step_backup_manifest.h" +#include "common/step/backup/step_backup_manifest.h" #include #include diff --git a/src/common/step/step_backup_manifest.h b/src/common/step/backup/step_backup_manifest.h similarity index 87% rename from src/common/step/step_backup_manifest.h rename to src/common/step/backup/step_backup_manifest.h index b96ce36..59980a2 100644 --- a/src/common/step/step_backup_manifest.h +++ b/src/common/step/backup/step_backup_manifest.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 COMMON_STEP_STEP_BACKUP_MANIFEST_H_ -#define COMMON_STEP_STEP_BACKUP_MANIFEST_H_ +#ifndef COMMON_STEP_BACKUP_STEP_BACKUP_MANIFEST_H_ +#define COMMON_STEP_BACKUP_STEP_BACKUP_MANIFEST_H_ #include @@ -50,4 +50,4 @@ class StepBackupManifest : public Step { } // namespace backup } // namespace common_installer -#endif // COMMON_STEP_STEP_BACKUP_MANIFEST_H_ +#endif // COMMON_STEP_BACKUP_STEP_BACKUP_MANIFEST_H_ diff --git a/src/common/step/step_copy_backup.cc b/src/common/step/backup/step_copy_backup.cc similarity index 98% rename from src/common/step/step_copy_backup.cc rename to src/common/step/backup/step_copy_backup.cc index 321bf80..35eb5c4 100644 --- a/src/common/step/step_copy_backup.cc +++ b/src/common/step/backup/step_copy_backup.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 "common/step/step_copy_backup.h" +#include "common/step/backup/step_copy_backup.h" #include #include diff --git a/src/common/step/step_copy_backup.h b/src/common/step/backup/step_copy_backup.h similarity index 91% rename from src/common/step/step_copy_backup.h rename to src/common/step/backup/step_copy_backup.h index 778efa0..96954b8 100644 --- a/src/common/step/step_copy_backup.h +++ b/src/common/step/backup/step_copy_backup.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 COMMON_STEP_STEP_COPY_BACKUP_H_ -#define COMMON_STEP_STEP_COPY_BACKUP_H_ +#ifndef COMMON_STEP_BACKUP_STEP_COPY_BACKUP_H_ +#define COMMON_STEP_BACKUP_STEP_COPY_BACKUP_H_ #include @@ -67,4 +67,4 @@ class StepCopyBackup : public Step { } // namespace backup } // namespace common_installer -#endif // COMMON_STEP_STEP_COPY_BACKUP_H_ +#endif // COMMON_STEP_BACKUP_STEP_COPY_BACKUP_H_ diff --git a/src/common/step/step_configure.cc b/src/common/step/configuration/step_configure.cc similarity index 99% rename from src/common/step/step_configure.cc rename to src/common/step/configuration/step_configure.cc index 0b512ab..443bd13 100644 --- a/src/common/step/step_configure.cc +++ b/src/common/step/configuration/step_configure.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 "common/step/step_configure.h" +#include "common/step/configuration/step_configure.h" #include diff --git a/src/common/step/step_configure.h b/src/common/step/configuration/step_configure.h similarity index 91% rename from src/common/step/step_configure.h rename to src/common/step/configuration/step_configure.h index a6add86..d7561ef 100644 --- a/src/common/step/step_configure.h +++ b/src/common/step/configuration/step_configure.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 COMMON_STEP_STEP_CONFIGURE_H_ -#define COMMON_STEP_STEP_CONFIGURE_H_ +#ifndef COMMON_STEP_CONFIGURATION_STEP_CONFIGURE_H_ +#define COMMON_STEP_CONFIGURATION_STEP_CONFIGURE_H_ #include @@ -69,4 +69,4 @@ class StepConfigure : public Step { } // namespace configuration } // namespace common_installer -#endif // COMMON_STEP_STEP_CONFIGURE_H_ +#endif // COMMON_STEP_CONFIGURATION_STEP_CONFIGURE_H_ diff --git a/src/common/step/step_fail.cc b/src/common/step/configuration/step_fail.cc similarity index 89% rename from src/common/step/step_fail.cc rename to src/common/step/configuration/step_fail.cc index 4cdd796..4cebdfb 100644 --- a/src/common/step/step_fail.cc +++ b/src/common/step/configuration/step_fail.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 "common/step/step_fail.h" +#include "common/step/configuration/step_fail.h" namespace common_installer { namespace configuration { diff --git a/src/common/step/step_fail.h b/src/common/step/configuration/step_fail.h similarity index 85% rename from src/common/step/step_fail.h rename to src/common/step/configuration/step_fail.h index 3947470..d3a50c6 100644 --- a/src/common/step/step_fail.h +++ b/src/common/step/configuration/step_fail.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 COMMON_STEP_STEP_FAIL_H_ -#define COMMON_STEP_STEP_FAIL_H_ +#ifndef COMMON_STEP_CONFIGURATION_STEP_FAIL_H_ +#define COMMON_STEP_CONFIGURATION_STEP_FAIL_H_ #include @@ -38,4 +38,4 @@ class StepFail : public Step { } // namespace configuration } // namespace common_installer -#endif // COMMON_STEP_STEP_FAIL_H_ +#endif // COMMON_STEP_CONFIGURATION_STEP_FAIL_H_ diff --git a/src/common/step/step_parse_manifest.cc b/src/common/step/configuration/step_parse_manifest.cc similarity index 99% rename from src/common/step/step_parse_manifest.cc rename to src/common/step/configuration/step_parse_manifest.cc index cfa0961..8f119ea 100644 --- a/src/common/step/step_parse_manifest.cc +++ b/src/common/step/configuration/step_parse_manifest.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 "common/step/step_parse_manifest.h" +#include "common/step/configuration/step_parse_manifest.h" #include #include @@ -46,7 +46,7 @@ const char kManifestFileName[] = "tizen-manifest.xml"; } // namepsace namespace common_installer { -namespace parse { +namespace configuration { StepParseManifest::StepParseManifest( InstallerContext* context, ManifestLocation manifest_location, @@ -831,5 +831,5 @@ Step::Status StepParseManifest::process() { return Step::Status::OK; } -} // namespace parse +} // namespace configuration } // namespace common_installer diff --git a/src/common/step/step_parse_manifest.h b/src/common/step/configuration/step_parse_manifest.h similarity index 94% rename from src/common/step/step_parse_manifest.h rename to src/common/step/configuration/step_parse_manifest.h index 0fc6224..b2aa32c 100644 --- a/src/common/step/step_parse_manifest.h +++ b/src/common/step/configuration/step_parse_manifest.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 COMMON_STEP_STEP_PARSE_MANIFEST_H_ -#define COMMON_STEP_STEP_PARSE_MANIFEST_H_ +#ifndef COMMON_STEP_CONFIGURATION_STEP_PARSE_MANIFEST_H_ +#define COMMON_STEP_CONFIGURATION_STEP_PARSE_MANIFEST_H_ #include @@ -21,7 +21,7 @@ #include namespace common_installer { -namespace parse { +namespace configuration { /** * @brief The StepParseManifest class @@ -103,7 +103,7 @@ class StepParseManifest : public common_installer::Step { SCOPE_LOG_TAG(ParseManifest) }; -} // namespace parse +} // namespace configuration } // namespace common_installer -#endif // COMMON_STEP_STEP_PARSE_MANIFEST_H_ +#endif // COMMON_STEP_CONFIGURATION_STEP_PARSE_MANIFEST_H_ diff --git a/src/common/step/step_clear_data.cc b/src/common/step/filesystem/step_clear_data.cc similarity index 96% rename from src/common/step/step_clear_data.cc rename to src/common/step/filesystem/step_clear_data.cc index e0007c2..3d9b473 100644 --- a/src/common/step/step_clear_data.cc +++ b/src/common/step/filesystem/step_clear_data.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 "common/step/step_clear_data.h" +#include "common/step/filesystem/step_clear_data.h" #include #include diff --git a/src/common/step/step_clear_data.h b/src/common/step/filesystem/step_clear_data.h similarity index 83% rename from src/common/step/step_clear_data.h rename to src/common/step/filesystem/step_clear_data.h index 5e5d12d..1696237 100644 --- a/src/common/step/step_clear_data.h +++ b/src/common/step/filesystem/step_clear_data.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 COMMON_STEP_STEP_CLEAR_DATA_H_ -#define COMMON_STEP_STEP_CLEAR_DATA_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_CLEAR_DATA_H_ +#define COMMON_STEP_FILESYSTEM_STEP_CLEAR_DATA_H_ #include @@ -34,4 +34,4 @@ class StepClearData : public Step { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_CLEAR_DATA_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_CLEAR_DATA_H_ diff --git a/src/common/step/step_copy.cc b/src/common/step/filesystem/step_copy.cc similarity index 98% rename from src/common/step/step_copy.cc rename to src/common/step/filesystem/step_copy.cc index ef50d09..930c8d7 100644 --- a/src/common/step/step_copy.cc +++ b/src/common/step/filesystem/step_copy.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a apache 2.0 license that can be // found in the LICENSE file. -#include "common/step/step_copy.h" +#include "common/step/filesystem/step_copy.h" #include #include diff --git a/src/common/step/step_copy.h b/src/common/step/filesystem/step_copy.h similarity index 90% rename from src/common/step/step_copy.h rename to src/common/step/filesystem/step_copy.h index 8dc4d6d..f98e6a2 100644 --- a/src/common/step/step_copy.h +++ b/src/common/step/filesystem/step_copy.h @@ -3,8 +3,8 @@ // Use of this source code is governed by a apache 2.0 license that can be // found in the LICENSE file. -#ifndef COMMON_STEP_STEP_COPY_H_ -#define COMMON_STEP_STEP_COPY_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_COPY_H_ +#define COMMON_STEP_FILESYSTEM_STEP_COPY_H_ #include @@ -53,4 +53,4 @@ class StepCopy : public Step { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_COPY_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_COPY_H_ diff --git a/src/common/step/step_copy_storage_directories.cc b/src/common/step/filesystem/step_copy_storage_directories.cc similarity index 97% rename from src/common/step/step_copy_storage_directories.cc rename to src/common/step/filesystem/step_copy_storage_directories.cc index 720e810..51888ca 100644 --- a/src/common/step/step_copy_storage_directories.cc +++ b/src/common/step/filesystem/step_copy_storage_directories.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 "common/step/step_copy_storage_directories.h" +#include "common/step/filesystem/step_copy_storage_directories.h" #include #include diff --git a/src/common/step/step_copy_storage_directories.h b/src/common/step/filesystem/step_copy_storage_directories.h similarity index 88% rename from src/common/step/step_copy_storage_directories.h rename to src/common/step/filesystem/step_copy_storage_directories.h index d4bee56..d7ebc0a 100644 --- a/src/common/step/step_copy_storage_directories.h +++ b/src/common/step/filesystem/step_copy_storage_directories.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 COMMON_STEP_STEP_COPY_STORAGE_DIRECTORIES_H_ -#define COMMON_STEP_STEP_COPY_STORAGE_DIRECTORIES_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_COPY_STORAGE_DIRECTORIES_H_ +#define COMMON_STEP_FILESYSTEM_STEP_COPY_STORAGE_DIRECTORIES_H_ #include @@ -57,4 +57,4 @@ class StepCopyStorageDirectories : public common_installer::Step { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_COPY_STORAGE_DIRECTORIES_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_COPY_STORAGE_DIRECTORIES_H_ diff --git a/src/common/step/step_copy_tep.cc b/src/common/step/filesystem/step_copy_tep.cc similarity index 97% rename from src/common/step/step_copy_tep.cc rename to src/common/step/filesystem/step_copy_tep.cc index a12a837..9b24ca3 100644 --- a/src/common/step/step_copy_tep.cc +++ b/src/common/step/filesystem/step_copy_tep.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a apache 2.0 license that can be // found in the LICENSE file. -#include "common/step/step_copy_tep.h" +#include "common/step/filesystem/step_copy_tep.h" #include #include diff --git a/src/common/step/step_copy_tep.h b/src/common/step/filesystem/step_copy_tep.h similarity index 89% rename from src/common/step/step_copy_tep.h rename to src/common/step/filesystem/step_copy_tep.h index d38f616..33c70a9 100644 --- a/src/common/step/step_copy_tep.h +++ b/src/common/step/filesystem/step_copy_tep.h @@ -3,8 +3,8 @@ // Use of this source code is governed by a apache 2.0 license that can be // found in the LICENSE file. -#ifndef COMMON_STEP_STEP_COPY_TEP_H_ -#define COMMON_STEP_STEP_COPY_TEP_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_COPY_TEP_H_ +#define COMMON_STEP_FILESYSTEM_STEP_COPY_TEP_H_ #include @@ -52,4 +52,4 @@ class StepCopyTep : public Step { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_COPY_TEP_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_COPY_TEP_H_ diff --git a/src/common/step/step_create_icons.cc b/src/common/step/filesystem/step_create_icons.cc similarity index 97% rename from src/common/step/step_create_icons.cc rename to src/common/step/filesystem/step_create_icons.cc index 57558c0..beddf6e 100644 --- a/src/common/step/step_create_icons.cc +++ b/src/common/step/filesystem/step_create_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 "common/step/step_create_icons.h" +#include "common/step/filesystem/step_create_icons.h" #include #include diff --git a/src/common/step/step_create_icons.h b/src/common/step/filesystem/step_create_icons.h similarity index 87% rename from src/common/step/step_create_icons.h rename to src/common/step/filesystem/step_create_icons.h index 1f0981c..00aa6fa 100644 --- a/src/common/step/step_create_icons.h +++ b/src/common/step/filesystem/step_create_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 COMMON_STEP_STEP_CREATE_ICONS_H_ -#define COMMON_STEP_STEP_CREATE_ICONS_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_CREATE_ICONS_H_ +#define COMMON_STEP_FILESYSTEM_STEP_CREATE_ICONS_H_ #include @@ -51,4 +51,4 @@ class StepCreateIcons : public Step { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_CREATE_ICONS_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_CREATE_ICONS_H_ diff --git a/src/common/step/step_create_per_user_storage_directories.cc b/src/common/step/filesystem/step_create_per_user_storage_directories.cc similarity index 92% rename from src/common/step/step_create_per_user_storage_directories.cc rename to src/common/step/filesystem/step_create_per_user_storage_directories.cc index 24d81b6..660109a 100644 --- a/src/common/step/step_create_per_user_storage_directories.cc +++ b/src/common/step/filesystem/step_create_per_user_storage_directories.cc @@ -5,7 +5,7 @@ #include #include "common/utils/subprocess.h" -#include "common/step/step_create_per_user_storage_directories.h" +#include "common/step/filesystem/step_create_per_user_storage_directories.h" namespace common_installer { namespace filesystem { diff --git a/src/common/step/step_create_per_user_storage_directories.h b/src/common/step/filesystem/step_create_per_user_storage_directories.h similarity index 82% rename from src/common/step/step_create_per_user_storage_directories.h rename to src/common/step/filesystem/step_create_per_user_storage_directories.h index fcda89a..bb1cba9 100644 --- a/src/common/step/step_create_per_user_storage_directories.h +++ b/src/common/step/filesystem/step_create_per_user_storage_directories.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 COMMON_STEP_STEP_CREATE_PER_USER_STORAGE_DIRECTORIES_H_ -#define COMMON_STEP_STEP_CREATE_PER_USER_STORAGE_DIRECTORIES_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_CREATE_PER_USER_STORAGE_DIRECTORIES_H_ +#define COMMON_STEP_FILESYSTEM_STEP_CREATE_PER_USER_STORAGE_DIRECTORIES_H_ #include @@ -37,4 +37,4 @@ class StepCreatePerUserStorageDirectories : public common_installer::Step { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_CREATE_PER_USER_STORAGE_DIRECTORIES_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_CREATE_PER_USER_STORAGE_DIRECTORIES_H_ diff --git a/src/common/step/step_create_storage_directories.cc b/src/common/step/filesystem/step_create_storage_directories.cc similarity index 97% rename from src/common/step/step_create_storage_directories.cc rename to src/common/step/filesystem/step_create_storage_directories.cc index fd4bb44..280f2e5 100644 --- a/src/common/step/step_create_storage_directories.cc +++ b/src/common/step/filesystem/step_create_storage_directories.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 "common/step/step_create_storage_directories.h" +#include "common/step/filesystem/step_create_storage_directories.h" #include #include diff --git a/src/common/step/step_create_storage_directories.h b/src/common/step/filesystem/step_create_storage_directories.h similarity index 86% rename from src/common/step/step_create_storage_directories.h rename to src/common/step/filesystem/step_create_storage_directories.h index 072f85c..cecd0c6 100644 --- a/src/common/step/step_create_storage_directories.h +++ b/src/common/step/filesystem/step_create_storage_directories.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 COMMON_STEP_STEP_CREATE_STORAGE_DIRECTORIES_H_ -#define COMMON_STEP_STEP_CREATE_STORAGE_DIRECTORIES_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_CREATE_STORAGE_DIRECTORIES_H_ +#define COMMON_STEP_FILESYSTEM_STEP_CREATE_STORAGE_DIRECTORIES_H_ #include @@ -46,4 +46,4 @@ class StepCreateStorageDirectories : public common_installer::Step { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_CREATE_STORAGE_DIRECTORIES_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_CREATE_STORAGE_DIRECTORIES_H_ diff --git a/src/common/step/step_delta_patch.cc b/src/common/step/filesystem/step_delta_patch.cc similarity index 99% rename from src/common/step/step_delta_patch.cc rename to src/common/step/filesystem/step_delta_patch.cc index cf8a5a6..74b9e40 100644 --- a/src/common/step/step_delta_patch.cc +++ b/src/common/step/filesystem/step_delta_patch.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 "common/step/step_delta_patch.h" +#include "common/step/filesystem/step_delta_patch.h" #include #include diff --git a/src/common/step/step_delta_patch.h b/src/common/step/filesystem/step_delta_patch.h similarity index 91% rename from src/common/step/step_delta_patch.h rename to src/common/step/filesystem/step_delta_patch.h index 2e686fd..0f216b3 100644 --- a/src/common/step/step_delta_patch.h +++ b/src/common/step/filesystem/step_delta_patch.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 COMMON_STEP_STEP_DELTA_PATCH_H_ -#define COMMON_STEP_STEP_DELTA_PATCH_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_DELTA_PATCH_H_ +#define COMMON_STEP_FILESYSTEM_STEP_DELTA_PATCH_H_ #include @@ -54,4 +54,4 @@ class StepDeltaPatch : public Step { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_DELTA_PATCH_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_DELTA_PATCH_H_ diff --git a/src/common/step/step_recover_files.cc b/src/common/step/filesystem/step_recover_files.cc similarity index 97% rename from src/common/step/step_recover_files.cc rename to src/common/step/filesystem/step_recover_files.cc index ee11a98..a67dd3b 100644 --- a/src/common/step/step_recover_files.cc +++ b/src/common/step/filesystem/step_recover_files.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 "common/step/step_recover_files.h" +#include "common/step/filesystem/step_recover_files.h" #include #include diff --git a/src/common/step/step_recover_files.h b/src/common/step/filesystem/step_recover_files.h similarity index 80% rename from src/common/step/step_recover_files.h rename to src/common/step/filesystem/step_recover_files.h index cf0a606..90de483 100644 --- a/src/common/step/step_recover_files.h +++ b/src/common/step/filesystem/step_recover_files.h @@ -2,13 +2,13 @@ // Use of this source code is governed by an apache-2.0 license that can be // found in the LICENSE file. -#ifndef COMMON_STEP_STEP_RECOVER_FILES_H_ -#define COMMON_STEP_STEP_RECOVER_FILES_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_RECOVER_FILES_H_ +#define COMMON_STEP_FILESYSTEM_STEP_RECOVER_FILES_H_ #include #include "common/installer_context.h" -#include "common/step/step_recovery.h" +#include "common/step/recovery/step_recovery.h" namespace common_installer { namespace filesystem { @@ -37,4 +37,4 @@ class StepRecoverFiles : public recovery::StepRecovery { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_RECOVER_FILES_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_RECOVER_FILES_H_ diff --git a/src/common/step/step_recover_icons.cc b/src/common/step/filesystem/step_recover_icons.cc similarity index 97% rename from src/common/step/step_recover_icons.cc rename to src/common/step/filesystem/step_recover_icons.cc index 14d4074..e511d64 100644 --- a/src/common/step/step_recover_icons.cc +++ b/src/common/step/filesystem/step_recover_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 "common/step/step_recover_icons.h" +#include "common/step/filesystem/step_recover_icons.h" #include #include diff --git a/src/common/step/step_recover_icons.h b/src/common/step/filesystem/step_recover_icons.h similarity index 83% rename from src/common/step/step_recover_icons.h rename to src/common/step/filesystem/step_recover_icons.h index 4f63973..5575307 100644 --- a/src/common/step/step_recover_icons.h +++ b/src/common/step/filesystem/step_recover_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 COMMON_STEP_STEP_RECOVER_ICONS_H_ -#define COMMON_STEP_STEP_RECOVER_ICONS_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_RECOVER_ICONS_H_ +#define COMMON_STEP_FILESYSTEM_STEP_RECOVER_ICONS_H_ #include @@ -14,7 +14,7 @@ #include #include "common/installer_context.h" -#include "common/step/step_recovery.h" +#include "common/step/recovery/step_recovery.h" namespace common_installer { namespace filesystem { @@ -46,4 +46,4 @@ class StepRecoverIcons : public recovery::StepRecovery { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_RECOVER_ICONS_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_RECOVER_ICONS_H_ diff --git a/src/common/step/step_recover_manifest.cc b/src/common/step/filesystem/step_recover_manifest.cc similarity index 97% rename from src/common/step/step_recover_manifest.cc rename to src/common/step/filesystem/step_recover_manifest.cc index 5fbe8c4..7d99c36 100644 --- a/src/common/step/step_recover_manifest.cc +++ b/src/common/step/filesystem/step_recover_manifest.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 "common/step/step_recover_manifest.h" +#include "common/step/filesystem/step_recover_manifest.h" #include #include diff --git a/src/common/step/step_recover_manifest.h b/src/common/step/filesystem/step_recover_manifest.h similarity index 80% rename from src/common/step/step_recover_manifest.h rename to src/common/step/filesystem/step_recover_manifest.h index d9c34f6..3e9f400 100644 --- a/src/common/step/step_recover_manifest.h +++ b/src/common/step/filesystem/step_recover_manifest.h @@ -2,13 +2,13 @@ // Use of this source code is governed by an apache-2.0 license that can be // found in the LICENSE file. -#ifndef COMMON_STEP_STEP_RECOVER_MANIFEST_H_ -#define COMMON_STEP_STEP_RECOVER_MANIFEST_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_RECOVER_MANIFEST_H_ +#define COMMON_STEP_FILESYSTEM_STEP_RECOVER_MANIFEST_H_ #include #include "common/installer_context.h" -#include "common/step/step_recovery.h" +#include "common/step/recovery/step_recovery.h" namespace common_installer { namespace filesystem { @@ -37,4 +37,4 @@ class StepRecoverManifest : public recovery::StepRecovery { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_RECOVER_MANIFEST_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_RECOVER_MANIFEST_H_ diff --git a/src/common/step/step_recover_storage_directories.cc b/src/common/step/filesystem/step_recover_storage_directories.cc similarity index 94% rename from src/common/step/step_recover_storage_directories.cc rename to src/common/step/filesystem/step_recover_storage_directories.cc index 0633e2f..dfe0d29 100644 --- a/src/common/step/step_recover_storage_directories.cc +++ b/src/common/step/filesystem/step_recover_storage_directories.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 "common/step/step_recover_storage_directories.h" +#include "common/step/filesystem/step_recover_storage_directories.h" #include #include diff --git a/src/common/step/step_recover_storage_directories.h b/src/common/step/filesystem/step_recover_storage_directories.h similarity index 82% rename from src/common/step/step_recover_storage_directories.h rename to src/common/step/filesystem/step_recover_storage_directories.h index 4d85e5c..3fbd696 100644 --- a/src/common/step/step_recover_storage_directories.h +++ b/src/common/step/filesystem/step_recover_storage_directories.h @@ -2,13 +2,13 @@ // Use of this source code is governed by an apache-2.0 license that can be // found in the LICENSE file. -#ifndef COMMON_STEP_STEP_RECOVER_STORAGE_DIRECTORIES_H_ -#define COMMON_STEP_STEP_RECOVER_STORAGE_DIRECTORIES_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_RECOVER_STORAGE_DIRECTORIES_H_ +#define COMMON_STEP_FILESYSTEM_STEP_RECOVER_STORAGE_DIRECTORIES_H_ #include #include "common/installer_context.h" -#include "common/step/step_recovery.h" +#include "common/step/recovery/step_recovery.h" namespace common_installer { namespace filesystem { @@ -43,4 +43,4 @@ class StepRecoverStorageDirectories : public recovery::StepRecovery { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_RECOVER_STORAGE_DIRECTORIES_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_RECOVER_STORAGE_DIRECTORIES_H_ diff --git a/src/common/step/step_remove_files.cc b/src/common/step/filesystem/step_remove_files.cc similarity index 97% rename from src/common/step/step_remove_files.cc rename to src/common/step/filesystem/step_remove_files.cc index 9a75161..b714054 100644 --- a/src/common/step/step_remove_files.cc +++ b/src/common/step/filesystem/step_remove_files.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 "common/step/step_remove_files.h" +#include "common/step/filesystem/step_remove_files.h" #include #include diff --git a/src/common/step/step_remove_files.h b/src/common/step/filesystem/step_remove_files.h similarity index 80% rename from src/common/step/step_remove_files.h rename to src/common/step/filesystem/step_remove_files.h index a2e9cf8..51dda19 100644 --- a/src/common/step/step_remove_files.h +++ b/src/common/step/filesystem/step_remove_files.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 COMMON_STEP_STEP_REMOVE_FILES_H_ -#define COMMON_STEP_STEP_REMOVE_FILES_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_REMOVE_FILES_H_ +#define COMMON_STEP_FILESYSTEM_STEP_REMOVE_FILES_H_ #include @@ -29,4 +29,4 @@ class StepRemoveFiles : public Step { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_REMOVE_FILES_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_REMOVE_FILES_H_ diff --git a/src/common/step/step_remove_icons.cc b/src/common/step/filesystem/step_remove_icons.cc similarity index 96% rename from src/common/step/step_remove_icons.cc rename to src/common/step/filesystem/step_remove_icons.cc index ae6dae0..5c77e7c 100644 --- a/src/common/step/step_remove_icons.cc +++ b/src/common/step/filesystem/step_remove_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 "common/step/step_remove_icons.h" +#include "common/step/filesystem/step_remove_icons.h" #include #include diff --git a/src/common/step/step_remove_icons.h b/src/common/step/filesystem/step_remove_icons.h similarity index 82% rename from src/common/step/step_remove_icons.h rename to src/common/step/filesystem/step_remove_icons.h index 1d259bd..57b92a2 100644 --- a/src/common/step/step_remove_icons.h +++ b/src/common/step/filesystem/step_remove_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 COMMON_STEP_STEP_REMOVE_ICONS_H_ -#define COMMON_STEP_STEP_REMOVE_ICONS_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_REMOVE_ICONS_H_ +#define COMMON_STEP_FILESYSTEM_STEP_REMOVE_ICONS_H_ #include @@ -33,4 +33,4 @@ class StepRemoveIcons : public Step { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_REMOVE_ICONS_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_REMOVE_ICONS_H_ diff --git a/src/common/step/step_remove_per_user_storage_directories.cc b/src/common/step/filesystem/step_remove_per_user_storage_directories.cc similarity index 92% rename from src/common/step/step_remove_per_user_storage_directories.cc rename to src/common/step/filesystem/step_remove_per_user_storage_directories.cc index 9317aa5..99546e1 100644 --- a/src/common/step/step_remove_per_user_storage_directories.cc +++ b/src/common/step/filesystem/step_remove_per_user_storage_directories.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 "common/step/step_remove_per_user_storage_directories.h" +#include "common/step/filesystem/step_remove_per_user_storage_directories.h" #include #include diff --git a/src/common/step/step_remove_per_user_storage_directories.h b/src/common/step/filesystem/step_remove_per_user_storage_directories.h similarity index 82% rename from src/common/step/step_remove_per_user_storage_directories.h rename to src/common/step/filesystem/step_remove_per_user_storage_directories.h index 1d90ed2..d0a9674 100644 --- a/src/common/step/step_remove_per_user_storage_directories.h +++ b/src/common/step/filesystem/step_remove_per_user_storage_directories.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 COMMON_STEP_STEP_REMOVE_PER_USER_STORAGE_DIRECTORIES_H_ -#define COMMON_STEP_STEP_REMOVE_PER_USER_STORAGE_DIRECTORIES_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_REMOVE_PER_USER_STORAGE_DIRECTORIES_H_ +#define COMMON_STEP_FILESYSTEM_STEP_REMOVE_PER_USER_STORAGE_DIRECTORIES_H_ #include @@ -39,4 +39,4 @@ class StepRemovePerUserStorageDirectories : public common_installer::Step { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_REMOVE_PER_USER_STORAGE_DIRECTORIES_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_REMOVE_PER_USER_STORAGE_DIRECTORIES_H_ diff --git a/src/common/step/step_remove_temporary_directory.cc b/src/common/step/filesystem/step_remove_temporary_directory.cc similarity index 93% rename from src/common/step/step_remove_temporary_directory.cc rename to src/common/step/filesystem/step_remove_temporary_directory.cc index 9dba601..23a2dc8 100644 --- a/src/common/step/step_remove_temporary_directory.cc +++ b/src/common/step/filesystem/step_remove_temporary_directory.cc @@ -1,7 +1,7 @@ // 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. -#include "common/step/step_remove_temporary_directory.h" +#include "common/step/filesystem/step_remove_temporary_directory.h" #include #include diff --git a/src/common/step/step_remove_temporary_directory.h b/src/common/step/filesystem/step_remove_temporary_directory.h similarity index 77% rename from src/common/step/step_remove_temporary_directory.h rename to src/common/step/filesystem/step_remove_temporary_directory.h index 091cf6b..5e1c804 100644 --- a/src/common/step/step_remove_temporary_directory.h +++ b/src/common/step/filesystem/step_remove_temporary_directory.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 COMMON_STEP_STEP_REMOVE_TEMPORARY_DIRECTORY_H_ -#define COMMON_STEP_STEP_REMOVE_TEMPORARY_DIRECTORY_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_REMOVE_TEMPORARY_DIRECTORY_H_ +#define COMMON_STEP_FILESYSTEM_STEP_REMOVE_TEMPORARY_DIRECTORY_H_ #include -#include "common/step/step_recovery.h" +#include "common/step/recovery/step_recovery.h" namespace common_installer { namespace filesystem { @@ -39,4 +39,4 @@ class StepRemoveTemporaryDirectory : public recovery::StepRecovery { } // namespace filesystem } // namespace common_installer -#endif // COMMON_STEP_STEP_REMOVE_TEMPORARY_DIRECTORY_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_REMOVE_TEMPORARY_DIRECTORY_H_ diff --git a/src/common/step/step_unzip.cc b/src/common/step/filesystem/step_unzip.cc similarity index 98% rename from src/common/step/step_unzip.cc rename to src/common/step/filesystem/step_unzip.cc index f04dbdd..7739bf8 100644 --- a/src/common/step/step_unzip.cc +++ b/src/common/step/filesystem/step_unzip.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a apache 2.0 license that can be // found in the LICENSE file. -#include "common/step/step_unzip.h" +#include "common/step/filesystem/step_unzip.h" #include diff --git a/src/common/step/step_unzip.h b/src/common/step/filesystem/step_unzip.h similarity index 90% rename from src/common/step/step_unzip.h rename to src/common/step/filesystem/step_unzip.h index 71f359d..aede813 100644 --- a/src/common/step/step_unzip.h +++ b/src/common/step/filesystem/step_unzip.h @@ -3,8 +3,8 @@ // Use of this source code is governed by a apache 2.0 license that can be // found in the LICENSE file. -#ifndef COMMON_STEP_STEP_UNZIP_H_ -#define COMMON_STEP_STEP_UNZIP_H_ +#ifndef COMMON_STEP_FILESYSTEM_STEP_UNZIP_H_ +#define COMMON_STEP_FILESYSTEM_STEP_UNZIP_H_ #include @@ -45,4 +45,4 @@ class StepUnzip : public Step { } // namespace common_installer -#endif // COMMON_STEP_STEP_UNZIP_H_ +#endif // COMMON_STEP_FILESYSTEM_STEP_UNZIP_H_ diff --git a/src/common/step/step_check_blacklist.cc b/src/common/step/pkgmgr/step_check_blacklist.cc similarity index 92% rename from src/common/step/step_check_blacklist.cc rename to src/common/step/pkgmgr/step_check_blacklist.cc index 2363d16..ad13944 100644 --- a/src/common/step/step_check_blacklist.cc +++ b/src/common/step/pkgmgr/step_check_blacklist.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 "common/step/step_check_blacklist.h" +#include "common/step/pkgmgr/step_check_blacklist.h" #include @@ -10,7 +10,7 @@ #include "common/step/step.h" namespace common_installer { -namespace blacklist { +namespace pkgmgr { Step::Status StepCheckBlacklist::process() { bool result; @@ -40,5 +40,5 @@ Step::Status StepCheckBlacklist::precheck() { return Status::OK; } -} // namespace blacklist +} // namespace pkgmgr } // namespace common_installer diff --git a/src/common/step/step_check_blacklist.h b/src/common/step/pkgmgr/step_check_blacklist.h similarity index 72% rename from src/common/step/step_check_blacklist.h rename to src/common/step/pkgmgr/step_check_blacklist.h index 8dc0873..35510a6 100644 --- a/src/common/step/step_check_blacklist.h +++ b/src/common/step/pkgmgr/step_check_blacklist.h @@ -2,13 +2,13 @@ // Use of this source code is governed by an apache 2.0 license that can be // found in the LICENSE file. -#ifndef COMMON_STEP_STEP_CHECK_BLACKLIST_H_ -#define COMMON_STEP_STEP_CHECK_BLACKLIST_H_ +#ifndef COMMON_STEP_PKGMGR_STEP_CHECK_BLACKLIST_H_ +#define COMMON_STEP_PKGMGR_STEP_CHECK_BLACKLIST_H_ #include "common/step/step.h" namespace common_installer { -namespace blacklist { +namespace pkgmgr { class StepCheckBlacklist : public Step { public: @@ -22,7 +22,7 @@ class StepCheckBlacklist : public Step { SCOPE_LOG_TAG(Blacklist) }; -} // namespace blacklist +} // namespace pkgmgr } // namespace common_installer -#endif // COMMON_STEP_STEP_CHECK_BLACKLIST_H_ +#endif // COMMON_STEP_PKGMGR_STEP_CHECK_BLACKLIST_H_ diff --git a/src/common/step/step_check_removable.cc b/src/common/step/pkgmgr/step_check_removable.cc similarity index 95% rename from src/common/step/step_check_removable.cc rename to src/common/step/pkgmgr/step_check_removable.cc index f5e7b1a..d2ff27c 100644 --- a/src/common/step/step_check_removable.cc +++ b/src/common/step/pkgmgr/step_check_removable.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 "common/step/step_check_removable.h" +#include "common/step/pkgmgr/step_check_removable.h" #include diff --git a/src/common/step/step_check_removable.h b/src/common/step/pkgmgr/step_check_removable.h similarity index 78% rename from src/common/step/step_check_removable.h rename to src/common/step/pkgmgr/step_check_removable.h index adefa7c..18c7fb9 100644 --- a/src/common/step/step_check_removable.h +++ b/src/common/step/pkgmgr/step_check_removable.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 COMMON_STEP_STEP_CHECK_REMOVABLE_H_ -#define COMMON_STEP_STEP_CHECK_REMOVABLE_H_ +#ifndef COMMON_STEP_PKGMGR_STEP_CHECK_REMOVABLE_H_ +#define COMMON_STEP_PKGMGR_STEP_CHECK_REMOVABLE_H_ #include "common/step/step.h" @@ -25,4 +25,4 @@ class StepCheckRemovable : public Step { } // namespace pkgmgr } // namespace common_installer -#endif // COMMON_STEP_STEP_CHECK_REMOVABLE_H_ +#endif // COMMON_STEP_PKGMGR_STEP_CHECK_REMOVABLE_H_ diff --git a/src/common/step/step_kill_apps.cc b/src/common/step/pkgmgr/step_kill_apps.cc similarity index 97% rename from src/common/step/step_kill_apps.cc rename to src/common/step/pkgmgr/step_kill_apps.cc index a5aec31..b6f308e 100644 --- a/src/common/step/step_kill_apps.cc +++ b/src/common/step/pkgmgr/step_kill_apps.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 "common/step/step_kill_apps.h" +#include "common/step/pkgmgr/step_kill_apps.h" #include #include diff --git a/src/common/step/step_kill_apps.h b/src/common/step/pkgmgr/step_kill_apps.h similarity index 87% rename from src/common/step/step_kill_apps.h rename to src/common/step/pkgmgr/step_kill_apps.h index e276187..d1e9d17 100644 --- a/src/common/step/step_kill_apps.h +++ b/src/common/step/pkgmgr/step_kill_apps.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 COMMON_STEP_STEP_KILL_APPS_H_ -#define COMMON_STEP_STEP_KILL_APPS_H_ +#ifndef COMMON_STEP_PKGMGR_STEP_KILL_APPS_H_ +#define COMMON_STEP_PKGMGR_STEP_KILL_APPS_H_ #include @@ -44,4 +44,4 @@ class StepKillApps : public Step { } // namespace pkgmgr } // namespace common_installer -#endif // COMMON_STEP_STEP_KILL_APPS_H_ +#endif // COMMON_STEP_PKGMGR_STEP_KILL_APPS_H_ diff --git a/src/common/step/step_recover_application.cc b/src/common/step/pkgmgr/step_recover_application.cc similarity index 97% rename from src/common/step/step_recover_application.cc rename to src/common/step/pkgmgr/step_recover_application.cc index d43453b..51c24b1 100644 --- a/src/common/step/step_recover_application.cc +++ b/src/common/step/pkgmgr/step_recover_application.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 "common/step/step_recover_application.h" +#include "common/step/pkgmgr/step_recover_application.h" #include diff --git a/src/common/step/step_recover_application.h b/src/common/step/pkgmgr/step_recover_application.h similarity index 79% rename from src/common/step/step_recover_application.h rename to src/common/step/pkgmgr/step_recover_application.h index fad6dc3..84e7146 100644 --- a/src/common/step/step_recover_application.h +++ b/src/common/step/pkgmgr/step_recover_application.h @@ -2,13 +2,13 @@ // Use of this source code is governed by an apache-2.0 license that can be // found in the LICENSE file. -#ifndef COMMON_STEP_STEP_RECOVER_APPLICATION_H_ -#define COMMON_STEP_STEP_RECOVER_APPLICATION_H_ +#ifndef COMMON_STEP_PKGMGR_STEP_RECOVER_APPLICATION_H_ +#define COMMON_STEP_PKGMGR_STEP_RECOVER_APPLICATION_H_ #include #include "common/installer_context.h" -#include "common/step/step_recovery.h" +#include "common/step/recovery/step_recovery.h" namespace common_installer { namespace pkgmgr { @@ -34,4 +34,4 @@ class StepRecoverApplication : public recovery::StepRecovery { } // namespace pkgmgr } // namespace common_installer -#endif // COMMON_STEP_STEP_RECOVER_APPLICATION_H_ +#endif // COMMON_STEP_PKGMGR_STEP_RECOVER_APPLICATION_H_ diff --git a/src/common/step/step_register_app.cc b/src/common/step/pkgmgr/step_register_app.cc similarity index 97% rename from src/common/step/step_register_app.cc rename to src/common/step/pkgmgr/step_register_app.cc index 17b7275..f6c491d 100644 --- a/src/common/step/step_register_app.cc +++ b/src/common/step/pkgmgr/step_register_app.cc @@ -1,6 +1,6 @@ /* 2014, Copyright © Intel Coporation, license APACHE-2.0, see LICENSE file */ -#include "common/step/step_register_app.h" +#include "common/step/pkgmgr/step_register_app.h" #include #include diff --git a/src/common/step/step_register_app.h b/src/common/step/pkgmgr/step_register_app.h similarity index 78% rename from src/common/step/step_register_app.h rename to src/common/step/pkgmgr/step_register_app.h index 5461eff..8387211 100644 --- a/src/common/step/step_register_app.h +++ b/src/common/step/pkgmgr/step_register_app.h @@ -1,7 +1,7 @@ /* 2014, Copyright © Intel Coporation, license APACHE-2.0, see LICENSE file */ -#ifndef COMMON_STEP_STEP_REGISTER_APP_H_ -#define COMMON_STEP_STEP_REGISTER_APP_H_ +#ifndef COMMON_STEP_PKGMGR_STEP_REGISTER_APP_H_ +#define COMMON_STEP_PKGMGR_STEP_REGISTER_APP_H_ #include @@ -27,4 +27,4 @@ class StepRegisterApplication : public Step { } // namespace common_installer -#endif // COMMON_STEP_STEP_REGISTER_APP_H_ +#endif // COMMON_STEP_PKGMGR_STEP_REGISTER_APP_H_ diff --git a/src/common/step/step_remove_manifest.cc b/src/common/step/pkgmgr/step_remove_manifest.cc similarity index 94% rename from src/common/step/step_remove_manifest.cc rename to src/common/step/pkgmgr/step_remove_manifest.cc index 7ca573c..cd7e85f 100644 --- a/src/common/step/step_remove_manifest.cc +++ b/src/common/step/pkgmgr/step_remove_manifest.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 "common/step/step_remove_manifest.h" +#include "common/step/pkgmgr/step_remove_manifest.h" #include #include diff --git a/src/common/step/step_remove_manifest.h b/src/common/step/pkgmgr/step_remove_manifest.h similarity index 85% rename from src/common/step/step_remove_manifest.h rename to src/common/step/pkgmgr/step_remove_manifest.h index 7d3385f..8688cfc 100644 --- a/src/common/step/step_remove_manifest.h +++ b/src/common/step/pkgmgr/step_remove_manifest.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 COMMON_STEP_STEP_REMOVE_MANIFEST_H_ -#define COMMON_STEP_STEP_REMOVE_MANIFEST_H_ +#ifndef COMMON_STEP_PKGMGR_STEP_REMOVE_MANIFEST_H_ +#define COMMON_STEP_PKGMGR_STEP_REMOVE_MANIFEST_H_ #include @@ -37,4 +37,4 @@ class StepRemoveManifest : public Step { } // namespace pkgmgr } // namespace common_installer -#endif // COMMON_STEP_STEP_REMOVE_MANIFEST_H_ +#endif // COMMON_STEP_PKGMGR_STEP_REMOVE_MANIFEST_H_ diff --git a/src/common/step/step_run_parser_plugins.cc b/src/common/step/pkgmgr/step_run_parser_plugins.cc similarity index 97% rename from src/common/step/step_run_parser_plugins.cc rename to src/common/step/pkgmgr/step_run_parser_plugins.cc index 4dad126..c5b330c 100644 --- a/src/common/step/step_run_parser_plugins.cc +++ b/src/common/step/pkgmgr/step_run_parser_plugins.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 "common/step/step_run_parser_plugins.h" +#include "common/step/pkgmgr/step_run_parser_plugins.h" #include #include diff --git a/src/common/step/step_run_parser_plugins.h b/src/common/step/pkgmgr/step_run_parser_plugins.h similarity index 86% rename from src/common/step/step_run_parser_plugins.h rename to src/common/step/pkgmgr/step_run_parser_plugins.h index 6e6c608..a547c6d 100644 --- a/src/common/step/step_run_parser_plugins.h +++ b/src/common/step/pkgmgr/step_run_parser_plugins.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 COMMON_STEP_STEP_RUN_PARSER_PLUGINS_H_ -#define COMMON_STEP_STEP_RUN_PARSER_PLUGINS_H_ +#ifndef COMMON_STEP_PKGMGR_STEP_RUN_PARSER_PLUGINS_H_ +#define COMMON_STEP_PKGMGR_STEP_RUN_PARSER_PLUGINS_H_ #include @@ -41,4 +41,4 @@ class StepRunParserPlugin : public Step { } // namespace pkgmgr } // namespace common_installer -#endif // COMMON_STEP_STEP_RUN_PARSER_PLUGINS_H_ +#endif // COMMON_STEP_PKGMGR_STEP_RUN_PARSER_PLUGINS_H_ diff --git a/src/common/step/step_unregister_app.cc b/src/common/step/pkgmgr/step_unregister_app.cc similarity index 98% rename from src/common/step/step_unregister_app.cc rename to src/common/step/pkgmgr/step_unregister_app.cc index 84ed4b5..6598712 100644 --- a/src/common/step/step_unregister_app.cc +++ b/src/common/step/pkgmgr/step_unregister_app.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by an apache 2.0 license that can be // found in the LICENSE file. +#include "common/step/pkgmgr/step_unregister_app.h" + #include #include @@ -13,7 +15,6 @@ #include #include "common/pkgmgr_registration.h" -#include "common/step/step_unregister_app.h" #include "common/utils/file_util.h" namespace common_installer { diff --git a/src/common/step/step_unregister_app.h b/src/common/step/pkgmgr/step_unregister_app.h similarity index 82% rename from src/common/step/step_unregister_app.h rename to src/common/step/pkgmgr/step_unregister_app.h index aac1e50..9eeed6c 100644 --- a/src/common/step/step_unregister_app.h +++ b/src/common/step/pkgmgr/step_unregister_app.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 COMMON_STEP_STEP_UNREGISTER_APP_H_ -#define COMMON_STEP_STEP_UNREGISTER_APP_H_ +#ifndef COMMON_STEP_PKGMGR_STEP_UNREGISTER_APP_H_ +#define COMMON_STEP_PKGMGR_STEP_UNREGISTER_APP_H_ #include @@ -31,4 +31,4 @@ class StepUnregisterApplication : public Step { } // namespace pkgmgr } // namespace common_installer -#endif // COMMON_STEP_STEP_UNREGISTER_APP_H_ +#endif // COMMON_STEP_PKGMGR_STEP_UNREGISTER_APP_H_ diff --git a/src/common/step/step_update_app.cc b/src/common/step/pkgmgr/step_update_app.cc similarity index 98% rename from src/common/step/step_update_app.cc rename to src/common/step/pkgmgr/step_update_app.cc index 3bb3500..417d229 100644 --- a/src/common/step/step_update_app.cc +++ b/src/common/step/pkgmgr/step_update_app.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 "common/step/step_update_app.h" +#include "common/step/pkgmgr/step_update_app.h" #include #include diff --git a/src/common/step/step_update_app.h b/src/common/step/pkgmgr/step_update_app.h similarity index 82% rename from src/common/step/step_update_app.h rename to src/common/step/pkgmgr/step_update_app.h index d823cc4..788b2d7 100644 --- a/src/common/step/step_update_app.h +++ b/src/common/step/pkgmgr/step_update_app.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 COMMON_STEP_STEP_UPDATE_APP_H_ -#define COMMON_STEP_STEP_UPDATE_APP_H_ +#ifndef COMMON_STEP_PKGMGR_STEP_UPDATE_APP_H_ +#define COMMON_STEP_PKGMGR_STEP_UPDATE_APP_H_ #include @@ -28,4 +28,4 @@ class StepUpdateApplication : public Step { } // namespace pkgmgr } // namespace common_installer -#endif // COMMON_STEP_STEP_UPDATE_APP_H_ +#endif // COMMON_STEP_PKGMGR_STEP_UPDATE_APP_H_ diff --git a/src/common/step/step_update_tep.cc b/src/common/step/pkgmgr/step_update_tep.cc similarity index 96% rename from src/common/step/step_update_tep.cc rename to src/common/step/pkgmgr/step_update_tep.cc index 1d4c904..33efb93 100644 --- a/src/common/step/step_update_tep.cc +++ b/src/common/step/pkgmgr/step_update_tep.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 "common/step/step_update_tep.h" +#include "common/step/pkgmgr/step_update_tep.h" #include #include diff --git a/src/common/step/step_update_tep.h b/src/common/step/pkgmgr/step_update_tep.h similarity index 82% rename from src/common/step/step_update_tep.h rename to src/common/step/pkgmgr/step_update_tep.h index 57b0a97..8daa61d 100644 --- a/src/common/step/step_update_tep.h +++ b/src/common/step/pkgmgr/step_update_tep.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 COMMON_STEP_STEP_UPDATE_TEP_H_ -#define COMMON_STEP_STEP_UPDATE_TEP_H_ +#ifndef COMMON_STEP_PKGMGR_STEP_UPDATE_TEP_H_ +#define COMMON_STEP_PKGMGR_STEP_UPDATE_TEP_H_ #include @@ -28,4 +28,4 @@ class StepUpdateTep : public Step { } // namespace pkgmgr } // namespace common_installer -#endif // COMMON_STEP_STEP_UPDATE_TEP_H_ +#endif // COMMON_STEP_PKGMGR_STEP_UPDATE_TEP_H_ diff --git a/src/common/step/step_open_recovery_file.cc b/src/common/step/recovery/step_open_recovery_file.cc similarity index 96% rename from src/common/step/step_open_recovery_file.cc rename to src/common/step/recovery/step_open_recovery_file.cc index 355f25f..848ec0c 100644 --- a/src/common/step/step_open_recovery_file.cc +++ b/src/common/step/recovery/step_open_recovery_file.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 "common/step/step_open_recovery_file.h" +#include "common/step/recovery/step_open_recovery_file.h" #include diff --git a/src/common/step/step_open_recovery_file.h b/src/common/step/recovery/step_open_recovery_file.h similarity index 79% rename from src/common/step/step_open_recovery_file.h rename to src/common/step/recovery/step_open_recovery_file.h index 7aa4762..dda174d 100644 --- a/src/common/step/step_open_recovery_file.h +++ b/src/common/step/recovery/step_open_recovery_file.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 COMMON_STEP_STEP_OPEN_RECOVERY_FILE_H_ -#define COMMON_STEP_STEP_OPEN_RECOVERY_FILE_H_ +#ifndef COMMON_STEP_RECOVERY_STEP_OPEN_RECOVERY_FILE_H_ +#define COMMON_STEP_RECOVERY_STEP_OPEN_RECOVERY_FILE_H_ #include @@ -29,4 +29,4 @@ class StepOpenRecoveryFile : public Step { } // namespace recovery } // namespace common_installer -#endif // COMMON_STEP_STEP_OPEN_RECOVERY_FILE_H_ +#endif // COMMON_STEP_RECOVERY_STEP_OPEN_RECOVERY_FILE_H_ diff --git a/src/common/step/step_recovery.cc b/src/common/step/recovery/step_recovery.cc similarity index 93% rename from src/common/step/step_recovery.cc rename to src/common/step/recovery/step_recovery.cc index 4af5bca..153042b 100644 --- a/src/common/step/step_recovery.cc +++ b/src/common/step/recovery/step_recovery.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 "common/step/step_recovery.h" +#include "common/step/recovery/step_recovery.h" #include diff --git a/src/common/step/step_recovery.h b/src/common/step/recovery/step_recovery.h similarity index 87% rename from src/common/step/step_recovery.h rename to src/common/step/recovery/step_recovery.h index b6ee696..eea22bc 100644 --- a/src/common/step/step_recovery.h +++ b/src/common/step/recovery/step_recovery.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 COMMON_STEP_STEP_RECOVERY_H_ -#define COMMON_STEP_STEP_RECOVERY_H_ +#ifndef COMMON_STEP_RECOVERY_STEP_RECOVERY_H_ +#define COMMON_STEP_RECOVERY_STEP_RECOVERY_H_ #include "common/installer_context.h" @@ -39,4 +39,4 @@ class StepRecovery : public Step { } // namespace recovery } // namespace common_installer -#endif // COMMON_STEP_STEP_RECOVERY_H_ +#endif // COMMON_STEP_RECOVERY_STEP_RECOVERY_H_ diff --git a/src/common/step/step_check_background_category.cc b/src/common/step/security/step_check_background_category.cc similarity index 99% rename from src/common/step/step_check_background_category.cc rename to src/common/step/security/step_check_background_category.cc index 71cf036..696e497 100644 --- a/src/common/step/step_check_background_category.cc +++ b/src/common/step/security/step_check_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 "common/step/step_check_background_category.h" +#include "common/step/security/step_check_background_category.h" #include diff --git a/src/common/step/step_check_background_category.h b/src/common/step/security/step_check_background_category.h similarity index 95% rename from src/common/step/step_check_background_category.h rename to src/common/step/security/step_check_background_category.h index 9bf3da2..46e275b 100644 --- a/src/common/step/step_check_background_category.h +++ b/src/common/step/security/step_check_background_category.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 COMMON_STEP_STEP_CHECK_BACKGROUND_CATEGORY_H_ -#define COMMON_STEP_STEP_CHECK_BACKGROUND_CATEGORY_H_ +#ifndef COMMON_STEP_SECURITY_STEP_CHECK_BACKGROUND_CATEGORY_H_ +#define COMMON_STEP_SECURITY_STEP_CHECK_BACKGROUND_CATEGORY_H_ #include #include @@ -98,4 +98,4 @@ class StepCheckBackgroundCategory : public common_installer::Step { } // namespace security } // namespace common_installer -#endif // COMMON_STEP_STEP_CHECK_BACKGROUND_CATEGORY_H_ +#endif // COMMON_STEP_SECURITY_STEP_CHECK_BACKGROUND_CATEGORY_H_ diff --git a/src/common/step/step_check_old_certificate.cc b/src/common/step/security/step_check_old_certificate.cc similarity index 96% rename from src/common/step/step_check_old_certificate.cc rename to src/common/step/security/step_check_old_certificate.cc index 91f70c5..e41fb30 100644 --- a/src/common/step/step_check_old_certificate.cc +++ b/src/common/step/security/step_check_old_certificate.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 "common/step/step_check_old_certificate.h" +#include "common/step/security/step_check_old_certificate.h" #include #include diff --git a/src/common/step/step_check_old_certificate.h b/src/common/step/security/step_check_old_certificate.h similarity index 84% rename from src/common/step/step_check_old_certificate.h rename to src/common/step/security/step_check_old_certificate.h index ab3179a..f3c8e12 100644 --- a/src/common/step/step_check_old_certificate.h +++ b/src/common/step/security/step_check_old_certificate.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 COMMON_STEP_STEP_CHECK_OLD_CERTIFICATE_H_ -#define COMMON_STEP_STEP_CHECK_OLD_CERTIFICATE_H_ +#ifndef COMMON_STEP_SECURITY_STEP_CHECK_OLD_CERTIFICATE_H_ +#define COMMON_STEP_SECURITY_STEP_CHECK_OLD_CERTIFICATE_H_ #include @@ -37,4 +37,4 @@ class StepCheckOldCertificate : public Step { } // namespace security } // namespace common_installer -#endif // COMMON_STEP_STEP_CHECK_OLD_CERTIFICATE_H_ +#endif // COMMON_STEP_SECURITY_STEP_CHECK_OLD_CERTIFICATE_H_ diff --git a/src/common/step/step_check_signature.cc b/src/common/step/security/step_check_signature.cc similarity index 99% rename from src/common/step/step_check_signature.cc rename to src/common/step/security/step_check_signature.cc index 15dedea..df04a91 100644 --- a/src/common/step/step_check_signature.cc +++ b/src/common/step/security/step_check_signature.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 "common/step/step_check_signature.h" +#include "common/step/security/step_check_signature.h" #include #include diff --git a/src/common/step/step_check_signature.h b/src/common/step/security/step_check_signature.h similarity index 88% rename from src/common/step/step_check_signature.h rename to src/common/step/security/step_check_signature.h index 2455de3..bd4a24c 100644 --- a/src/common/step/step_check_signature.h +++ b/src/common/step/security/step_check_signature.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 COMMON_STEP_STEP_CHECK_SIGNATURE_H_ -#define COMMON_STEP_STEP_CHECK_SIGNATURE_H_ +#ifndef COMMON_STEP_SECURITY_STEP_CHECK_SIGNATURE_H_ +#define COMMON_STEP_SECURITY_STEP_CHECK_SIGNATURE_H_ #include @@ -52,4 +52,4 @@ Step::Status ValidateSignatures(const boost::filesystem::path& base_path, } // namespace security } // namespace common_installer -#endif // COMMON_STEP_STEP_CHECK_SIGNATURE_H_ +#endif // COMMON_STEP_SECURITY_STEP_CHECK_SIGNATURE_H_ diff --git a/src/common/step/step_privilege_compatibility.cc b/src/common/step/security/step_privilege_compatibility.cc similarity index 98% rename from src/common/step/step_privilege_compatibility.cc rename to src/common/step/security/step_privilege_compatibility.cc index 17e7534..97a34a4 100644 --- a/src/common/step/step_privilege_compatibility.cc +++ b/src/common/step/security/step_privilege_compatibility.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 "common/step/step_privilege_compatibility.h" +#include "common/step/security/step_privilege_compatibility.h" #include #include diff --git a/src/common/step/step_privilege_compatibility.h b/src/common/step/security/step_privilege_compatibility.h similarity index 82% rename from src/common/step/step_privilege_compatibility.h rename to src/common/step/security/step_privilege_compatibility.h index b9982f0..30a0015 100644 --- a/src/common/step/step_privilege_compatibility.h +++ b/src/common/step/security/step_privilege_compatibility.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 COMMON_STEP_STEP_PRIVILEGE_COMPATIBILITY_H_ -#define COMMON_STEP_STEP_PRIVILEGE_COMPATIBILITY_H_ +#ifndef COMMON_STEP_SECURITY_STEP_PRIVILEGE_COMPATIBILITY_H_ +#define COMMON_STEP_SECURITY_STEP_PRIVILEGE_COMPATIBILITY_H_ #include @@ -33,4 +33,4 @@ class StepPrivilegeCompatibility : public Step { } // namespace security } // namespace common_installer -#endif // COMMON_STEP_STEP_PRIVILEGE_COMPATIBILITY_H_ +#endif // COMMON_STEP_SECURITY_STEP_PRIVILEGE_COMPATIBILITY_H_ diff --git a/src/common/step/step_recover_security.cc b/src/common/step/security/step_recover_security.cc similarity index 97% rename from src/common/step/step_recover_security.cc rename to src/common/step/security/step_recover_security.cc index 264ce4d..3908594 100644 --- a/src/common/step/step_recover_security.cc +++ b/src/common/step/security/step_recover_security.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 "common/step/step_recover_security.h" +#include "common/step/security/step_recover_security.h" #include #include diff --git a/src/common/step/step_recover_security.h b/src/common/step/security/step_recover_security.h similarity index 80% rename from src/common/step/step_recover_security.h rename to src/common/step/security/step_recover_security.h index f2850d6..429df46 100644 --- a/src/common/step/step_recover_security.h +++ b/src/common/step/security/step_recover_security.h @@ -2,13 +2,13 @@ // Use of this source code is governed by an apache-2.0 license that can be // found in the LICENSE file. -#ifndef COMMON_STEP_STEP_RECOVER_SECURITY_H_ -#define COMMON_STEP_STEP_RECOVER_SECURITY_H_ +#ifndef COMMON_STEP_SECURITY_STEP_RECOVER_SECURITY_H_ +#define COMMON_STEP_SECURITY_STEP_RECOVER_SECURITY_H_ #include #include "common/installer_context.h" -#include "common/step/step_recovery.h" +#include "common/step/recovery/step_recovery.h" namespace common_installer { namespace security { @@ -38,4 +38,4 @@ class StepRecoverSecurity : public recovery::StepRecovery { } // namespace security } // namespace common_installer -#endif // COMMON_STEP_STEP_RECOVER_SECURITY_H_ +#endif // COMMON_STEP_SECURITY_STEP_RECOVER_SECURITY_H_ diff --git a/src/common/step/step_register_security.cc b/src/common/step/security/step_register_security.cc similarity index 96% rename from src/common/step/step_register_security.cc rename to src/common/step/security/step_register_security.cc index a4dd3c0..a155ef8 100644 --- a/src/common/step/step_register_security.cc +++ b/src/common/step/security/step_register_security.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 "common/step/step_register_security.h" +#include "common/step/security/step_register_security.h" #include #include diff --git a/src/common/step/step_register_security.h b/src/common/step/security/step_register_security.h similarity index 78% rename from src/common/step/step_register_security.h rename to src/common/step/security/step_register_security.h index 3e7bd70..b4bfb06 100644 --- a/src/common/step/step_register_security.h +++ b/src/common/step/security/step_register_security.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 COMMON_STEP_STEP_REGISTER_SECURITY_H_ -#define COMMON_STEP_STEP_REGISTER_SECURITY_H_ +#ifndef COMMON_STEP_SECURITY_STEP_REGISTER_SECURITY_H_ +#define COMMON_STEP_SECURITY_STEP_REGISTER_SECURITY_H_ #include @@ -27,4 +27,4 @@ class StepRegisterSecurity : public Step { } // namespace security } // namespace common_installer -#endif // COMMON_STEP_STEP_REGISTER_SECURITY_H_ +#endif // COMMON_STEP_SECURITY_STEP_REGISTER_SECURITY_H_ diff --git a/src/common/step/step_revoke_security.cc b/src/common/step/security/step_revoke_security.cc similarity index 96% rename from src/common/step/step_revoke_security.cc rename to src/common/step/security/step_revoke_security.cc index 445833e..b8187ee 100644 --- a/src/common/step/step_revoke_security.cc +++ b/src/common/step/security/step_revoke_security.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 "common/step/step_revoke_security.h" +#include "common/step/security/step_revoke_security.h" #include #include diff --git a/src/common/step/step_revoke_security.h b/src/common/step/security/step_revoke_security.h similarity index 82% rename from src/common/step/step_revoke_security.h rename to src/common/step/security/step_revoke_security.h index 6b291d6..14645fd 100644 --- a/src/common/step/step_revoke_security.h +++ b/src/common/step/security/step_revoke_security.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 COMMON_STEP_STEP_REVOKE_SECURITY_H_ -#define COMMON_STEP_STEP_REVOKE_SECURITY_H_ +#ifndef COMMON_STEP_SECURITY_STEP_REVOKE_SECURITY_H_ +#define COMMON_STEP_SECURITY_STEP_REVOKE_SECURITY_H_ #include @@ -30,4 +30,4 @@ class StepRevokeSecurity : public Step { } // namespace security } // namespace common_installer -#endif // COMMON_STEP_STEP_REVOKE_SECURITY_H_ +#endif // COMMON_STEP_SECURITY_STEP_REVOKE_SECURITY_H_ diff --git a/src/common/step/step_rollback_deinstallation_security.cc b/src/common/step/security/step_rollback_deinstallation_security.cc similarity index 95% rename from src/common/step/step_rollback_deinstallation_security.cc rename to src/common/step/security/step_rollback_deinstallation_security.cc index d8bbe65..251a4e3 100644 --- a/src/common/step/step_rollback_deinstallation_security.cc +++ b/src/common/step/security/step_rollback_deinstallation_security.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 "common/step/step_rollback_deinstallation_security.h" +#include "common/step/security/step_rollback_deinstallation_security.h" #include #include diff --git a/src/common/step/step_rollback_deinstallation_security.h b/src/common/step/security/step_rollback_deinstallation_security.h similarity index 78% rename from src/common/step/step_rollback_deinstallation_security.h rename to src/common/step/security/step_rollback_deinstallation_security.h index 412485a..3ad3f27 100644 --- a/src/common/step/step_rollback_deinstallation_security.h +++ b/src/common/step/security/step_rollback_deinstallation_security.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 COMMON_STEP_STEP_ROLLBACK_DEINSTALLATION_SECURITY_H_ -#define COMMON_STEP_STEP_ROLLBACK_DEINSTALLATION_SECURITY_H_ +#ifndef COMMON_STEP_SECURITY_STEP_ROLLBACK_DEINSTALLATION_SECURITY_H_ +#define COMMON_STEP_SECURITY_STEP_ROLLBACK_DEINSTALLATION_SECURITY_H_ #include @@ -29,4 +29,4 @@ class StepRollbackDeinstallationSecurity : public Step { } // namespace security } // namespace common_installer -#endif // COMMON_STEP_STEP_ROLLBACK_DEINSTALLATION_SECURITY_H_ +#endif // COMMON_STEP_SECURITY_STEP_ROLLBACK_DEINSTALLATION_SECURITY_H_ diff --git a/src/common/step/step_rollback_installation_security.cc b/src/common/step/security/step_rollback_installation_security.cc similarity index 94% rename from src/common/step/step_rollback_installation_security.cc rename to src/common/step/security/step_rollback_installation_security.cc index b7b00ec..0a50d51 100644 --- a/src/common/step/step_rollback_installation_security.cc +++ b/src/common/step/security/step_rollback_installation_security.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 "common/step/step_rollback_installation_security.h" +#include "common/step/security/step_rollback_installation_security.h" #include #include diff --git a/src/common/step/step_rollback_installation_security.h b/src/common/step/security/step_rollback_installation_security.h similarity index 80% rename from src/common/step/step_rollback_installation_security.h rename to src/common/step/security/step_rollback_installation_security.h index 64bc04f..58bd0e1 100644 --- a/src/common/step/step_rollback_installation_security.h +++ b/src/common/step/security/step_rollback_installation_security.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 COMMON_STEP_STEP_ROLLBACK_INSTALLATION_SECURITY_H_ -#define COMMON_STEP_STEP_ROLLBACK_INSTALLATION_SECURITY_H_ +#ifndef COMMON_STEP_SECURITY_STEP_ROLLBACK_INSTALLATION_SECURITY_H_ +#define COMMON_STEP_SECURITY_STEP_ROLLBACK_INSTALLATION_SECURITY_H_ #include @@ -30,4 +30,4 @@ class StepRollbackInstallationSecurity : public Step { } // namespace security } // namespace common_installer -#endif // COMMON_STEP_STEP_ROLLBACK_INSTALLATION_SECURITY_H_ +#endif // COMMON_STEP_SECURITY_STEP_ROLLBACK_INSTALLATION_SECURITY_H_ diff --git a/src/common/step/step_update_security.cc b/src/common/step/security/step_update_security.cc similarity index 96% rename from src/common/step/step_update_security.cc rename to src/common/step/security/step_update_security.cc index a3a3d03..dfcd499 100644 --- a/src/common/step/step_update_security.cc +++ b/src/common/step/security/step_update_security.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 "common/step/step_update_security.h" +#include "common/step/security/step_update_security.h" #include diff --git a/src/common/step/step_update_security.h b/src/common/step/security/step_update_security.h similarity index 79% rename from src/common/step/step_update_security.h rename to src/common/step/security/step_update_security.h index d29a765..0578269 100644 --- a/src/common/step/step_update_security.h +++ b/src/common/step/security/step_update_security.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 COMMON_STEP_STEP_UPDATE_SECURITY_H_ -#define COMMON_STEP_STEP_UPDATE_SECURITY_H_ +#ifndef COMMON_STEP_SECURITY_STEP_UPDATE_SECURITY_H_ +#define COMMON_STEP_SECURITY_STEP_UPDATE_SECURITY_H_ #include @@ -27,4 +27,4 @@ class StepUpdateSecurity : public Step { } // namespace security } // namespace common_installer -#endif // COMMON_STEP_STEP_UPDATE_SECURITY_H_ +#endif // COMMON_STEP_SECURITY_STEP_UPDATE_SECURITY_H_ diff --git a/src/unit_tests/signature_unittest.cc b/src/unit_tests/signature_unittest.cc index 8de4045..cdc21ed 100644 --- a/src/unit_tests/signature_unittest.cc +++ b/src/unit_tests/signature_unittest.cc @@ -7,7 +7,7 @@ #include -#include "common/step/step_check_signature.h" +#include "common/step/security/step_check_signature.h" namespace bf = boost::filesystem; -- 2.7.4