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: Idb6548add52b29a92837d15ef7180587fe902d29

diff --git a/src/hybrid/CMakeLists.txt b/src/hybrid/CMakeLists.txt
index 040d9fc..0e2418f 100644 (file)
--- a/src/hybrid/CMakeLists.txt
+++ b/src/hybrid/CMakeLists.txt
@@ -1,8 +1,8 @@
 SET(SRCS
-  step/step_encrypt_resources.cc
-  step/step_merge_tpk_config.cc
-  step/step_parse.cc
-  step/step_stash_tpk_config.cc
+  step/configuration/step_merge_tpk_config.cc
+  step/configuration/step_parse.cc
+  step/configuration/step_stash_tpk_config.cc
+  step/encryption/step_encrypt_resources.cc
   hybrid_installer.cc
 )
 ADD_LIBRARY(${TARGET_LIBNAME_HYBRID} STATIC ${SRCS})

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 834db03..b12354d 100644 (file)
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -4,62 +4,62 @@
 
 #include "hybrid/hybrid_installer.h"
 
-#include <common/step/step_check_signature.h>
-#include <common/step/step_backup_icons.h>
-#include <common/step/step_backup_manifest.h>
-#include <common/step/step_check_removable.h>
-#include <common/step/step_configure.h>
-#include <common/step/step_copy.h>
-#include <common/step/step_copy_backup.h>
-#include <common/step/step_copy_storage_directories.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_delta_patch.h>
-#include <common/step/step_fail.h>
-#include <common/step/step_kill_apps.h>
-#include <common/step/step_parse_manifest.h>
-#include <common/step/step_privilege_compatibility.h>
-#include <common/step/step_register_app.h>
-#include <common/step/step_register_security.h>
-#include <common/step/step_remove_files.h>
-#include <common/step/step_remove_icons.h>
-#include <common/step/step_revoke_security.h>
-#include <common/step/step_open_recovery_file.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_remove_temporary_directory.h>
-#include <common/step/step_remove_per_user_storage_directories.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_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_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_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_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/recovery/step_open_recovery_file.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_create_symbolic_link.h>
-#include <tpk/step/step_tpk_patch_icons.h>
+#include <tpk/step/filesystem/step_create_symbolic_link.h>
+#include <tpk/step/filesystem/step_tpk_patch_icons.h>
 
 #include "hybrid/hybrid_backend_data.h"
-#include "hybrid/step/step_encrypt_resources.h"
-#include "hybrid/step/step_merge_tpk_config.h"
-#include "hybrid/step/step_stash_tpk_config.h"
-#include "hybrid/step/step_parse.h"
-#include "wgt/step/step_check_settings_level.h"
-#include "wgt/step/step_check_wgt_background_category.h"
-#include "wgt/step/step_create_symbolic_link.h"
-#include "wgt/step/step_generate_xml.h"
-#include "wgt/step/step_parse_recovery.h"
-#include "wgt/step/step_remove_encryption_data.h"
-#include "wgt/step/step_wgt_patch_icons.h"
-#include "wgt/step/step_wgt_patch_storage_directories.h"
+#include "hybrid/step/configuration/step_merge_tpk_config.h"
+#include "hybrid/step/configuration/step_parse.h"
+#include "hybrid/step/configuration/step_stash_tpk_config.h"
+#include "hybrid/step/encryption/step_encrypt_resources.h"
+#include "wgt/step/configuration/step_parse_recovery.h"
+#include "wgt/step/encryption/step_remove_encryption_data.h"
+#include "wgt/step/filesystem/step_create_symbolic_link.h"
+#include "wgt/step/filesystem/step_wgt_patch_icons.h"
+#include "wgt/step/filesystem/step_wgt_patch_storage_directories.h"
+#include "wgt/step/pkgmgr/step_generate_xml.h"
+#include "wgt/step/security/step_check_settings_level.h"
+#include "wgt/step/security/step_check_wgt_background_category.h"
 
 namespace ci = common_installer;
 
@@ -73,17 +73,17 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
     case ci::RequestType::Install:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::filesystem::StepUnzip>();
-      AddStep<ci::parse::StepParseManifest>(
-          ci::parse::StepParseManifest::ManifestLocation::PACKAGE,
-          ci::parse::StepParseManifest::StoreLocation::NORMAL);
-      AddStep<hybrid::parse::StepStashTpkConfig>();
-      AddStep<hybrid::parse::StepParse>(true);
-      AddStep<hybrid::parse::StepMergeTpkConfig>();
+      AddStep<ci::configuration::StepParseManifest>(
+          ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
+          ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+      AddStep<hybrid::configuration::StepStashTpkConfig>();
+      AddStep<hybrid::configuration::StepParse>(true);
+      AddStep<hybrid::configuration::StepMergeTpkConfig>();
       AddStep<ci::security::StepCheckSignature>();
       AddStep<ci::security::StepPrivilegeCompatibility>();
       AddStep<wgt::security::StepCheckSettingsLevel>();
       AddStep<wgt::security::StepCheckWgtBackgroundCategory>();
-      AddStep<hybrid::encrypt::StepEncryptResources>();
+      AddStep<hybrid::encryption::StepEncryptResources>();
       AddStep<ci::security::StepRollbackInstallationSecurity>();
       AddStep<ci::filesystem::StepCopy>();
       AddStep<tpk::filesystem::StepTpkPatchIcons>();
@@ -103,21 +103,21 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
     case ci::RequestType::Update:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::filesystem::StepUnzip>();
-      AddStep<ci::parse::StepParseManifest>(
-          ci::parse::StepParseManifest::ManifestLocation::PACKAGE,
-          ci::parse::StepParseManifest::StoreLocation::NORMAL);
-      AddStep<hybrid::parse::StepStashTpkConfig>();
-      AddStep<hybrid::parse::StepParse>(true);
-      AddStep<hybrid::parse::StepMergeTpkConfig>();
+      AddStep<ci::configuration::StepParseManifest>(
+          ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
+          ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+      AddStep<hybrid::configuration::StepStashTpkConfig>();
+      AddStep<hybrid::configuration::StepParse>(true);
+      AddStep<hybrid::configuration::StepMergeTpkConfig>();
       AddStep<ci::security::StepCheckSignature>();
       AddStep<ci::security::StepPrivilegeCompatibility>();
       AddStep<wgt::security::StepCheckSettingsLevel>();
       AddStep<wgt::security::StepCheckWgtBackgroundCategory>();
-      AddStep<hybrid::encrypt::StepEncryptResources>();
+      AddStep<hybrid::encryption::StepEncryptResources>();
       AddStep<ci::security::StepRollbackInstallationSecurity>();
-      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>();
@@ -138,9 +138,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
     case ci::RequestType::Uninstall:
       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>();
@@ -149,7 +149,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<ci::security::StepRollbackDeinstallationSecurity>();
       AddStep<ci::filesystem::StepRemoveFiles>();
       AddStep<ci::filesystem::StepRemoveIcons>();
-      AddStep<wgt::encrypt::StepRemoveEncryptionData>();
+      AddStep<wgt::encryption::StepRemoveEncryptionData>();
       AddStep<ci::security::StepRevokeSecurity>();
       AddStep<ci::pkgmgr::StepRemoveManifest>();
       break;
@@ -160,22 +160,22 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
     case ci::RequestType::Delta:
       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<hybrid::parse::StepStashTpkConfig>();
-      AddStep<hybrid::parse::StepParse>(true);
-      AddStep<hybrid::parse::StepMergeTpkConfig>();
+      AddStep<hybrid::configuration::StepStashTpkConfig>();
+      AddStep<hybrid::configuration::StepParse>(true);
+      AddStep<hybrid::configuration::StepMergeTpkConfig>();
       AddStep<ci::security::StepCheckSignature>();
       AddStep<ci::security::StepPrivilegeCompatibility>();
       AddStep<wgt::security::StepCheckSettingsLevel>();
       AddStep<wgt::security::StepCheckWgtBackgroundCategory>();
-      AddStep<hybrid::encrypt::StepEncryptResources>();
+      AddStep<hybrid::encryption::StepEncryptResources>();
       AddStep<ci::security::StepRollbackInstallationSecurity>();
-      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>();
@@ -196,12 +196,12 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
     case ci::RequestType::Recovery:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::recovery::StepOpenRecoveryFile>();
-      AddStep<ci::parse::StepParseManifest>(
-          ci::parse::StepParseManifest::ManifestLocation::RECOVERY,
-          ci::parse::StepParseManifest::StoreLocation::NORMAL);
-      AddStep<hybrid::parse::StepStashTpkConfig>();
-      AddStep<wgt::parse::StepParseRecovery>();
-      AddStep<hybrid::parse::StepMergeTpkConfig>();
+      AddStep<ci::configuration::StepParseManifest>(
+          ci::configuration::StepParseManifest::ManifestLocation::RECOVERY,
+          ci::configuration::StepParseManifest::StoreLocation::NORMAL);
+      AddStep<hybrid::configuration::StepStashTpkConfig>();
+      AddStep<wgt::configuration::StepParseRecovery>();
+      AddStep<hybrid::configuration::StepMergeTpkConfig>();
       AddStep<ci::pkgmgr::StepRecoverApplication>();
       AddStep<ci::filesystem::StepRemoveTemporaryDirectory>();
       AddStep<ci::filesystem::StepRecoverIcons>();

diff --git a/src/hybrid/step/step_merge_tpk_config.cc b/src/hybrid/step/configuration/step_merge_tpk_config.cc
similarity index 87%
rename from src/hybrid/step/step_merge_tpk_config.cc
rename to src/hybrid/step/configuration/step_merge_tpk_config.cc
index 77f8407..913ad98 100644 (file)
--- a/src/hybrid/step/step_merge_tpk_config.cc
+++ b/src/hybrid/step/configuration/step_merge_tpk_config.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#include "hybrid/step/step_merge_tpk_config.h"
+#include "hybrid/step/configuration/step_merge_tpk_config.h"
 
 #include <pkgmgrinfo_basic.h>
 
 #include "hybrid/hybrid_backend_data.h"
 
 namespace hybrid {
-namespace parse {
+namespace configuration {
 
 common_installer::Step::Status StepMergeTpkConfig::process() {
   HybridBackendData* data =
@@ -28,5 +28,5 @@ common_installer::Step::Status StepMergeTpkConfig::process() {
   return Status::OK;
 }
 
-}  // namespace parse
+}  // namespace configuration
 }  // namespace hybrid

diff --git a/src/hybrid/step/step_merge_tpk_config.h b/src/hybrid/step/configuration/step_merge_tpk_config.h
similarity index 76%
rename from src/hybrid/step/step_merge_tpk_config.h
rename to src/hybrid/step/configuration/step_merge_tpk_config.h
index e8476ef..0414abe 100644 (file)
--- a/src/hybrid/step/step_merge_tpk_config.h
+++ b/src/hybrid/step/configuration/step_merge_tpk_config.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef HYBRID_STEP_STEP_MERGE_TPK_CONFIG_H_
-#define HYBRID_STEP_STEP_MERGE_TPK_CONFIG_H_
+#ifndef HYBRID_STEP_CONFIGURATION_STEP_MERGE_TPK_CONFIG_H_
+#define HYBRID_STEP_CONFIGURATION_STEP_MERGE_TPK_CONFIG_H_
 
 #include <common/step/step.h>
 #include <manifest_parser/utils/logging.h>
 
 namespace hybrid {
-namespace parse {
+namespace configuration {
 
 /**
  * \brief MergeTpkConfig
@@ -28,7 +28,7 @@ class StepMergeTpkConfig : public common_installer::Step {
   SCOPE_LOG_TAG(MergeTpkConfig)
 };
 
-}  // namespace parse
+}  // namespace configuration
 }  // namespace hybrid
 
-#endif  // HYBRID_STEP_STEP_MERGE_TPK_CONFIG_H_
+#endif  // HYBRID_STEP_CONFIGURATION_STEP_MERGE_TPK_CONFIG_H_

diff --git a/src/hybrid/step/step_parse.cc b/src/hybrid/step/configuration/step_parse.cc
similarity index 78%
rename from src/hybrid/step/step_parse.cc
rename to src/hybrid/step/configuration/step_parse.cc
index c15fa2a..1e25fbe 100644 (file)
--- a/src/hybrid/step/step_parse.cc
+++ b/src/hybrid/step/configuration/step_parse.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 "hybrid/step/step_parse.h"
+#include "hybrid/step/configuration/step_parse.h"
 
 namespace {
 
@@ -11,12 +11,12 @@ const char kResWgtPath[] = "res/wgt";
 }
 
 namespace hybrid {
-namespace parse {
+namespace configuration {
 
 bool StepParse::LocateConfigFile() {
   return Check(context_->unpacked_dir_path.get() / kResWgtPath);
 }
 
-}  // namespace parse
+}  // namespace configuration
 }  // namespace hybrid
 

diff --git a/src/hybrid/step/step_parse.h b/src/hybrid/step/configuration/step_parse.h
similarity index 59%
rename from src/hybrid/step/step_parse.h
rename to src/hybrid/step/configuration/step_parse.h
index aff8a71..4c5b339 100644 (file)
--- a/src/hybrid/step/step_parse.h
+++ b/src/hybrid/step/configuration/step_parse.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef HYBRID_STEP_STEP_PARSE_H_
-#define HYBRID_STEP_STEP_PARSE_H_
+#ifndef HYBRID_STEP_CONFIGURATION_STEP_PARSE_H_
+#define HYBRID_STEP_CONFIGURATION_STEP_PARSE_H_
 
 #include <manifest_parser/utils/logging.h>
 
-#include "wgt/step/step_parse.h"
+#include "wgt/step/configuration/step_parse.h"
 
 namespace hybrid {
-namespace parse {
+namespace configuration {
 
 /**
  * \brief This step parse config.xml configuration file of widget
@@ -18,16 +18,16 @@ namespace parse {
  * This subclass overrides location of file and it is used when hybrid package
  * is installed.
  */
-class StepParse : public wgt::parse::StepParse {
+class StepParse : public wgt::configuration::StepParse {
  public:
-  using wgt::parse::StepParse::StepParse;
+  using wgt::configuration::StepParse::StepParse;
 
   bool LocateConfigFile() override;
 
   SCOPE_LOG_TAG(Parse)
 };
 
-}  // namespace parse
+}  // namespace configuration
 }  // namespace hybrid
 
-#endif  // HYBRID_STEP_STEP_PARSE_H_
+#endif  // HYBRID_STEP_CONFIGURATION_STEP_PARSE_H_

diff --git a/src/hybrid/step/step_stash_tpk_config.cc b/src/hybrid/step/configuration/step_stash_tpk_config.cc
similarity index 82%
rename from src/hybrid/step/step_stash_tpk_config.cc
rename to src/hybrid/step/configuration/step_stash_tpk_config.cc
index c409a44..2ec91e7 100644 (file)
--- a/src/hybrid/step/step_stash_tpk_config.cc
+++ b/src/hybrid/step/configuration/step_stash_tpk_config.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#include "hybrid/step/step_stash_tpk_config.h"
+#include "hybrid/step/configuration/step_stash_tpk_config.h"
 
 #include "hybrid/hybrid_backend_data.h"
 
 namespace hybrid {
-namespace parse {
+namespace configuration {
 
 common_installer::Step::Status StepStashTpkConfig::process() {
   HybridBackendData* data =
@@ -18,5 +18,5 @@ common_installer::Step::Status StepStashTpkConfig::process() {
   return Status::OK;
 }
 
-}  // namespace parse
+}  // namespace configuration
 }  // namespace hybrid

diff --git a/src/hybrid/step/step_stash_tpk_config.h b/src/hybrid/step/configuration/step_stash_tpk_config.h
similarity index 75%
rename from src/hybrid/step/step_stash_tpk_config.h
rename to src/hybrid/step/configuration/step_stash_tpk_config.h
index 7db654c..7cc889c 100644 (file)
--- a/src/hybrid/step/step_stash_tpk_config.h
+++ b/src/hybrid/step/configuration/step_stash_tpk_config.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef HYBRID_STEP_STEP_STASH_TPK_CONFIG_H_
-#define HYBRID_STEP_STEP_STASH_TPK_CONFIG_H_
+#ifndef HYBRID_STEP_CONFIGURATION_STEP_STASH_TPK_CONFIG_H_
+#define HYBRID_STEP_CONFIGURATION_STEP_STASH_TPK_CONFIG_H_
 
 #include <common/step/step.h>
 #include <manifest_parser/utils/logging.h>
 
 namespace hybrid {
-namespace parse {
+namespace configuration {
 
 /**
  * \brief StepCheckHybrid
@@ -28,7 +28,7 @@ class StepStashTpkConfig : public common_installer::Step {
   SCOPE_LOG_TAG(StashTpkConfig)
 };
 
-}  // namespace parse
+}  // namespace configuration
 }  // namespace hybrid
 
-#endif  // HYBRID_STEP_STEP_STASH_TPK_CONFIG_H_
+#endif  // HYBRID_STEP_CONFIGURATION_STEP_STASH_TPK_CONFIG_H_

diff --git a/src/hybrid/step/step_encrypt_resources.cc b/src/hybrid/step/encryption/step_encrypt_resources.cc
similarity index 75%
rename from src/hybrid/step/step_encrypt_resources.cc
rename to src/hybrid/step/encryption/step_encrypt_resources.cc
index a4411b6..2265a35 100644 (file)
--- a/src/hybrid/step/step_encrypt_resources.cc
+++ b/src/hybrid/step/encryption/step_encrypt_resources.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#include "hybrid/step/step_encrypt_resources.h"
+#include "hybrid/step/encryption/step_encrypt_resources.h"
 
 namespace hybrid {
-namespace encrypt {
+namespace encryption {
 
 void StepEncryptResources::SetEncryptionRoot() {
   input_ = context_->unpacked_dir_path.get() / "res/wgt";
 }
 
-}  // namespace encrypt
+}  // namespace encryption
 }  // namespace hybrid
 

diff --git a/src/hybrid/step/step_encrypt_resources.h b/src/hybrid/step/encryption/step_encrypt_resources.h
similarity index 53%
rename from src/hybrid/step/step_encrypt_resources.h
rename to src/hybrid/step/encryption/step_encrypt_resources.h
index c86e510..ec66852 100644 (file)
--- a/src/hybrid/step/step_encrypt_resources.h
+++ b/src/hybrid/step/encryption/step_encrypt_resources.h
@@ -2,24 +2,24 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef HYBRID_STEP_STEP_ENCRYPT_RESOURCES_H_
-#define HYBRID_STEP_STEP_ENCRYPT_RESOURCES_H_
+#ifndef HYBRID_STEP_ENCRYPTION_STEP_ENCRYPT_RESOURCES_H_
+#define HYBRID_STEP_ENCRYPTION_STEP_ENCRYPT_RESOURCES_H_
 
 #include <manifest_parser/utils/logging.h>
 
-#include "wgt/step/step_encrypt_resources.h"
+#include "wgt/step/encryption/step_encrypt_resources.h"
 
 namespace hybrid {
-namespace encrypt {
+namespace encryption {
 
 /**
  * \brief Step that encrypt application resources files if flagged to do so
  *
  * This is variant for hybrid package
  */
-class StepEncryptResources : public wgt::encrypt::StepEncryptResources {
+class StepEncryptResources : public wgt::encryption::StepEncryptResources {
  public:
-  using wgt::encrypt::StepEncryptResources::StepEncryptResources;
+  using wgt::encryption::StepEncryptResources::StepEncryptResources;
 
  private:
   void SetEncryptionRoot() override;
@@ -27,7 +27,7 @@ class StepEncryptResources : public wgt::encrypt::StepEncryptResources {
   SCOPE_LOG_TAG(EncryptResources)
 };
 
-}  // namespace encrypt
+}  // namespace encryption
 }  // namespace hybrid
 
-#endif  // HYBRID_STEP_STEP_ENCRYPT_RESOURCES_H_
+#endif  // HYBRID_STEP_ENCRYPTION_STEP_ENCRYPT_RESOURCES_H_

diff --git a/src/unit_tests/manifest_test.cc b/src/unit_tests/manifest_test.cc
index da14f60..46d2f8b 100644 (file)
--- a/src/unit_tests/manifest_test.cc
+++ b/src/unit_tests/manifest_test.cc
@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 
-#include "wgt/step/step_parse.h"
+#include "wgt/step/configuration/step_parse.h"
 #include "wgt/wgt_backend_data.h"
 
 #define ASSERT_CSTR_EQ(STR1, STR2)                                             \
@@ -48,7 +48,7 @@ class StepParseRunner {
 
   bool Run() {
     PrepareContext();
-    wgt::parse::StepParse step(context_.get(), !ignore_start_files_);
+    wgt::configuration::StepParse step(context_.get(), !ignore_start_files_);
     return step.process() == ci::Step::Status::OK;
   }
 

diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc
index 5f3c772..00bc484 100644 (file)
--- a/src/unit_tests/smoke_test.cc
+++ b/src/unit_tests/smoke_test.cc
@@ -10,7 +10,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>
 #include <gtest/gtest-death-test.h>

diff --git a/src/wgt/CMakeLists.txt b/src/wgt/CMakeLists.txt
index 6cb1e7a..6dbb9c9 100644 (file)
--- a/src/wgt/CMakeLists.txt
+++ b/src/wgt/CMakeLists.txt
@@ -1,20 +1,20 @@
 # Target - sources
 SET(SRCS
   rds_parser.cc
-  step/step_check_settings_level.cc
-  step/step_check_wgt_background_category.cc
-  step/step_create_symbolic_link.cc
-  step/step_encrypt_resources.cc
-  step/step_generate_xml.cc
-  step/step_parse.cc
-  step/step_remove_encryption_data.cc
-  step/step_parse_recovery.cc
-  step/step_rds_parse.cc
-  step/step_rds_modify.cc
-  step/step_wgt_patch_icons.cc
-  step/step_wgt_patch_storage_directories.cc
-  step/step_wgt_resource_directory.cc
-  step/step_add_default_privileges.cc
+  step/configuration/step_parse.cc
+  step/configuration/step_parse_recovery.cc
+  step/encryption/step_encrypt_resources.cc
+  step/encryption/step_remove_encryption_data.cc
+  step/filesystem/step_create_symbolic_link.cc
+  step/filesystem/step_wgt_patch_icons.cc
+  step/filesystem/step_wgt_patch_storage_directories.cc
+  step/filesystem/step_wgt_resource_directory.cc
+  step/pkgmgr/step_generate_xml.cc
+  step/rds/step_rds_modify.cc
+  step/rds/step_rds_parse.cc
+  step/security/step_add_default_privileges.cc
+  step/security/step_check_settings_level.cc
+  step/security/step_check_wgt_background_category.cc
   wgt_app_query_interface.cc
   wgt_installer.cc
 )

diff --git a/src/wgt/step/step_parse.cc b/src/wgt/step/configuration/step_parse.cc
similarity index 87%
rename from src/wgt/step/step_parse.cc
rename to src/wgt/step/configuration/step_parse.cc
index 935b303..35e248e 100644 (file)
--- a/src/wgt/step/step_parse.cc
+++ b/src/wgt/step/configuration/step_parse.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 "wgt/step/step_parse.h"
+#include "wgt/step/configuration/step_parse.h"
 
 #include <boost/filesystem/path.hpp>
 
@@ -83,7 +83,7 @@ void SetApplicationXDefaults(application_x* application) {
 }  // namespace
 
 namespace wgt {
-namespace parse {
+namespace configuration {
 
 namespace app_keys = wgt::application_widget_keys;
 namespace sc = std::chrono;
@@ -95,7 +95,7 @@ StepParse::StepParse(common_installer::InstallerContext* context,
 }
 
 std::set<std::string> StepParse::ExtractPrivileges(
-    std::shared_ptr<const PermissionsInfo> perm_info) const {
+    std::shared_ptr<const wgt::parse::PermissionsInfo> perm_info) const {
   return perm_info->GetAPIPermissions();
 }
 
@@ -129,15 +129,15 @@ bool StepParse::FillInstallationInfo(manifest_x* manifest) {
 }
 
 bool StepParse::FillIconPaths(manifest_x* manifest) {
-  std::shared_ptr<const TizenApplicationInfo> app_info =
-      std::static_pointer_cast<const TizenApplicationInfo>(
+  std::shared_ptr<const wgt::parse::TizenApplicationInfo> app_info =
+      std::static_pointer_cast<const wgt::parse::TizenApplicationInfo>(
           parser_->GetManifestData(app_keys::kTizenApplicationKey));
   if (!app_info) {
     LOG(ERROR) << "Application info manifest data has not been found.";
     return false;
   }
-  std::shared_ptr<const ApplicationIconsInfo> icons_info =
-      std::static_pointer_cast<const ApplicationIconsInfo>(
+  std::shared_ptr<const wgt::parse::ApplicationIconsInfo> icons_info =
+      std::static_pointer_cast<const wgt::parse::ApplicationIconsInfo>(
           parser_->GetManifestData(app_keys::kIconsKey));
   if (icons_info.get()) {
     for (auto& application_icon : icons_info->icons()) {
@@ -153,9 +153,9 @@ bool StepParse::FillIconPaths(manifest_x* manifest) {
 }
 
 bool StepParse::FillWidgetInfo(manifest_x* manifest) {
-  std::shared_ptr<const WidgetInfo> wgt_info =
-      std::static_pointer_cast<const WidgetInfo>(parser_->GetManifestData(
-          app_keys::kWidgetKey));
+  std::shared_ptr<const wgt::parse::WidgetInfo> wgt_info =
+      std::static_pointer_cast<const wgt::parse::WidgetInfo>(
+          parser_->GetManifestData(app_keys::kWidgetKey));
   if (!wgt_info.get()) {
     LOG(ERROR) << "Widget info manifest data has not been found.";
     return false;
@@ -211,8 +211,8 @@ bool StepParse::FillWidgetInfo(manifest_x* manifest) {
   author->lang = strdup(DEFAULT_LOCALE);
   manifest->author = g_list_append(manifest->author, author);
 
-  std::shared_ptr<const SettingInfo> settings_info =
-      std::static_pointer_cast<const SettingInfo>(
+  std::shared_ptr<const wgt::parse::SettingInfo> settings_info =
+      std::static_pointer_cast<const wgt::parse::SettingInfo>(
           parser_->GetManifestData(
               wgt::application_widget_keys::kTizenSettingKey));
   if (settings_info) {
@@ -238,17 +238,17 @@ bool StepParse::FillWidgetInfo(manifest_x* manifest) {
 }
 
 bool StepParse::FillMainApplicationInfo(manifest_x* manifest) {
-  std::shared_ptr<const TizenApplicationInfo> app_info =
-      std::static_pointer_cast<const TizenApplicationInfo>(
+  std::shared_ptr<const wgt::parse::TizenApplicationInfo> app_info =
+      std::static_pointer_cast<const wgt::parse::TizenApplicationInfo>(
           parser_->GetManifestData(app_keys::kTizenApplicationKey));
   if (!app_info) {
     LOG(ERROR) << "Application info manifest data has not been found.";
     return false;
   }
   bool has_watch_catergory = false;
-  std::shared_ptr<const CategoryInfoList> category_info =
-      std::static_pointer_cast<const CategoryInfoList>(parser_->GetManifestData(
-          app_keys::kTizenCategoryKey));
+  std::shared_ptr<const wgt::parse::CategoryInfoList> category_info =
+      std::static_pointer_cast<const wgt::parse::CategoryInfoList>(
+          parser_->GetManifestData(app_keys::kTizenCategoryKey));
   if (category_info) {
     has_watch_catergory = std::find_if(category_info->categories.begin(),
                                        category_info->categories.end(),
@@ -298,8 +298,8 @@ bool StepParse::FillMainApplicationInfo(manifest_x* manifest) {
 }
 
 bool StepParse::FillServiceApplicationInfo(manifest_x* manifest) {
-  std::shared_ptr<const ServiceList> service_list =
-      std::static_pointer_cast<const ServiceList>(
+  std::shared_ptr<const wgt::parse::ServiceList> service_list =
+      std::static_pointer_cast<const wgt::parse::ServiceList>(
           parser_->GetManifestData(app_keys::kTizenServiceKey));
   if (!service_list)
     return true;
@@ -363,8 +363,9 @@ bool StepParse::FillServiceApplicationInfo(manifest_x* manifest) {
 bool StepParse::FillBackgroundCategoryInfo(manifest_x* manifest) {
   auto manifest_data = parser_->GetManifestData(
       app_keys::kTizenBackgroundCategoryKey);
-  std::shared_ptr<const BackgroundCategoryInfoList> bc_list =
-      std::static_pointer_cast<const BackgroundCategoryInfoList>(manifest_data);
+  std::shared_ptr<const wgt::parse::BackgroundCategoryInfoList> bc_list =
+      std::static_pointer_cast<const wgt::parse::BackgroundCategoryInfoList>(
+          manifest_data);
 
   if (!bc_list)
     return true;
@@ -381,8 +382,8 @@ bool StepParse::FillBackgroundCategoryInfo(manifest_x* manifest) {
 }
 
 bool StepParse::FillAppControl(manifest_x* manifest) {
-  std::shared_ptr<const AppControlInfoList> app_info_list =
-      std::static_pointer_cast<const AppControlInfoList>(
+  std::shared_ptr<const wgt::parse::AppControlInfoList> app_info_list =
+      std::static_pointer_cast<const wgt::parse::AppControlInfoList>(
           parser_->GetManifestData(app_keys::kTizenApplicationAppControlsKey));
 
   application_x* app =
@@ -401,9 +402,9 @@ bool StepParse::FillAppControl(manifest_x* manifest) {
 }
 
 bool StepParse::FillPrivileges(manifest_x* manifest) {
-  std::shared_ptr<const PermissionsInfo> perm_info =
-      std::static_pointer_cast<const PermissionsInfo>(parser_->GetManifestData(
-          app_keys::kTizenPermissionsKey));
+  std::shared_ptr<const wgt::parse::PermissionsInfo> perm_info =
+      std::static_pointer_cast<const wgt::parse::PermissionsInfo>(
+          parser_->GetManifestData(app_keys::kTizenPermissionsKey));
   std::set<std::string> privileges;
   if (perm_info)
     privileges = ExtractPrivileges(perm_info);
@@ -416,9 +417,9 @@ bool StepParse::FillPrivileges(manifest_x* manifest) {
 }
 
 bool StepParse::FillCategories(manifest_x* manifest) {
-  std::shared_ptr<const CategoryInfoList> category_info =
-      std::static_pointer_cast<const CategoryInfoList>(parser_->GetManifestData(
-          app_keys::kTizenCategoryKey));
+  std::shared_ptr<const wgt::parse::CategoryInfoList> category_info =
+      std::static_pointer_cast<const wgt::parse::CategoryInfoList>(
+          parser_->GetManifestData(app_keys::kTizenCategoryKey));
   if (!category_info)
     return true;
 
@@ -432,9 +433,9 @@ bool StepParse::FillCategories(manifest_x* manifest) {
 }
 
 bool StepParse::FillMetadata(manifest_x* manifest) {
-  std::shared_ptr<const MetaDataInfo> meta_info =
-      std::static_pointer_cast<const MetaDataInfo>(parser_->GetManifestData(
-          app_keys::kTizenMetaDataKey));
+  std::shared_ptr<const wgt::parse::MetaDataInfo> meta_info =
+      std::static_pointer_cast<const wgt::parse::MetaDataInfo>(
+          parser_->GetManifestData(app_keys::kTizenMetaDataKey));
   if (!meta_info)
     return true;
 
@@ -445,9 +446,9 @@ bool StepParse::FillMetadata(manifest_x* manifest) {
 }
 
 bool StepParse::FillAccounts(manifest_x* manifest) {
-  std::shared_ptr<const AccountInfo> account_info =
-      std::static_pointer_cast<const AccountInfo>(parser_->GetManifestData(
-          app_keys::kAccountKey));
+  std::shared_ptr<const wgt::parse::AccountInfo> account_info =
+      std::static_pointer_cast<const wgt::parse::AccountInfo>(
+          parser_->GetManifestData(app_keys::kAccountKey));
   if (!account_info)
     return true;
   common_installer::AccountInfo info;
@@ -534,12 +535,12 @@ common_installer::Step::Status StepParse::process() {
   }
 
   // Copy data from ManifestData to InstallerContext
-  std::shared_ptr<const TizenApplicationInfo> info =
-      std::static_pointer_cast<const TizenApplicationInfo>(
+  std::shared_ptr<const wgt::parse::TizenApplicationInfo> info =
+      std::static_pointer_cast<const wgt::parse::TizenApplicationInfo>(
           parser_->GetManifestData(
               wgt::application_widget_keys::kTizenApplicationKey));
-  std::shared_ptr<const WidgetInfo> wgt_info =
-      std::static_pointer_cast<const WidgetInfo>(
+  std::shared_ptr<const wgt::parse::WidgetInfo> wgt_info =
+      std::static_pointer_cast<const wgt::parse::WidgetInfo>(
           parser_->GetManifestData(
               wgt::application_widget_keys::kTizenWidgetKey));
 
@@ -570,8 +571,8 @@ common_installer::Step::Status StepParse::process() {
     context_->recovery_info.get().recovery_file->WriteAndCommitFileContent();
   }
 
-  std::shared_ptr<const PermissionsInfo> perm_info =
-      std::static_pointer_cast<const PermissionsInfo>(
+  std::shared_ptr<const wgt::parse::PermissionsInfo> perm_info =
+      std::static_pointer_cast<const wgt::parse::PermissionsInfo>(
           parser_->GetManifestData(
               wgt::application_widget_keys::kTizenPermissionsKey));
   parser::PermissionSet permissions;
@@ -581,8 +582,8 @@ common_installer::Step::Status StepParse::process() {
   WgtBackendData* backend_data =
       static_cast<WgtBackendData*>(context_->backend_data.get());
 
-  std::shared_ptr<const SettingInfo> settings_info =
-      std::static_pointer_cast<const SettingInfo>(
+  std::shared_ptr<const wgt::parse::SettingInfo> settings_info =
+      std::static_pointer_cast<const wgt::parse::SettingInfo>(
           parser_->GetManifestData(
               wgt::application_widget_keys::kTizenSettingKey));
   if (settings_info)
@@ -624,5 +625,5 @@ bool StepParse::Check(const boost::filesystem::path& widget_path) {
   return true;
 }
 
-}  // namespace parse
+}  // namespace configuration
 }  // namespace wgt

diff --git a/src/wgt/step/step_parse.h b/src/wgt/step/configuration/step_parse.h
similarity index 88%
rename from src/wgt/step/step_parse.h
rename to src/wgt/step/configuration/step_parse.h
index dc723cb..17a7ed6 100644 (file)
--- a/src/wgt/step/step_parse.h
+++ b/src/wgt/step/configuration/step_parse.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 WGT_STEP_STEP_PARSE_H_
-#define WGT_STEP_STEP_PARSE_H_
+#ifndef WGT_STEP_CONFIGURATION_STEP_PARSE_H_
+#define WGT_STEP_CONFIGURATION_STEP_PARSE_H_
 
 #include <boost/filesystem.hpp>
 
@@ -20,7 +20,7 @@
 #include <string>
 
 namespace wgt {
-namespace parse {
+namespace configuration {
 
 /**
  * \brief This step parse config.xml configuration file of widget
@@ -43,7 +43,7 @@ class StepParse : public common_installer::Step {
 
  private:
   std::set<std::string> ExtractPrivileges(
-      std::shared_ptr<const PermissionsInfo> perm_info) const;
+      std::shared_ptr<const wgt::parse::PermissionsInfo> perm_info) const;
 
   std::string GetPackageVersion(const std::string& manifest_version);
 
@@ -67,7 +67,7 @@ class StepParse : public common_installer::Step {
   SCOPE_LOG_TAG(Parse)
 };
 
-}  // namespace parse
+}  // namespace configuration
 }  // namespace wgt
 
-#endif  // WGT_STEP_STEP_PARSE_H_
+#endif  // WGT_STEP_CONFIGURATION_STEP_PARSE_H_

diff --git a/src/wgt/step/step_parse_recovery.cc b/src/wgt/step/configuration/step_parse_recovery.cc
similarity index 92%
rename from src/wgt/step/step_parse_recovery.cc
rename to src/wgt/step/configuration/step_parse_recovery.cc
index 218c2d5..0d8f3dc 100644 (file)
--- a/src/wgt/step/step_parse_recovery.cc
+++ b/src/wgt/step/configuration/step_parse_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 "wgt/step/step_parse_recovery.h"
+#include "wgt/step/configuration/step_parse_recovery.h"
 
 #include <common/backup_paths.h>
 #include <common/installer_context.h>
@@ -14,7 +14,7 @@ const char kResWgtPath[] = "res/wgt";
 }
 
 namespace wgt {
-namespace parse {
+namespace configuration {
 
 StepParseRecovery::StepParseRecovery(
     common_installer::InstallerContext* context)
@@ -52,5 +52,5 @@ bool StepParseRecovery::LocateConfigFile() {
   return false;
 }
 
-}  // namespace parse
+}  // namespace configuration
 }  // namespace wgt

diff --git a/src/wgt/step/step_parse_recovery.h b/src/wgt/step/configuration/step_parse_recovery.h
similarity index 82%
rename from src/wgt/step/step_parse_recovery.h
rename to src/wgt/step/configuration/step_parse_recovery.h
index b5ed147..ad3015d 100644 (file)
--- a/src/wgt/step/step_parse_recovery.h
+++ b/src/wgt/step/configuration/step_parse_recovery.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef WGT_STEP_STEP_PARSE_RECOVERY_H_
-#define WGT_STEP_STEP_PARSE_RECOVERY_H_
+#ifndef WGT_STEP_CONFIGURATION_STEP_PARSE_RECOVERY_H_
+#define WGT_STEP_CONFIGURATION_STEP_PARSE_RECOVERY_H_
 
 #include <manifest_parser/utils/logging.h>
 
-#include "wgt/step/step_parse.h"
+#include "wgt/step/configuration/step_parse.h"
 
 namespace wgt {
-namespace parse {
+namespace configuration {
 /**
  * \brief The StepParseRecovery class
  *        Retrievies package information from config.xml during RECOVERY.
@@ -57,7 +57,7 @@ class StepParseRecovery : public StepParse {
   SCOPE_LOG_TAG(ParseRecovery)
 };
 
-}  // namespace parse
+}  // namespace configuration
 }  // namespace wgt
 
-#endif  // WGT_STEP_STEP_PARSE_RECOVERY_H_
+#endif  // WGT_STEP_CONFIGURATION_STEP_PARSE_RECOVERY_H_

diff --git a/src/wgt/step/step_encrypt_resources.cc b/src/wgt/step/encryption/step_encrypt_resources.cc
similarity index 98%
rename from src/wgt/step/step_encrypt_resources.cc
rename to src/wgt/step/encryption/step_encrypt_resources.cc
index 51c1aec..8528ca9 100644 (file)
--- a/src/wgt/step/step_encrypt_resources.cc
+++ b/src/wgt/step/encryption/step_encrypt_resources.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 "wgt/step/step_encrypt_resources.h"
+#include "wgt/step/encryption/step_encrypt_resources.h"
 
 #include <web_app_enc.h>
 
@@ -27,7 +27,7 @@ const std::set<std::string> encryptSet { ".html", ".htm", ".css", ".js"};
 
 
 namespace wgt {
-namespace encrypt {
+namespace encryption {
 
 namespace bf = boost::filesystem;
 namespace bs = boost::system;
@@ -214,5 +214,5 @@ bool StepEncryptResources::ToBeEncrypted(const bf::path &file) {
   return false;
 }
 
-}  // namespace encrypt
+}  // namespace encryption
 }  // namespace wgt

diff --git a/src/wgt/step/step_encrypt_resources.h b/src/wgt/step/encryption/step_encrypt_resources.h
similarity index 87%
rename from src/wgt/step/step_encrypt_resources.h
rename to src/wgt/step/encryption/step_encrypt_resources.h
index d6a8b19..628b0e9 100644 (file)
--- a/src/wgt/step/step_encrypt_resources.h
+++ b/src/wgt/step/encryption/step_encrypt_resources.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 WGT_STEP_STEP_ENCRYPT_RESOURCES_H_
-#define WGT_STEP_STEP_ENCRYPT_RESOURCES_H_
+#ifndef WGT_STEP_ENCRYPTION_STEP_ENCRYPT_RESOURCES_H_
+#define WGT_STEP_ENCRYPTION_STEP_ENCRYPT_RESOURCES_H_
 
 #include <boost/filesystem/path.hpp>
 
@@ -13,7 +13,7 @@
 #include "wgt/wgt_backend_data.h"
 
 namespace wgt {
-namespace encrypt {
+namespace encryption {
 
 /**
  * \brief Step that encrypt application resources files if flagged to do so
@@ -66,7 +66,7 @@ class StepEncryptResources : public common_installer::Step {
   SCOPE_LOG_TAG(EncryptResources)
 };
 
-}  // namespace encrypt
+}  // namespace encryption
 }  // namespace wgt
 
-#endif  // WGT_STEP_STEP_ENCRYPT_RESOURCES_H_
+#endif  // WGT_STEP_ENCRYPTION_STEP_ENCRYPT_RESOURCES_H_

diff --git a/src/wgt/step/step_remove_encryption_data.cc b/src/wgt/step/encryption/step_remove_encryption_data.cc
similarity index 93%
rename from src/wgt/step/step_remove_encryption_data.cc
rename to src/wgt/step/encryption/step_remove_encryption_data.cc
index 0c601d3..4baa502 100644 (file)
--- a/src/wgt/step/step_remove_encryption_data.cc
+++ b/src/wgt/step/encryption/step_remove_encryption_data.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#include "wgt/step/step_remove_encryption_data.h"
+#include "wgt/step/encryption/step_remove_encryption_data.h"
 
 #include <web_app_enc.h>
 
 #include <manifest_parser/utils/logging.h>
 
 namespace wgt {
-namespace encrypt {
+namespace encryption {
 
 common_installer::Step::Status StepRemoveEncryptionData::process() {
   wae_app_type_e enc_type =
@@ -50,5 +50,5 @@ common_installer::Step::Status StepRemoveEncryptionData::process() {
   return common_installer::Step::Status::ERROR;
 }
 
-}  // namespace encrypt
+}  // namespace encryption
 }  // namespace wgt

diff --git a/src/wgt/step/step_remove_encryption_data.h b/src/wgt/step/encryption/step_remove_encryption_data.h
similarity index 78%
rename from src/wgt/step/step_remove_encryption_data.h
rename to src/wgt/step/encryption/step_remove_encryption_data.h
index 6156e99..f372e39 100644 (file)
--- a/src/wgt/step/step_remove_encryption_data.h
+++ b/src/wgt/step/encryption/step_remove_encryption_data.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef WGT_STEP_STEP_REMOVE_ENCRYPTION_DATA_H_
-#define WGT_STEP_STEP_REMOVE_ENCRYPTION_DATA_H_
+#ifndef WGT_STEP_ENCRYPTION_STEP_REMOVE_ENCRYPTION_DATA_H_
+#define WGT_STEP_ENCRYPTION_STEP_REMOVE_ENCRYPTION_DATA_H_
 
 #include <manifest_parser/utils/logging.h>
 
 #include <common/step/step.h>
 
 namespace wgt {
-namespace encrypt {
+namespace encryption {
 
 /**
  * This step remove encryption keys used for encryption during installation
@@ -33,7 +33,7 @@ class StepRemoveEncryptionData : public common_installer::Step {
 
   SCOPE_LOG_TAG(RemoveEncryptionData)
 };
-}  // namespace encrypt
+}  // namespace encryption
 }  // namespace wgt
 
-#endif  // WGT_STEP_STEP_REMOVE_ENCRYPTION_DATA_H_
+#endif  // WGT_STEP_ENCRYPTION_STEP_REMOVE_ENCRYPTION_DATA_H_

diff --git a/src/wgt/step/step_create_symbolic_link.cc b/src/wgt/step/filesystem/step_create_symbolic_link.cc
similarity index 97%
rename from src/wgt/step/step_create_symbolic_link.cc
rename to src/wgt/step/filesystem/step_create_symbolic_link.cc
index d8a18e7..bd3cc03 100644 (file)
--- a/src/wgt/step/step_create_symbolic_link.cc
+++ b/src/wgt/step/filesystem/step_create_symbolic_link.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 "wgt/step/step_create_symbolic_link.h"
+#include "wgt/step/filesystem/step_create_symbolic_link.h"
 
 #include <pkgmgr-info.h>
 #include <unistd.h>

diff --git a/src/wgt/step/step_create_symbolic_link.h b/src/wgt/step/filesystem/step_create_symbolic_link.h
similarity index 86%
rename from src/wgt/step/step_create_symbolic_link.h
rename to src/wgt/step/filesystem/step_create_symbolic_link.h
index df51fde..0efa491 100644 (file)
--- a/src/wgt/step/step_create_symbolic_link.h
+++ b/src/wgt/step/filesystem/step_create_symbolic_link.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 WGT_STEP_STEP_CREATE_SYMBOLIC_LINK_H_
-#define WGT_STEP_STEP_CREATE_SYMBOLIC_LINK_H_
+#ifndef WGT_STEP_FILESYSTEM_STEP_CREATE_SYMBOLIC_LINK_H_
+#define WGT_STEP_FILESYSTEM_STEP_CREATE_SYMBOLIC_LINK_H_
 
 #include <boost/filesystem.hpp>
 
@@ -58,4 +58,4 @@ class StepCreateSymbolicLink : public common_installer::Step {
 }  // namespace filesystem
 }  // namespace wgt
 
-#endif  // WGT_STEP_STEP_CREATE_SYMBOLIC_LINK_H_
+#endif  // WGT_STEP_FILESYSTEM_STEP_CREATE_SYMBOLIC_LINK_H_

diff --git a/src/wgt/step/step_wgt_patch_icons.cc b/src/wgt/step/filesystem/step_wgt_patch_icons.cc
similarity index 96%
rename from src/wgt/step/step_wgt_patch_icons.cc
rename to src/wgt/step/filesystem/step_wgt_patch_icons.cc
index 45da3de..d9a1827 100644 (file)
--- a/src/wgt/step/step_wgt_patch_icons.cc
+++ b/src/wgt/step/filesystem/step_wgt_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 "wgt/step/step_wgt_patch_icons.h"
+#include "wgt/step/filesystem/step_wgt_patch_icons.h"
 
 #include <pkgmgr-info.h>
 

diff --git a/src/wgt/step/step_wgt_patch_icons.h b/src/wgt/step/filesystem/step_wgt_patch_icons.h
similarity index 83%
rename from src/wgt/step/step_wgt_patch_icons.h
rename to src/wgt/step/filesystem/step_wgt_patch_icons.h
index c5eabaa..d4ff8fb 100644 (file)
--- a/src/wgt/step/step_wgt_patch_icons.h
+++ b/src/wgt/step/filesystem/step_wgt_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 WGT_STEP_STEP_WGT_PATCH_ICONS_H_
-#define WGT_STEP_STEP_WGT_PATCH_ICONS_H_
+#ifndef WGT_STEP_FILESYSTEM_STEP_WGT_PATCH_ICONS_H_
+#define WGT_STEP_FILESYSTEM_STEP_WGT_PATCH_ICONS_H_
 
 #include <manifest_parser/utils/logging.h>
 
@@ -34,4 +34,4 @@ class StepWgtPatchIcons : public common_installer::Step {
 }  // namespace filesystem
 }  // namespace wgt
 
-#endif  // WGT_STEP_STEP_WGT_PATCH_ICONS_H_
+#endif  // WGT_STEP_FILESYSTEM_STEP_WGT_PATCH_ICONS_H_

diff --git a/src/wgt/step/step_wgt_patch_storage_directories.cc b/src/wgt/step/filesystem/step_wgt_patch_storage_directories.cc
similarity index 97%
rename from src/wgt/step/step_wgt_patch_storage_directories.cc
rename to src/wgt/step/filesystem/step_wgt_patch_storage_directories.cc
index e6f976e..3c5d9e9 100644 (file)
--- a/src/wgt/step/step_wgt_patch_storage_directories.cc
+++ b/src/wgt/step/filesystem/step_wgt_patch_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 "wgt/step/step_wgt_patch_storage_directories.h"
+#include "wgt/step/filesystem/step_wgt_patch_storage_directories.h"
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>

diff --git a/src/wgt/step/step_wgt_patch_storage_directories.h b/src/wgt/step/filesystem/step_wgt_patch_storage_directories.h
similarity index 82%
rename from src/wgt/step/step_wgt_patch_storage_directories.h
rename to src/wgt/step/filesystem/step_wgt_patch_storage_directories.h
index 89992df..c3a61e9 100644 (file)
--- a/src/wgt/step/step_wgt_patch_storage_directories.h
+++ b/src/wgt/step/filesystem/step_wgt_patch_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 WGT_STEP_STEP_WGT_PATCH_STORAGE_DIRECTORIES_H_
-#define WGT_STEP_STEP_WGT_PATCH_STORAGE_DIRECTORIES_H_
+#ifndef WGT_STEP_FILESYSTEM_STEP_WGT_PATCH_STORAGE_DIRECTORIES_H_
+#define WGT_STEP_FILESYSTEM_STEP_WGT_PATCH_STORAGE_DIRECTORIES_H_
 
 #include <common/step/step.h>
 #include <manifest_parser/utils/logging.h>
@@ -36,4 +36,4 @@ class StepWgtPatchStorageDirectories :
 }  // namespace filesystem
 }  // namespace wgt
 
-#endif  // WGT_STEP_STEP_WGT_PATCH_STORAGE_DIRECTORIES_H_
+#endif  // WGT_STEP_FILESYSTEM_STEP_WGT_PATCH_STORAGE_DIRECTORIES_H_

diff --git a/src/wgt/step/step_wgt_resource_directory.cc b/src/wgt/step/filesystem/step_wgt_resource_directory.cc
similarity index 95%
rename from src/wgt/step/step_wgt_resource_directory.cc
rename to src/wgt/step/filesystem/step_wgt_resource_directory.cc
index 33671e7..cf2e57f 100644 (file)
--- a/src/wgt/step/step_wgt_resource_directory.cc
+++ b/src/wgt/step/filesystem/step_wgt_resource_directory.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 "wgt/step/step_wgt_resource_directory.h"
+#include "wgt/step/filesystem/step_wgt_resource_directory.h"
 
 #include <boost/filesystem/path.hpp>
 

diff --git a/src/wgt/step/step_wgt_resource_directory.h b/src/wgt/step/filesystem/step_wgt_resource_directory.h
similarity index 88%
rename from src/wgt/step/step_wgt_resource_directory.h
rename to src/wgt/step/filesystem/step_wgt_resource_directory.h
index 60717ec..7fa9a4c 100644 (file)
--- a/src/wgt/step/step_wgt_resource_directory.h
+++ b/src/wgt/step/filesystem/step_wgt_resource_directory.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 WGT_STEP_STEP_WGT_RESOURCE_DIRECTORY_H_
-#define WGT_STEP_STEP_WGT_RESOURCE_DIRECTORY_H_
+#ifndef WGT_STEP_FILESYSTEM_STEP_WGT_RESOURCE_DIRECTORY_H_
+#define WGT_STEP_FILESYSTEM_STEP_WGT_RESOURCE_DIRECTORY_H_
 
 #include <manifest_parser/utils/logging.h>
 
@@ -59,4 +59,4 @@ class StepWgtResourceDirectory : public common_installer::Step {
 }  // namespace filesystem
 }  // namespace wgt
 
-#endif  // WGT_STEP_STEP_WGT_RESOURCE_DIRECTORY_H_
+#endif  // WGT_STEP_FILESYSTEM_STEP_WGT_RESOURCE_DIRECTORY_H_

diff --git a/src/wgt/step/step_generate_xml.cc b/src/wgt/step/pkgmgr/step_generate_xml.cc
similarity index 99%
rename from src/wgt/step/step_generate_xml.cc
rename to src/wgt/step/pkgmgr/step_generate_xml.cc
index a90b3bb..0b21b3c 100644 (file)
--- a/src/wgt/step/step_generate_xml.cc
+++ b/src/wgt/step/pkgmgr/step_generate_xml.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 "wgt/step/step_generate_xml.h"
+#include "wgt/step/pkgmgr/step_generate_xml.h"
 
 #include <boost/filesystem/path.hpp>
 #include <boost/system/error_code.hpp>

diff --git a/src/wgt/step/step_generate_xml.h b/src/wgt/step/pkgmgr/step_generate_xml.h
similarity index 88%
rename from src/wgt/step/step_generate_xml.h
rename to src/wgt/step/pkgmgr/step_generate_xml.h
index 0f62498..00b82e6 100644 (file)
--- a/src/wgt/step/step_generate_xml.h
+++ b/src/wgt/step/pkgmgr/step_generate_xml.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  WGT_STEP_STEP_GENERATE_XML_H_
-#define  WGT_STEP_STEP_GENERATE_XML_H_
+#ifndef  WGT_STEP_PKGMGR_STEP_GENERATE_XML_H_
+#define  WGT_STEP_PKGMGR_STEP_GENERATE_XML_H_
 
 #include <manifest_parser/utils/logging.h>
 
@@ -43,4 +43,4 @@ class StepGenerateXml : public common_installer::Step {
 }  // namespace pkgmgr
 }  // namespace wgt
 
-#endif  // WGT_STEP_STEP_GENERATE_XML_H_
+#endif  // WGT_STEP_PKGMGR_STEP_GENERATE_XML_H_

diff --git a/src/wgt/step/step_rds_modify.cc b/src/wgt/step/rds/step_rds_modify.cc
similarity index 99%
rename from src/wgt/step/step_rds_modify.cc
rename to src/wgt/step/rds/step_rds_modify.cc
index 95fab9f..83937cf 100644 (file)
--- a/src/wgt/step/step_rds_modify.cc
+++ b/src/wgt/step/rds/step_rds_modify.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 "wgt/step/step_rds_modify.h"
+#include "wgt/step/rds/step_rds_modify.h"
 
 #include <boost/system/error_code.hpp>
 

diff --git a/src/wgt/step/step_rds_modify.h b/src/wgt/step/rds/step_rds_modify.h
similarity index 94%
rename from src/wgt/step/step_rds_modify.h
rename to src/wgt/step/rds/step_rds_modify.h
index 4f0a289..31d4c3b 100644 (file)
--- a/src/wgt/step/step_rds_modify.h
+++ b/src/wgt/step/rds/step_rds_modify.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 WGT_STEP_STEP_RDS_MODIFY_H_
-#define WGT_STEP_STEP_RDS_MODIFY_H_
+#ifndef WGT_STEP_RDS_STEP_RDS_MODIFY_H_
+#define WGT_STEP_RDS_STEP_RDS_MODIFY_H_
 
 #include <boost/filesystem.hpp>
 #include <common/step/step.h>
@@ -84,4 +84,5 @@ class StepRDSModify : public common_installer::Step {
 };
 }  // namespace rds
 }  // namespace wgt
-#endif  // WGT_STEP_STEP_RDS_MODIFY_H_
+
+#endif  // WGT_STEP_RDS_STEP_RDS_MODIFY_H_

diff --git a/src/wgt/step/step_rds_parse.cc b/src/wgt/step/rds/step_rds_parse.cc
similarity index 97%
rename from src/wgt/step/step_rds_parse.cc
rename to src/wgt/step/rds/step_rds_parse.cc
index 2a459a0..31ce2b4 100644 (file)
--- a/src/wgt/step/step_rds_parse.cc
+++ b/src/wgt/step/rds/step_rds_parse.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 "wgt/step/step_rds_parse.h"
+#include "wgt/step/rds/step_rds_parse.h"
 
 #include <manifest_parser/utils/logging.h>
 

diff --git a/src/wgt/step/step_rds_parse.h b/src/wgt/step/rds/step_rds_parse.h
similarity index 90%
rename from src/wgt/step/step_rds_parse.h
rename to src/wgt/step/rds/step_rds_parse.h
index 5aea60e..649df10 100644 (file)
--- a/src/wgt/step/step_rds_parse.h
+++ b/src/wgt/step/rds/step_rds_parse.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 WGT_STEP_STEP_RDS_PARSE_H_
-#define WGT_STEP_STEP_RDS_PARSE_H_
+#ifndef WGT_STEP_RDS_STEP_RDS_PARSE_H_
+#define WGT_STEP_RDS_STEP_RDS_PARSE_H_
 
 #include <common/step/step.h>
 
@@ -56,6 +56,8 @@ class StepRDSParse : public common_installer::Step {
  private:
   boost::filesystem::path rds_file_path_;
 };
+
 }  // namespace rds
 }  // namespace wgt
-#endif  // WGT_STEP_STEP_RDS_PARSE_H_
+
+#endif  // WGT_STEP_RDS_STEP_RDS_PARSE_H_

diff --git a/src/wgt/step/step_add_default_privileges.cc b/src/wgt/step/security/step_add_default_privileges.cc
similarity index 93%
rename from src/wgt/step/step_add_default_privileges.cc
rename to src/wgt/step/security/step_add_default_privileges.cc
index 18eb902..3cbbe1f 100644 (file)
--- a/src/wgt/step/step_add_default_privileges.cc
+++ b/src/wgt/step/security/step_add_default_privileges.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 "wgt/step/step_add_default_privileges.h"
+#include "wgt/step/security/step_add_default_privileges.h"
 
 #include <pkgmgrinfo_basic.h>
 

diff --git a/src/wgt/step/step_add_default_privileges.h b/src/wgt/step/security/step_add_default_privileges.h
similarity index 86%
rename from src/wgt/step/step_add_default_privileges.h
rename to src/wgt/step/security/step_add_default_privileges.h
index 928ab84..b7759a9 100644 (file)
--- a/src/wgt/step/step_add_default_privileges.h
+++ b/src/wgt/step/security/step_add_default_privileges.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 WGT_STEP_STEP_ADD_DEFAULT_PRIVILEGES_H_
-#define WGT_STEP_STEP_ADD_DEFAULT_PRIVILEGES_H_
+#ifndef WGT_STEP_SECURITY_STEP_ADD_DEFAULT_PRIVILEGES_H_
+#define WGT_STEP_SECURITY_STEP_ADD_DEFAULT_PRIVILEGES_H_
 
 #include <manifest_parser/utils/logging.h>
 
@@ -56,4 +56,4 @@ class StepAddDefaultPrivileges : public common_installer::Step {
 }  // namespace security
 }  // namespace wgt
 
-#endif  // WGT_STEP_STEP_ADD_DEFAULT_PRIVILEGES_H_
+#endif  // WGT_STEP_SECURITY_STEP_ADD_DEFAULT_PRIVILEGES_H_

diff --git a/src/wgt/step/step_check_settings_level.cc b/src/wgt/step/security/step_check_settings_level.cc
similarity index 96%
rename from src/wgt/step/step_check_settings_level.cc
rename to src/wgt/step/security/step_check_settings_level.cc
index 9df2b19..270eb04 100644 (file)
--- a/src/wgt/step/step_check_settings_level.cc
+++ b/src/wgt/step/security/step_check_settings_level.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 "wgt/step/step_check_settings_level.h"
+#include "wgt/step/security/step_check_settings_level.h"
 
 #include <manifest_parser/utils/logging.h>
 #include <wgt_manifest_handlers/setting_handler.h>

diff --git a/src/wgt/step/step_check_settings_level.h b/src/wgt/step/security/step_check_settings_level.h
similarity index 87%
rename from src/wgt/step/step_check_settings_level.h
rename to src/wgt/step/security/step_check_settings_level.h
index bac5bf2..3dfd8ac 100644 (file)
--- a/src/wgt/step/step_check_settings_level.h
+++ b/src/wgt/step/security/step_check_settings_level.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 WGT_STEP_STEP_CHECK_SETTINGS_LEVEL_H_
-#define WGT_STEP_STEP_CHECK_SETTINGS_LEVEL_H_
+#ifndef WGT_STEP_SECURITY_STEP_CHECK_SETTINGS_LEVEL_H_
+#define WGT_STEP_SECURITY_STEP_CHECK_SETTINGS_LEVEL_H_
 
 #include <manifest_parser/utils/logging.h>
 
@@ -56,4 +56,4 @@ class StepCheckSettingsLevel : public common_installer::Step {
 }  // namespace security
 }  // namespace wgt
 
-#endif  // WGT_STEP_STEP_CHECK_SETTINGS_LEVEL_H_
+#endif  // WGT_STEP_SECURITY_STEP_CHECK_SETTINGS_LEVEL_H_

diff --git a/src/wgt/step/step_check_wgt_background_category.cc b/src/wgt/step/security/step_check_wgt_background_category.cc
similarity index 92%
rename from src/wgt/step/step_check_wgt_background_category.cc
rename to src/wgt/step/security/step_check_wgt_background_category.cc
index 087b37b..cd59ef6 100644 (file)
--- a/src/wgt/step/step_check_wgt_background_category.cc
+++ b/src/wgt/step/security/step_check_wgt_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 "wgt/step/step_check_wgt_background_category.h"
+#include "wgt/step/security/step_check_wgt_background_category.h"
 
 #include <common/installer_context.h>
 #include <wgt_manifest_handlers/setting_handler.h>

diff --git a/src/wgt/step/step_check_wgt_background_category.h b/src/wgt/step/security/step_check_wgt_background_category.h
similarity index 74%
rename from src/wgt/step/step_check_wgt_background_category.h
rename to src/wgt/step/security/step_check_wgt_background_category.h
index 33b5b23..dd21574 100644 (file)
--- a/src/wgt/step/step_check_wgt_background_category.h
+++ b/src/wgt/step/security/step_check_wgt_background_category.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef WGT_STEP_STEP_CHECK_WGT_BACKGROUND_CATEGORY_H_
-#define WGT_STEP_STEP_CHECK_WGT_BACKGROUND_CATEGORY_H_
+#ifndef WGT_STEP_SECURITY_STEP_CHECK_WGT_BACKGROUND_CATEGORY_H_
+#define WGT_STEP_SECURITY_STEP_CHECK_WGT_BACKGROUND_CATEGORY_H_
 
-#include <common/step/step_check_background_category.h>
+#include <common/step/security/step_check_background_category.h>
 #include <manifest_parser/utils/version_number.h>
 
 namespace wgt {
@@ -28,4 +28,4 @@ class StepCheckWgtBackgroundCategory :
 }  // namespace security
 }  // namespace wgt
 
-#endif  // WGT_STEP_STEP_CHECK_WGT_BACKGROUND_CATEGORY_H_
+#endif  // WGT_STEP_SECURITY_STEP_CHECK_WGT_BACKGROUND_CATEGORY_H_

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index fa66402..d332c57 100644 (file)
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -5,63 +5,65 @@
 #include "wgt/wgt_installer.h"
 
 #include <common/pkgmgr_interface.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_check_blacklist.h>
-#include <common/step/step_check_removable.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_clear_data.h>
-#include <common/step/step_copy.h>
-#include <common/step/step_copy_backup.h>
-#include <common/step/step_copy_storage_directories.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_register_app.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_remove_icons.h>
-#include <common/step/step_remove_files.h>
-#include <common/step/step_remove_temporary_directory.h>
-#include <common/step/step_remove_per_user_storage_directories.h>
-#include <common/step/step_revoke_security.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_check_old_certificate.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_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/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 <wgt_manifest_handlers/widget_config_parser.h>
-#include "wgt/step/step_add_default_privileges.h"
-#include "wgt/step/step_check_settings_level.h"
-#include "wgt/step/step_check_wgt_background_category.h"
-#include "wgt/step/step_create_symbolic_link.h"
-#include "wgt/step/step_encrypt_resources.h"
-#include "wgt/step/step_generate_xml.h"
-#include "wgt/step/step_parse.h"
-#include "wgt/step/step_parse_recovery.h"
-#include "wgt/step/step_rds_modify.h"
-#include "wgt/step/step_rds_parse.h"
-#include "wgt/step/step_remove_encryption_data.h"
-#include "wgt/step/step_wgt_patch_icons.h"
-#include "wgt/step/step_wgt_patch_storage_directories.h"
-#include "wgt/step/step_wgt_resource_directory.h"
+
+#include "wgt/step/configuration/step_parse.h"
+#include "wgt/step/configuration/step_parse_recovery.h"
+#include "wgt/step/encryption/step_encrypt_resources.h"
+#include "wgt/step/encryption/step_remove_encryption_data.h"
+#include "wgt/step/filesystem/step_create_symbolic_link.h"
+#include "wgt/step/filesystem/step_wgt_patch_icons.h"
+#include "wgt/step/filesystem/step_wgt_patch_storage_directories.h"
+#include "wgt/step/filesystem/step_wgt_resource_directory.h"
+#include "wgt/step/pkgmgr/step_generate_xml.h"
+#include "wgt/step/rds/step_rds_modify.h"
+#include "wgt/step/rds/step_rds_parse.h"
+#include "wgt/step/security/step_add_default_privileges.h"
+#include "wgt/step/security/step_check_settings_level.h"
+#include "wgt/step/security/step_check_wgt_background_category.h"
 
 namespace ci = common_installer;
 
@@ -76,13 +78,13 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
     case ci::RequestType::Install : {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::filesystem::StepUnzip>();
-      AddStep<wgt::parse::StepParse>(true);
-      AddStep<ci::blacklist::StepCheckBlacklist>();
+      AddStep<wgt::configuration::StepParse>(true);
+      AddStep<ci::pkgmgr::StepCheckBlacklist>();
       AddStep<ci::security::StepCheckSignature>();
       AddStep<ci::security::StepPrivilegeCompatibility>();
       AddStep<wgt::security::StepCheckSettingsLevel>();
       AddStep<wgt::security::StepCheckWgtBackgroundCategory>();
-      AddStep<wgt::encrypt::StepEncryptResources>();
+      AddStep<wgt::encryption::StepEncryptResources>();
       AddStep<wgt::filesystem::StepWgtResourceDirectory>();
       AddStep<ci::security::StepRollbackInstallationSecurity>();
       AddStep<ci::filesystem::StepCopy>();
@@ -102,17 +104,17 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
     case ci::RequestType::Update: {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::filesystem::StepUnzip>();
-      AddStep<wgt::parse::StepParse>(true);
-      AddStep<ci::blacklist::StepCheckBlacklist>();
+      AddStep<wgt::configuration::StepParse>(true);
+      AddStep<ci::pkgmgr::StepCheckBlacklist>();
       AddStep<ci::security::StepCheckSignature>();
       AddStep<ci::security::StepPrivilegeCompatibility>();
       AddStep<wgt::security::StepCheckSettingsLevel>();
       AddStep<wgt::security::StepCheckWgtBackgroundCategory>();
       AddStep<ci::security::StepCheckOldCertificate>();
       AddStep<wgt::filesystem::StepWgtResourceDirectory>();
-      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>();
@@ -132,9 +134,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
     case ci::RequestType::Uninstall: {
       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::StepKillApps>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Uninstall);
@@ -143,19 +145,19 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::security::StepRollbackDeinstallationSecurity>();
       AddStep<ci::filesystem::StepRemoveFiles>();
       AddStep<ci::filesystem::StepRemoveIcons>();
-      AddStep<wgt::encrypt::StepRemoveEncryptionData>();
+      AddStep<wgt::encryption::StepRemoveEncryptionData>();
       AddStep<ci::security::StepRevokeSecurity>();
       AddStep<ci::pkgmgr::StepRemoveManifest>();
       break;
     }
     case ci::RequestType::Reinstall: {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-      AddStep<wgt::parse::StepParse>(false);
+      AddStep<wgt::configuration::StepParse>(false);
       AddStep<ci::pkgmgr::StepKillApps>();
-      AddStep<ci::parse::StepParseManifest>(
-          ci::parse::StepParseManifest::ManifestLocation::INSTALLED,
-          ci::parse::StepParseManifest::StoreLocation::BACKUP);
-      AddStep<ci::blacklist::StepCheckBlacklist>();
+      AddStep<ci::configuration::StepParseManifest>(
+          ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
+          ci::configuration::StepParseManifest::StoreLocation::BACKUP);
+      AddStep<ci::pkgmgr::StepCheckBlacklist>();
       AddStep<wgt::rds::StepRDSParse>();
       AddStep<wgt::rds::StepRDSModify>();
       AddStep<ci::security::StepUpdateSecurity>();
@@ -165,19 +167,20 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::filesystem::StepUnzip>();
       // TODO(t.iwanek): manifest is parsed twice...
-      AddStep<wgt::parse::StepParse>(false);  // start file may not have changed
+      AddStep<wgt::configuration::StepParse>(false);
+      // start file may not have changed
       AddStep<ci::filesystem::StepDeltaPatch>("res/wgt/");
-      AddStep<wgt::parse::StepParse>(true);
-      AddStep<ci::blacklist::StepCheckBlacklist>();
+      AddStep<wgt::configuration::StepParse>(true);
+      AddStep<ci::pkgmgr::StepCheckBlacklist>();
       AddStep<ci::security::StepCheckSignature>();
       AddStep<ci::security::StepPrivilegeCompatibility>();
       AddStep<wgt::security::StepCheckSettingsLevel>();
       AddStep<wgt::security::StepCheckWgtBackgroundCategory>();
       AddStep<ci::security::StepCheckOldCertificate>();
       AddStep<wgt::filesystem::StepWgtResourceDirectory>();
-      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>();
@@ -197,7 +200,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
     case ci::RequestType::Recovery: {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::recovery::StepOpenRecoveryFile>();
-      AddStep<wgt::parse::StepParseRecovery>();
+      AddStep<wgt::configuration::StepParseRecovery>();
       AddStep<ci::pkgmgr::StepRecoverApplication>();
       AddStep<ci::filesystem::StepRemoveTemporaryDirectory>();
       AddStep<ci::filesystem::StepRecoverIcons>();