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
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})
#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;
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>();
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>();
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>();
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::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>();
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>();
// 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 =
return Status::OK;
}
-} // namespace parse
+} // namespace configuration
} // namespace hybrid
// 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
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_
// 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 {
}
namespace hybrid {
-namespace parse {
+namespace configuration {
bool StepParse::LocateConfigFile() {
return Check(context_->unpacked_dir_path.get() / kResWgtPath);
}
-} // namespace parse
+} // namespace configuration
} // namespace hybrid
// 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
* 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_
// 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 =
return Status::OK;
}
-} // namespace parse
+} // namespace configuration
} // namespace hybrid
// 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
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_
// 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
// 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;
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_
#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) \
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;
}
#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>
# 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
)
// 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>
} // namespace
namespace wgt {
-namespace parse {
+namespace configuration {
namespace app_keys = wgt::application_widget_keys;
namespace sc = std::chrono;
}
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();
}
}
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()) {
}
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;
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) {
}
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(),
}
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;
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;
}
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 =
}
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);
}
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;
}
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;
}
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;
}
// 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));
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;
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)
return true;
}
-} // namespace parse
+} // namespace configuration
} // namespace wgt
// 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>
#include <string>
namespace wgt {
-namespace parse {
+namespace configuration {
/**
* \brief This step parse config.xml configuration file of widget
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);
SCOPE_LOG_TAG(Parse)
};
-} // namespace parse
+} // namespace configuration
} // namespace wgt
-#endif // WGT_STEP_STEP_PARSE_H_
+#endif // WGT_STEP_CONFIGURATION_STEP_PARSE_H_
// 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>
}
namespace wgt {
-namespace parse {
+namespace configuration {
StepParseRecovery::StepParseRecovery(
common_installer::InstallerContext* context)
return false;
}
-} // namespace parse
+} // namespace configuration
} // namespace wgt
// 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.
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_
// 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>
namespace wgt {
-namespace encrypt {
+namespace encryption {
namespace bf = boost::filesystem;
namespace bs = boost::system;
return false;
}
-} // namespace encrypt
+} // namespace encryption
} // namespace wgt
// 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>
#include "wgt/wgt_backend_data.h"
namespace wgt {
-namespace encrypt {
+namespace encryption {
/**
* \brief Step that encrypt application resources files if flagged to do so
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_
// 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 =
return common_installer::Step::Status::ERROR;
}
-} // namespace encrypt
+} // namespace encryption
} // namespace wgt
// 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
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_
// 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>
// 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>
} // namespace filesystem
} // namespace wgt
-#endif // WGT_STEP_STEP_CREATE_SYMBOLIC_LINK_H_
+#endif // WGT_STEP_FILESYSTEM_STEP_CREATE_SYMBOLIC_LINK_H_
// 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>
// 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>
} // namespace filesystem
} // namespace wgt
-#endif // WGT_STEP_STEP_WGT_PATCH_ICONS_H_
+#endif // WGT_STEP_FILESYSTEM_STEP_WGT_PATCH_ICONS_H_
// 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>
// 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>
} // namespace filesystem
} // namespace wgt
-#endif // WGT_STEP_STEP_WGT_PATCH_STORAGE_DIRECTORIES_H_
+#endif // WGT_STEP_FILESYSTEM_STEP_WGT_PATCH_STORAGE_DIRECTORIES_H_
// 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>
// 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>
} // namespace filesystem
} // namespace wgt
-#endif // WGT_STEP_STEP_WGT_RESOURCE_DIRECTORY_H_
+#endif // WGT_STEP_FILESYSTEM_STEP_WGT_RESOURCE_DIRECTORY_H_
// 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>
// 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>
} // namespace pkgmgr
} // namespace wgt
-#endif // WGT_STEP_STEP_GENERATE_XML_H_
+#endif // WGT_STEP_PKGMGR_STEP_GENERATE_XML_H_
// 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>
// 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>
};
} // namespace rds
} // namespace wgt
-#endif // WGT_STEP_STEP_RDS_MODIFY_H_
+
+#endif // WGT_STEP_RDS_STEP_RDS_MODIFY_H_
// 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>
// 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>
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_
// 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>
// 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>
} // namespace security
} // namespace wgt
-#endif // WGT_STEP_STEP_ADD_DEFAULT_PRIVILEGES_H_
+#endif // WGT_STEP_SECURITY_STEP_ADD_DEFAULT_PRIVILEGES_H_
// 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>
// 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>
} // namespace security
} // namespace wgt
-#endif // WGT_STEP_STEP_CHECK_SETTINGS_LEVEL_H_
+#endif // WGT_STEP_SECURITY_STEP_CHECK_SETTINGS_LEVEL_H_
// 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>
// 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 {
} // namespace security
} // namespace wgt
-#endif // WGT_STEP_STEP_CHECK_WGT_BACKGROUND_CATEGORY_H_
+#endif // WGT_STEP_SECURITY_STEP_CHECK_WGT_BACKGROUND_CATEGORY_H_
#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;
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>();
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>();
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);
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>();
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>();
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>();