Namespace for category of steps

Reduce number of namespace in code. Currently, there is
one namespace per step which is a bit too much. This
commit changes this. Steps are put into namespace by
their category (what step does).

commmon|wgt|tpk::
  filesystem - steps that mainly manipulates files on device
  backup - steps that are creating backup files,
        (operates on fs but worth separate namespace)
  rds - steps that handles rds
        (operates on fs but worth separate namespace)
  parse - steps that are processing manifests of packages
  security - steps containing security checks/registation
  pkgrmgr - steps that communicates with pkgrmgr API

Change-Id: Icfbf39b9e23d5ee470e9eb50501b1b8e0f7a6b7c

diff --git a/src/common/step/step_backup_icons.cc b/src/common/step/step_backup_icons.cc
index 772750c..6988bbd 100755 (executable)
--- a/src/common/step/step_backup_icons.cc
+++ b/src/common/step/step_backup_icons.cc
@@ -15,7 +15,7 @@ namespace bf = boost::filesystem;
 namespace bs = boost::system;
 
 namespace common_installer {
-namespace backup_icons {
+namespace backup {
 
 Step::Status StepBackupIcons::process() {
   uiapplication_x* ui = context_->old_manifest_data.get()->uiapplication;
@@ -69,5 +69,5 @@ void StepBackupIcons::RemoveBackupIcons() {
   }
 }
 
-}  // namespace backup_icons
+}  // namespace backup
 }  // namespace common_installer

diff --git a/src/common/step/step_backup_icons.h b/src/common/step/step_backup_icons.h
index 1e4e895..b11eca5 100644 (file)
--- a/src/common/step/step_backup_icons.h
+++ b/src/common/step/step_backup_icons.h
@@ -14,7 +14,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace backup_icons {
+namespace backup {
 
 class StepBackupIcons : public Step {
  public:
@@ -34,7 +34,7 @@ class StepBackupIcons : public Step {
   SCOPE_LOG_TAG(BackupIcons)
 };
 
-}  // namespace backup_icons
+}  // namespace backup
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_BACKUP_ICONS_H_

diff --git a/src/common/step/step_backup_manifest.cc b/src/common/step/step_backup_manifest.cc
index 770b867..e8afca7 100644 (file)
--- a/src/common/step/step_backup_manifest.cc
+++ b/src/common/step/step_backup_manifest.cc
@@ -21,7 +21,7 @@ namespace bf = boost::filesystem;
 namespace bs = boost::system;
 
 namespace common_installer {
-namespace backup_manifest {
+namespace backup {
 
 Step::Status StepBackupManifest::precheck() {
   if (!bf::exists(context_->xml_path.get())) {
@@ -75,5 +75,5 @@ Step::Status StepBackupManifest::undo() {
   return Status::OK;
 }
 
-}  // namespace backup_manifest
+}  // namespace backup
 }  // namespace common_installer

diff --git a/src/common/step/step_backup_manifest.h b/src/common/step/step_backup_manifest.h
index 1ad1609..60a6893 100644 (file)
--- a/src/common/step/step_backup_manifest.h
+++ b/src/common/step/step_backup_manifest.h
@@ -10,7 +10,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace backup_manifest {
+namespace backup {
 
 class StepBackupManifest : public Step {
  public:
@@ -24,7 +24,7 @@ class StepBackupManifest : public Step {
   SCOPE_LOG_TAG(BackupManifest)
 };
 
-}  // namespace backup_manifest
+}  // namespace backup
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_BACKUP_MANIFEST_H_

diff --git a/src/common/step/step_check_old_certificate.cc b/src/common/step/step_check_old_certificate.cc
index 79e6592..ef34ab8 100644 (file)
--- a/src/common/step/step_check_old_certificate.cc
+++ b/src/common/step/step_check_old_certificate.cc
@@ -14,7 +14,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace old_certificate {
+namespace security {
 
 Step::Status StepCheckOldCertificate::process() {
   std::string old_author_certificate =
@@ -50,5 +50,5 @@ Step::Status StepCheckOldCertificate::process() {
   return Status::OK;
 }
 
-}  // namespace old_certificate
+}  // namespace security
 }  // namespace common_installer

diff --git a/src/common/step/step_check_old_certificate.h b/src/common/step/step_check_old_certificate.h
index 20a873f..fcd75d9 100644 (file)
--- a/src/common/step/step_check_old_certificate.h
+++ b/src/common/step/step_check_old_certificate.h
@@ -10,7 +10,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace old_certificate {
+namespace security {
 
 class StepCheckOldCertificate : public Step {
  public:
@@ -24,7 +24,7 @@ class StepCheckOldCertificate : public Step {
   SCOPE_LOG_TAG(CheckOldCertificate)
 };
 
-}  // namespace old_certificate
+}  // namespace security
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_CHECK_OLD_CERTIFICATE_H_

diff --git a/src/common/step/step_check_signature.cc b/src/common/step/step_check_signature.cc
index 3a7cc92..1137a4b 100644 (file)
--- a/src/common/step/step_check_signature.cc
+++ b/src/common/step/step_check_signature.cc
@@ -165,7 +165,7 @@ bool ValidatePrivilegeLevel(common_installer::PrivilegeLevel level,
 }  // namespace
 
 namespace common_installer {
-namespace signature {
+namespace security {
 
 Step::Status ValidateSignatures(const bf::path& base_path,
     PrivilegeLevel* level, common_installer::CertificateInfo* cert_info) {
@@ -232,5 +232,5 @@ Step::Status StepCheckSignature::process() {
   return Status::OK;
 }
 
-}  // namespace signature
+}  // namespace security
 }  // namespace common_installer

diff --git a/src/common/step/step_check_signature.h b/src/common/step/step_check_signature.h
index 8396a49..71331d9 100644 (file)
--- a/src/common/step/step_check_signature.h
+++ b/src/common/step/step_check_signature.h
@@ -10,7 +10,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace signature {
+namespace security {
 
 class StepCheckSignature : public Step {
  public:
@@ -28,7 +28,7 @@ class StepCheckSignature : public Step {
 Step::Status ValidateSignatures(const boost::filesystem::path& base_path,
     PrivilegeLevel* level, common_installer::CertificateInfo* cert_info);
 
-}  // namespace signature
+}  // namespace security
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_CHECK_SIGNATURE_H_

diff --git a/src/common/step/step_configure.cc b/src/common/step/step_configure.cc
index 802ac60..cf6b071 100644 (file)
--- a/src/common/step/step_configure.cc
+++ b/src/common/step/step_configure.cc
@@ -11,7 +11,7 @@
 #include "common/utils/file_util.h"
 
 namespace common_installer {
-namespace configure {
+namespace configuration {
 
 const char *kStrEmpty = "";
 
@@ -82,5 +82,5 @@ bool StepConfigure::SetupRootAppDirectory() {
   return true;
 }
 
-}  // namespace configure
+}  // namespace configuration
 }  // namespace common_installer

diff --git a/src/common/step/step_configure.h b/src/common/step/step_configure.h
index 251064d..93ee53f 100644 (file)
--- a/src/common/step/step_configure.h
+++ b/src/common/step/step_configure.h
@@ -11,7 +11,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace configure {
+namespace configuration {
 
 /**
  * \brief Installation,Update, Deinstallation, RDS.
@@ -33,7 +33,7 @@ class StepConfigure : public Step {
   SCOPE_LOG_TAG(Configure)
 };
 
-}  // namespace configure
+}  // namespace configuration
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_CONFIGURE_H_

diff --git a/src/common/step/step_copy.cc b/src/common/step/step_copy.cc
index a38c5b7..d690546 100644 (file)
--- a/src/common/step/step_copy.cc
+++ b/src/common/step/step_copy.cc
@@ -12,7 +12,7 @@
 #include "common/utils/file_util.h"
 
 namespace common_installer {
-namespace copy {
+namespace filesystem {
 
 namespace bf = boost::filesystem;
 namespace bs = boost::system;
@@ -85,5 +85,5 @@ Step::Status StepCopy::undo() {
   return Status::OK;
 }
 
-}  // namespace copy
+}  // namespace filesystem
 }  // namespace common_installer

diff --git a/src/common/step/step_copy.h b/src/common/step/step_copy.h
index 5d2bf08..d3457ea 100644 (file)
--- a/src/common/step/step_copy.h
+++ b/src/common/step/step_copy.h
@@ -12,7 +12,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace copy {
+namespace filesystem {
 
 class StepCopy : public Step {
  public:
@@ -26,7 +26,7 @@ class StepCopy : public Step {
   SCOPE_LOG_TAG(Copy)
 };
 
-}  // namespace copy
+}  // namespace filesystem
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_COPY_H_

diff --git a/src/common/step/step_copy_backup.cc b/src/common/step/step_copy_backup.cc
index 3d0359e..de45830 100644 (file)
--- a/src/common/step/step_copy_backup.cc
+++ b/src/common/step/step_copy_backup.cc
@@ -13,7 +13,7 @@
 #include "common/utils/file_util.h"
 
 namespace common_installer {
-namespace copy_backup {
+namespace backup {
 
 namespace bf = boost::filesystem;
 namespace bs = boost::system;
@@ -113,5 +113,5 @@ bool StepCopyBackup::RollbackApplicationDirectory() {
   return true;
 }
 
-}  // namespace copy_backup
+}  // namespace backup
 }  // namespace common_installer

diff --git a/src/common/step/step_copy_backup.h b/src/common/step/step_copy_backup.h
index a62ef52..afc11c8 100644 (file)
--- a/src/common/step/step_copy_backup.h
+++ b/src/common/step/step_copy_backup.h
@@ -12,7 +12,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace copy_backup {
+namespace backup {
 
 class StepCopyBackup : public Step {
  public:
@@ -33,7 +33,7 @@ class StepCopyBackup : public Step {
   SCOPE_LOG_TAG(CopyBackup)
 };
 
-}  // namespace copy_backup
+}  // namespace backup
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_COPY_BACKUP_H_

diff --git a/src/common/step/step_copy_storage_directories.cc b/src/common/step/step_copy_storage_directories.cc
index 062334e..c80aee3 100644 (file)
--- a/src/common/step/step_copy_storage_directories.cc
+++ b/src/common/step/step_copy_storage_directories.cc
@@ -22,7 +22,7 @@ const char kSharedLocation[] = "shared";
 }  // namespace
 
 namespace common_installer {
-namespace copy_storage {
+namespace filesystem {
 
 bool StepCopyStorageDirectories::MoveAppStorage(
     const bf::path& in_src,
@@ -82,5 +82,5 @@ common_installer::Step::Status StepCopyStorageDirectories::undo() {
   return Status::OK;
 }
 
-}  // namespace copy_storage
+}  // namespace filesystem
 }  // namespace common_installer

diff --git a/src/common/step/step_copy_storage_directories.h b/src/common/step/step_copy_storage_directories.h
index 367140c..075ebbb 100644 (file)
--- a/src/common/step/step_copy_storage_directories.h
+++ b/src/common/step/step_copy_storage_directories.h
@@ -11,7 +11,7 @@
 #include "utils/logging.h"
 
 namespace common_installer {
-namespace copy_storage {
+namespace filesystem {
 
 class StepCopyStorageDirectories : public common_installer::Step {
  public:
@@ -32,7 +32,7 @@ class StepCopyStorageDirectories : public common_installer::Step {
   SCOPE_LOG_TAG(CreateStorageDirectories)
 };
 
-}  // namespace copy_storage
+}  // namespace filesystem
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_COPY_STORAGE_DIRECTORIES_H_

diff --git a/src/common/step/step_create_storage_directories.cc b/src/common/step/step_create_storage_directories.cc
index 60e2fb8..e3903b0 100644 (file)
--- a/src/common/step/step_create_storage_directories.cc
+++ b/src/common/step/step_create_storage_directories.cc
@@ -21,7 +21,7 @@ const char kSharedTrusted[] = "trusted";
 }  // namespace
 
 namespace common_installer {
-namespace create_storage {
+namespace filesystem {
 
 common_installer::Step::Status StepCreateStorageDirectories::process() {
   if (!ShareDir())
@@ -78,6 +78,5 @@ bool StepCreateStorageDirectories::PrivateDir() {
   return true;
 }
 
-
-}  // namespace create_storage
+}  // namespace filesystem
 }  // namespace common_installer

diff --git a/src/common/step/step_create_storage_directories.h b/src/common/step/step_create_storage_directories.h
index d4a4d71..dbe3022 100644 (file)
--- a/src/common/step/step_create_storage_directories.h
+++ b/src/common/step/step_create_storage_directories.h
@@ -9,7 +9,7 @@
 #include "utils/logging.h"
 
 namespace common_installer {
-namespace create_storage {
+namespace filesystem {
 
 /**
  * \brief Installation.
@@ -41,7 +41,7 @@ class StepCreateStorageDirectories : public common_installer::Step {
   SCOPE_LOG_TAG(CreateStorageDirectories)
 };
 
-}  // namespace create_storage
+}  // namespace filesystem
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_CREATE_STORAGE_DIRECTORIES_H_

diff --git a/src/common/step/step_generate_xml.cc b/src/common/step/step_generate_xml.cc
index 0f197aa..31f0299 100755 (executable)
--- a/src/common/step/step_generate_xml.cc
+++ b/src/common/step/step_generate_xml.cc
@@ -24,7 +24,7 @@ namespace bs = boost::system;
 namespace fs = boost::filesystem;
 
 namespace common_installer {
-namespace generate_xml {
+namespace pkgmgr {
 
 static void _writeUIApplicationAttributes(
     xmlTextWriterPtr writer, uiapplication_x */*app*/) {
@@ -311,5 +311,5 @@ Step::Status  StepGenerateXml::undo() {
   return Status::OK;
 }
 
-}  // namespace generate_xml
+}  // namespace pkgmgr
 }  // namespace common_installer

diff --git a/src/common/step/step_generate_xml.h b/src/common/step/step_generate_xml.h
index dd1cf29..c6ae644 100644 (file)
--- a/src/common/step/step_generate_xml.h
+++ b/src/common/step/step_generate_xml.h
@@ -15,7 +15,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace generate_xml {
+namespace pkgmgr {
 
 class StepGenerateXml : public Step {
  public:
@@ -38,7 +38,7 @@ class StepGenerateXml : public Step {
   SCOPE_LOG_TAG(GenerateXML)
 };
 
-}  // namespace generate_xml
+}  // namespace pkgmgr
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_GENERATE_XML_H_

diff --git a/src/common/step/step_old_manifest.cc b/src/common/step/step_old_manifest.cc
index 0d5e95d..88da33b 100644 (file)
--- a/src/common/step/step_old_manifest.cc
+++ b/src/common/step/step_old_manifest.cc
@@ -11,7 +11,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace old_manifest {
+namespace backup {
 
 namespace bf = boost::filesystem;
 
@@ -45,5 +45,5 @@ Step::Status StepOldManifest::process() {
   return Status::OK;
 }
 
-}  // namespace old_manifest
+}  // namespace backup
 }  // namespace common_installer

diff --git a/src/common/step/step_old_manifest.h b/src/common/step/step_old_manifest.h
index e61260f..a3732b6 100644 (file)
--- a/src/common/step/step_old_manifest.h
+++ b/src/common/step/step_old_manifest.h
@@ -11,7 +11,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace old_manifest {
+namespace backup {
 
 class StepOldManifest : public Step {
  public:
@@ -25,7 +25,7 @@ class StepOldManifest : public Step {
   SCOPE_LOG_TAG(OldManifest)
 };
 
-}  // namespace old_manifest
+}  // namespace backup
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_OLD_MANIFEST_H_

diff --git a/src/common/step/step_register_app.cc b/src/common/step/step_register_app.cc
index c62b50b..5391e1b 100644 (file)
--- a/src/common/step/step_register_app.cc
+++ b/src/common/step/step_register_app.cc
@@ -12,7 +12,7 @@
 #include "common/utils/file_util.h"
 
 namespace common_installer {
-namespace register_app {
+namespace pkgmgr {
 
 namespace fs = boost::filesystem;
 
@@ -52,5 +52,5 @@ Step::Status StepRegisterApplication::undo() {
   return Status::OK;
 }
 
-}  // namespace register_app
+}  // namespace pkgmgr
 }  // namespace common_installer

diff --git a/src/common/step/step_register_app.h b/src/common/step/step_register_app.h
index fe83611..9cd9eaf 100644 (file)
--- a/src/common/step/step_register_app.h
+++ b/src/common/step/step_register_app.h
@@ -8,7 +8,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace register_app {
+namespace pkgmgr {
 
 class StepRegisterApplication : public Step {
  public:
@@ -22,7 +22,7 @@ class StepRegisterApplication : public Step {
   SCOPE_LOG_TAG(RegisterApp)
 };
 
-}  // namespace register_app
+}  // namespace pkgmgr
 }  // namespace common_installer
 
 

diff --git a/src/common/step/step_remove_files.cc b/src/common/step/step_remove_files.cc
index 4ae1c87..33cc271 100755 (executable)
--- a/src/common/step/step_remove_files.cc
+++ b/src/common/step/step_remove_files.cc
@@ -9,7 +9,7 @@
 #include "common/utils/file_util.h"
 
 namespace common_installer {
-namespace remove {
+namespace filesystem {
 
 namespace bs = boost::system;
 namespace fs = boost::filesystem;
@@ -63,5 +63,5 @@ Step::Status StepRemoveFiles::undo() {
   return Status::OK;
 }
 
-}  // namespace remove
+}  // namespace filesystem
 }  // namespace common_installer

diff --git a/src/common/step/step_remove_files.h b/src/common/step/step_remove_files.h
index 541369b..55ed31c 100755 (executable)
--- a/src/common/step/step_remove_files.h
+++ b/src/common/step/step_remove_files.h
@@ -11,7 +11,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace remove {
+namespace filesystem {
 
 class StepRemoveFiles : public Step {
  public:
@@ -25,7 +25,7 @@ class StepRemoveFiles : public Step {
   SCOPE_LOG_TAG(Remove)
 };
 
-}  // namespace remove
+}  // namespace filesystem
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_REMOVE_FILES_H_

diff --git a/src/common/step/step_remove_icons.cc b/src/common/step/step_remove_icons.cc
index 32d6d5a..8ac69b3 100644 (file)
--- a/src/common/step/step_remove_icons.cc
+++ b/src/common/step/step_remove_icons.cc
@@ -13,7 +13,7 @@
 #include "common/utils/file_util.h"
 
 namespace common_installer {
-namespace remove_icons {
+namespace filesystem {
 
 namespace bs = boost::system;
 namespace fs = boost::filesystem;
@@ -74,5 +74,5 @@ Step::Status StepRemoveIcons::undo() {
   }
   return Status::OK;
 }
-}  // namespace remove_icons
+}  // namespace filesystem
 }  // namespace common_installer

diff --git a/src/common/step/step_remove_icons.h b/src/common/step/step_remove_icons.h
index 11094fb..d3e0013 100644 (file)
--- a/src/common/step/step_remove_icons.h
+++ b/src/common/step/step_remove_icons.h
@@ -15,7 +15,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace remove_icons {
+namespace filesystem {
 
 class StepRemoveIcons : public Step {
  public:
@@ -33,7 +33,7 @@ class StepRemoveIcons : public Step {
   SCOPE_LOG_TAG(RemoveIcons)
 };
 
-}  // namespace remove_icons
+}  // namespace filesystem
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_REMOVE_ICONS_H_

diff --git a/src/common/step/step_revoke_security.cc b/src/common/step/step_revoke_security.cc
index a4ae920..750850a 100644 (file)
--- a/src/common/step/step_revoke_security.cc
+++ b/src/common/step/step_revoke_security.cc
@@ -9,7 +9,7 @@
 #include "common/security_registration.h"
 
 namespace common_installer {
-namespace revoke_security {
+namespace security {
 
 Step::Status StepRevokeSecurity::precheck() {
   if (context_->pkgid.get().empty()) {
@@ -47,5 +47,5 @@ Step::Status StepRevokeSecurity::undo() {
   return Status::OK;
 }
 
-}  // namespace revoke_security
+}  // namespace security
 }  // namespace common_installer

diff --git a/src/common/step/step_revoke_security.h b/src/common/step/step_revoke_security.h
index 4296480..7613d24 100644 (file)
--- a/src/common/step/step_revoke_security.h
+++ b/src/common/step/step_revoke_security.h
@@ -9,7 +9,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace revoke_security {
+namespace security {
 
 // Step that is used during uninstallation
 class StepRevokeSecurity : public Step {
@@ -24,7 +24,7 @@ class StepRevokeSecurity : public Step {
   SCOPE_LOG_TAG(RevokeSecurity)
 };
 
-}  // namespace revoke_security
+}  // namespace security
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_REVOKE_SECURITY_H_

diff --git a/src/common/step/step_unregister_app.cc b/src/common/step/step_unregister_app.cc
index 3a4de79..adb23ed 100755 (executable)
--- a/src/common/step/step_unregister_app.cc
+++ b/src/common/step/step_unregister_app.cc
@@ -16,7 +16,7 @@
 #include "common/utils/file_util.h"
 
 namespace common_installer {
-namespace unregister_app {
+namespace pkgmgr {
 
 namespace fs = boost::filesystem;
 
@@ -99,5 +99,5 @@ Step::Status StepUnregisterApplication::undo() {
   return Status::OK;
 }
 
-}  // namespace unregister_app
+}  // namespace pkgmgr
 }  // namespace common_installer

diff --git a/src/common/step/step_unregister_app.h b/src/common/step/step_unregister_app.h
index 7d2ad1f..164b7dd 100755 (executable)
--- a/src/common/step/step_unregister_app.h
+++ b/src/common/step/step_unregister_app.h
@@ -10,7 +10,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace unregister_app {
+namespace pkgmgr {
 
 class StepUnregisterApplication : public Step {
  public:
@@ -27,7 +27,7 @@ class StepUnregisterApplication : public Step {
   SCOPE_LOG_TAG(Unregister)
 };
 
-}  // namespace unregister_app
+}  // namespace pkgmgr
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_UNREGISTER_APP_H_

diff --git a/src/common/step/step_unzip.cc b/src/common/step/step_unzip.cc
index cc10a0d..61c6a19 100644 (file)
--- a/src/common/step/step_unzip.cc
+++ b/src/common/step/step_unzip.cc
@@ -47,7 +47,7 @@ bool CheckFreeSpaceAtPath(int64_t required_size,
 }  // namespace
 
 namespace common_installer {
-namespace unzip {
+namespace filesystem {
 
 Step::Status StepUnzip::precheck() {
   if (context_->file_path.get().empty()) {
@@ -130,5 +130,5 @@ Step::Status StepUnzip::undo() {
 }
 
 
-}  // namespace unzip
+}  // namespace filesystem
 }  // namespace common_installer

diff --git a/src/common/step/step_unzip.h b/src/common/step/step_unzip.h
index b0e8135..12bac76 100644 (file)
--- a/src/common/step/step_unzip.h
+++ b/src/common/step/step_unzip.h
@@ -13,7 +13,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace unzip {
+namespace filesystem {
 
 /**
  * \brief Installation and Update.
@@ -40,7 +40,7 @@ class StepUnzip : public Step {
   SCOPE_LOG_TAG(Unzip)
 };
 
-}  // namespace unzip
+}  // namespace filesystem
 }  // namespace common_installer
 
 

diff --git a/src/common/step/step_update_app.cc b/src/common/step/step_update_app.cc
index f0dbdf8..037a2b1 100644 (file)
--- a/src/common/step/step_update_app.cc
+++ b/src/common/step/step_update_app.cc
@@ -22,7 +22,7 @@
 namespace bf = boost::filesystem;
 
 namespace common_installer {
-namespace update_app {
+namespace pkgmgr {
 
 Step::Status StepUpdateApplication::precheck() {
   if (context_->xml_path.get().empty()) {
@@ -72,5 +72,5 @@ Step::Status StepUpdateApplication::undo() {
   return Status::OK;
 }
 
-}  // namespace update_app
+}  // namespace pkgmgr
 }  // namespace common_installer

diff --git a/src/common/step/step_update_app.h b/src/common/step/step_update_app.h
index 5d146d2..149ffb7 100644 (file)
--- a/src/common/step/step_update_app.h
+++ b/src/common/step/step_update_app.h
@@ -10,7 +10,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace update_app {
+namespace pkgmgr {
 
 class StepUpdateApplication : public Step {
  public:
@@ -24,7 +24,7 @@ class StepUpdateApplication : public Step {
   SCOPE_LOG_TAG(UpdateApplication)
 };
 
-}  // namespace update_app
+}  // namespace pkgmgr
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_UPDATE_APP_H_

diff --git a/src/common/step/step_update_security.cc b/src/common/step/step_update_security.cc
index a0fc42e..eccf59c 100644 (file)
--- a/src/common/step/step_update_security.cc
+++ b/src/common/step/step_update_security.cc
@@ -7,7 +7,7 @@
 #include "common/security_registration.h"
 
 namespace common_installer {
-namespace update_security {
+namespace security {
 
 Step::Status StepUpdateSecurity::process() {
   if (!RegisterSecurityContextForApps(
@@ -29,5 +29,5 @@ Step::Status StepUpdateSecurity::undo() {
   return Status::OK;
 }
 
-}  // namespace update_security
+}  // namespace security
 }  // namespace common_installer

diff --git a/src/common/step/step_update_security.h b/src/common/step/step_update_security.h
index e5b6e88..1ffe7b6 100644 (file)
--- a/src/common/step/step_update_security.h
+++ b/src/common/step/step_update_security.h
@@ -9,7 +9,7 @@
 #include "common/utils/logging.h"
 
 namespace common_installer {
-namespace update_security {
+namespace security {
 
 class StepUpdateSecurity : public Step {
  public:
@@ -23,7 +23,7 @@ class StepUpdateSecurity : public Step {
   SCOPE_LOG_TAG(UpdateSecurity)
 };
 
-}  // namespace update_security
+}  // namespace security
 }  // namespace common_installer
 
 #endif  // COMMON_STEP_STEP_UPDATE_SECURITY_H_

diff --git a/src/tpk/step/step_copy_manifest_xml.cc b/src/tpk/step/step_copy_manifest_xml.cc
index 517965a..c11e0fc 100644 (file)
--- a/src/tpk/step/step_copy_manifest_xml.cc
+++ b/src/tpk/step/step_copy_manifest_xml.cc
@@ -116,7 +116,7 @@ namespace {
 
 
 namespace tpk {
-namespace step {
+namespace filesystem {
 
 SCOPE_LOG_TAG(TPKCopyManifestXml)
 
@@ -184,5 +184,5 @@ Status StepCopyManifestXml::undo() {
   return Status::OK;
 }
 
-}  // namespace step
+}  // namespace filesystem
 }  // namespace tpk

diff --git a/src/tpk/step/step_copy_manifest_xml.h b/src/tpk/step/step_copy_manifest_xml.h
index 924ddb6..713e60a 100644 (file)
--- a/src/tpk/step/step_copy_manifest_xml.h
+++ b/src/tpk/step/step_copy_manifest_xml.h
@@ -11,7 +11,7 @@
 #include <memory>
 
 namespace tpk {
-namespace step {
+namespace filesystem {
 
 /** Copy tizen-manifest.xml into the application directory
  *
@@ -28,7 +28,7 @@ class StepCopyManifestXml : public common_installer::Step {
   std::shared_ptr<boost::filesystem::path> dest_xml_path_;
 };
 
-}  // namespace step
+}  // namespace filesystem
 }  // namespace tpk
 
 #endif  // TPK_STEP_STEP_COPY_MANIFEST_XML_H_

diff --git a/src/tpk/step/step_create_symbolic_link.cc b/src/tpk/step/step_create_symbolic_link.cc
index 9cebb19..5fae12d 100644 (file)
--- a/src/tpk/step/step_create_symbolic_link.cc
+++ b/src/tpk/step/step_create_symbolic_link.cc
@@ -14,7 +14,7 @@
 
 
 namespace tpk {
-namespace step {
+namespace filesystem {
 
 namespace fs = boost::filesystem;
 using common_installer::ContextInstaller;
@@ -139,5 +139,5 @@ Status StepCreateSymbolicLink::undo() {
   return Status::OK;
 }
 
-}  // namespace step
+}  // namespace filesystem
 }  // namespace tpk

diff --git a/src/tpk/step/step_create_symbolic_link.h b/src/tpk/step/step_create_symbolic_link.h
index 83e30e7..f955447 100644 (file)
--- a/src/tpk/step/step_create_symbolic_link.h
+++ b/src/tpk/step/step_create_symbolic_link.h
@@ -5,7 +5,7 @@
 #include "common/app_installer.h"
 
 namespace tpk {
-namespace step {
+namespace filesystem {
 
 class StepCreateSymbolicLink : public common_installer::Step {
  public:
@@ -16,7 +16,7 @@ class StepCreateSymbolicLink : public common_installer::Step {
   Status precheck() override { return Status::OK; }
 };
 
-}  // namespace step
+}  // namespace filesystem
 }  // namespace tpk
 
 #endif  // TPK_STEP_STEP_CREATE_SYMBOLIC_LINK_H_

diff --git a/src/tpk/step/step_parse.cc b/src/tpk/step/step_parse.cc
index 54bfdf1..0b5f016 100644 (file)
--- a/src/tpk/step/step_parse.cc
+++ b/src/tpk/step/step_parse.cc
@@ -17,7 +17,7 @@ using xml_parser::XmlElement;
 
 
 namespace tpk {
-namespace step {
+namespace parse {
 
 namespace {
   const char kManifestFileName[] = "tizen-manifest.xml";
@@ -361,5 +361,5 @@ bool StepParse::SetPkgInfoChildren(manifest_x* m,
   return true;
 }
 
-}  // namespace step
+}  // namespace parse
 }  // namespace tpk

diff --git a/src/tpk/step/step_parse.h b/src/tpk/step/step_parse.h
index 2ae390e..b808252 100644 (file)
--- a/src/tpk/step/step_parse.h
+++ b/src/tpk/step/step_parse.h
@@ -7,7 +7,7 @@
 #include "tpk/xml_parser/xml_parser.h"
 
 namespace tpk {
-namespace step {
+namespace parse {
 
 class StepParse : public common_installer::Step {
  public:
@@ -28,7 +28,7 @@ class StepParse : public common_installer::Step {
       xml_parser::XmlTree *tree, xml_parser::XmlElement* manifest);
 };
 
-}  // namespace step
+}  // namespace parse
 }  // namespace tpk
 
 #endif  // TPK_STEP_STEP_PARSE_H_

diff --git a/src/tpk/task.cc b/src/tpk/task.cc
index af0bf23..50166bd 100644 (file)
--- a/src/tpk/task.cc
+++ b/src/tpk/task.cc
@@ -94,16 +94,16 @@ bool Task::Run() {
 int Task::Install() {
   ci::AppInstaller ai(kPkgType);
 
-  ai.AddStep<ci::configure::StepConfigure>();
-  ai.AddStep<ci::unzip::StepUnzip>();
-  ai.AddStep<tpk::step::StepParse>();
-  ai.AddStep<ci::signature::StepCheckSignature>();
-  ai.AddStep<ci::copy::StepCopy>();
-  ai.AddStep<ci::create_storage::StepCreateStorageDirectories>();
-  ai.AddStep<tpk::step::StepCreateSymbolicLink>();
+  ai.AddStep<ci::configuration::StepConfigure>();
+  ai.AddStep<ci::filesystem::StepUnzip>();
+  ai.AddStep<tpk::parse::StepParse>();
+  ai.AddStep<ci::security::StepCheckSignature>();
+  ai.AddStep<ci::filesystem::StepCopy>();
+  ai.AddStep<ci::filesystem::StepCreateStorageDirectories>();
+  ai.AddStep<tpk::filesystem::StepCreateSymbolicLink>();
   ai.AddStep<ci::security::StepRegisterSecurity>();
-  ai.AddStep<tpk::step::StepCopyManifestXml>();
-  ai.AddStep<ci::register_app::StepRegisterApplication>();
+  ai.AddStep<tpk::filesystem::StepCopyManifestXml>();
+  ai.AddStep<ci::pkgmgr::StepRegisterApplication>();
 
   return ai.Run();
 }
@@ -111,20 +111,20 @@ int Task::Install() {
 int Task::Update() {
   ci::AppInstaller ai(kPkgType);
 
-  ai.AddStep<ci::configure::StepConfigure>();
-  ai.AddStep<ci::unzip::StepUnzip>();
-  ai.AddStep<tpk::step::StepParse>();
-  ai.AddStep<ci::signature::StepCheckSignature>();
-  ai.AddStep<ci::old_certificate::StepCheckOldCertificate>();
-  ai.AddStep<ci::old_manifest::StepOldManifest>();
-  ai.AddStep<ci::backup_manifest::StepBackupManifest>();
-  ai.AddStep<ci::backup_icons::StepBackupIcons>();
-  ai.AddStep<ci::copy_backup::StepCopyBackup>();
-  ai.AddStep<ci::copy_storage::StepCopyStorageDirectories>();
-  ai.AddStep<tpk::step::StepCreateSymbolicLink>();
-  ai.AddStep<ci::update_security::StepUpdateSecurity>();
-  ai.AddStep<tpk::step::StepCopyManifestXml>();
-  ai.AddStep<ci::update_app::StepUpdateApplication>();
+  ai.AddStep<ci::configuration::StepConfigure>();
+  ai.AddStep<ci::filesystem::StepUnzip>();
+  ai.AddStep<tpk::parse::StepParse>();
+  ai.AddStep<ci::security::StepCheckSignature>();
+  ai.AddStep<ci::security::StepCheckOldCertificate>();
+  ai.AddStep<ci::backup::StepOldManifest>();
+  ai.AddStep<ci::backup::StepBackupManifest>();
+  ai.AddStep<ci::backup::StepBackupIcons>();
+  ai.AddStep<ci::backup::StepCopyBackup>();
+  ai.AddStep<ci::filesystem::StepCopyStorageDirectories>();
+  ai.AddStep<tpk::filesystem::StepCreateSymbolicLink>();
+  ai.AddStep<ci::security::StepUpdateSecurity>();
+  ai.AddStep<tpk::filesystem::StepCopyManifestXml>();
+  ai.AddStep<ci::pkgmgr::StepUpdateApplication>();
 
   return ai.Run();
 }
@@ -132,13 +132,13 @@ int Task::Update() {
 int Task::Uninstall() {
   ci::AppInstaller ai(kPkgType);
 
-  ai.AddStep<ci::configure::StepConfigure>();
+  ai.AddStep<ci::configuration::StepConfigure>();
   ai.AddStep<ci::parse::StepParse>();
-  ai.AddStep<ci::backup_manifest::StepBackupManifest>();
-  ai.AddStep<ci::unregister_app::StepUnregisterApplication>();
-  ai.AddStep<ci::remove::StepRemoveFiles>();
-  ai.AddStep<ci::remove_icons::StepRemoveIcons>();
-  ai.AddStep<ci::revoke_security::StepRevokeSecurity>();
+  ai.AddStep<ci::backup::StepBackupManifest>();
+  ai.AddStep<ci::pkgmgr::StepUnregisterApplication>();
+  ai.AddStep<ci::filesystem::StepRemoveFiles>();
+  ai.AddStep<ci::filesystem::StepRemoveIcons>();
+  ai.AddStep<ci::security::StepRevokeSecurity>();
 
   return ai.Run();
 }

diff --git a/src/unit_tests/signature_unittest.cc b/src/unit_tests/signature_unittest.cc
index 1e0a032..98485bd 100644 (file)
--- a/src/unit_tests/signature_unittest.cc
+++ b/src/unit_tests/signature_unittest.cc
@@ -12,7 +12,7 @@
 namespace bf = boost::filesystem;
 
 namespace common_installer {
-namespace signature {
+namespace security {
 
 class SignatureValidatorTest : public testing::Test {
  protected:
@@ -39,5 +39,5 @@ TEST_F(SignatureValidatorTest, HandlesBadSignatureDir) {
             Step::Status::ERROR);
 }
 
-}  // namespace signature
+}  // namespace security
 }  // namespace common_installer

diff --git a/src/wgt/step/step_check_settings_level.cc b/src/wgt/step/step_check_settings_level.cc
index 0a0d86a..374499b 100644 (file)
--- a/src/wgt/step/step_check_settings_level.cc
+++ b/src/wgt/step/step_check_settings_level.cc
@@ -32,7 +32,7 @@ bool ValidateSettingsForLevel(common_installer::PrivilegeLevel level,
 }  // namespace
 
 namespace wgt {
-namespace check_settings {
+namespace security {
 
 common_installer::Step::Status StepCheckSettingsLevel::process() {
   if (!ValidateSettingsForLevel(context_->privilege_level.get(),
@@ -44,5 +44,5 @@ common_installer::Step::Status StepCheckSettingsLevel::process() {
   return Status::OK;
 }
 
-}  // namespace check_settings
+}  // namespace security
 }  // namespace wgt

diff --git a/src/wgt/step/step_check_settings_level.h b/src/wgt/step/step_check_settings_level.h
index f7b72a6..1fa8fdc 100644 (file)
--- a/src/wgt/step/step_check_settings_level.h
+++ b/src/wgt/step/step_check_settings_level.h
@@ -11,7 +11,7 @@
 #include "common/utils/logging.h"
 
 namespace wgt {
-namespace check_settings {
+namespace security {
 
 class StepCheckSettingsLevel : public common_installer::Step {
  public:
@@ -25,7 +25,7 @@ class StepCheckSettingsLevel : public common_installer::Step {
   SCOPE_LOG_TAG(CheckSettingsLevel)
 };
 
-}  // namespace check_settings
+}  // namespace security
 }  // namespace wgt
 
 #endif  // WGT_STEP_STEP_CHECK_SETTINGS_LEVEL_H_

diff --git a/src/wgt/step/step_create_symbolic_link.cc b/src/wgt/step/step_create_symbolic_link.cc
index 16309a5..3ba2146 100644 (file)
--- a/src/wgt/step/step_create_symbolic_link.cc
+++ b/src/wgt/step/step_create_symbolic_link.cc
@@ -17,7 +17,7 @@
 #include "common/utils/file_util.h"
 
 namespace wgt {
-namespace symbolic_link {
+namespace filesystem {
 
 namespace fs = boost::filesystem;
 
@@ -85,5 +85,5 @@ common_installer::Step::Status StepCreateSymbolicLink::undo() {
   return Status::OK;
 }
 
-}  // namespace symbolic_link
+}  // namespace filesystem
 }  // namespace wgt

diff --git a/src/wgt/step/step_create_symbolic_link.h b/src/wgt/step/step_create_symbolic_link.h
index ba88c4f..89ce8d6 100644 (file)
--- a/src/wgt/step/step_create_symbolic_link.h
+++ b/src/wgt/step/step_create_symbolic_link.h
@@ -13,7 +13,7 @@
 #include "common/utils/logging.h"
 
 namespace wgt {
-namespace symbolic_link {
+namespace filesystem {
 
 class StepCreateSymbolicLink : public common_installer::Step {
  public:
@@ -27,7 +27,7 @@ class StepCreateSymbolicLink : public common_installer::Step {
   SCOPE_LOG_TAG(SymbolicLink)
 };
 
-}  // namespace symbolic_link
+}  // namespace filesystem
 }  // namespace wgt
 
 #endif  // WGT_STEP_STEP_CREATE_SYMBOLIC_LINK_H_

diff --git a/src/wgt/step/step_rds_modify.cc b/src/wgt/step/step_rds_modify.cc
index a690b72..c8550c5 100644 (file)
--- a/src/wgt/step/step_rds_modify.cc
+++ b/src/wgt/step/step_rds_modify.cc
@@ -10,7 +10,7 @@
 #include "common/utils/logging.h"
 
 namespace wgt {
-namespace rds_modify {
+namespace rds {
 
 namespace bf = boost::filesystem;
 namespace bs = boost::system;
@@ -220,5 +220,5 @@ void StepRDSModify::RestoreFiles() {
   bf::remove_all(backup_temp_dir_);
 }
 
-}  // namespace rds_modify
+}  // namespace rds
 }  // namespace wgt

diff --git a/src/wgt/step/step_rds_modify.h b/src/wgt/step/step_rds_modify.h
index 1ee0025..6670abb 100644 (file)
--- a/src/wgt/step/step_rds_modify.h
+++ b/src/wgt/step/step_rds_modify.h
@@ -14,7 +14,7 @@
 #include "wgt/wgt_backend_data.h"
 
 namespace wgt {
-namespace rds_modify {
+namespace rds {
 
 class StepRDSModify : public common_installer::Step {
  public:
@@ -48,6 +48,6 @@ class StepRDSModify : public common_installer::Step {
   std::vector<std::string> files_to_add_;
   std::vector<std::string> files_to_delete_;
 };
-}  // namespace rds_modify
+}  // namespace rds
 }  // namespace wgt
 #endif  // WGT_STEP_STEP_RDS_MODIFY_H_

diff --git a/src/wgt/step/step_rds_parse.cc b/src/wgt/step/step_rds_parse.cc
index 9910b67..b7243cc 100644 (file)
--- a/src/wgt/step/step_rds_parse.cc
+++ b/src/wgt/step/step_rds_parse.cc
@@ -12,7 +12,7 @@
 
 
 namespace wgt {
-namespace rds_parse {
+namespace rds {
 
 namespace bf = boost::filesystem;
 
@@ -45,5 +45,5 @@ common_installer::Step::Status StepRDSParse::process() {
   return common_installer::Step::Status::OK;
 }
 
-}  // namespace rds_parse
+}  // namespace rds
 }  // namespace wgt

diff --git a/src/wgt/step/step_rds_parse.h b/src/wgt/step/step_rds_parse.h
index 6020363..1577cc7 100644 (file)
--- a/src/wgt/step/step_rds_parse.h
+++ b/src/wgt/step/step_rds_parse.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 namespace wgt {
-namespace rds_parse {
+namespace rds {
 
 class StepRDSParse : public common_installer::Step {
  public:
@@ -26,6 +26,6 @@ class StepRDSParse : public common_installer::Step {
  private:
   boost::filesystem::path rds_file_path_;
 };
-}  // namespace rds_parse
+}  // namespace rds
 }  // namespace wgt
 #endif  // WGT_STEP_STEP_RDS_PARSE_H_

diff --git a/src/wgt/step/step_wgt_copy_storage_directories.cc b/src/wgt/step/step_wgt_copy_storage_directories.cc
index ff36a74..695fcfa 100644 (file)
--- a/src/wgt/step/step_wgt_copy_storage_directories.cc
+++ b/src/wgt/step/step_wgt_copy_storage_directories.cc
@@ -24,7 +24,7 @@ const char kResWgtSubPath[] = "res/wgt";
 }  // namespace
 
 namespace wgt {
-namespace copy_storage {
+namespace filesystem {
 
 common_installer::Step::Status StepWgtCopyStorageDirectories::process() {
   int version =
@@ -151,6 +151,6 @@ StepWgtCopyStorageDirectories::CopyDataDirectory() {
   return Status::OK;
 }
 
-}  // namespace copy_storage
+}  // namespace filesystem
 }  // namespace wgt
 

diff --git a/src/wgt/step/step_wgt_copy_storage_directories.h b/src/wgt/step/step_wgt_copy_storage_directories.h
index 813e454..6c603cf 100644 (file)
--- a/src/wgt/step/step_wgt_copy_storage_directories.h
+++ b/src/wgt/step/step_wgt_copy_storage_directories.h
@@ -9,7 +9,7 @@
 #include "utils/logging.h"
 
 namespace wgt {
-namespace copy_storage {
+namespace filesystem {
 
 /**
  * \brief Update installation (WGT).
@@ -18,7 +18,7 @@ namespace copy_storage {
  *        2.x and 3.x shared dir handling
  */
 class StepWgtCopyStorageDirectories
-    : public common_installer::copy_storage::StepCopyStorageDirectories {
+    : public common_installer::filesystem::StepCopyStorageDirectories {
  public:
   using StepCopyStorageDirectories::StepCopyStorageDirectories;
 
@@ -35,7 +35,7 @@ class StepWgtCopyStorageDirectories
   SCOPE_LOG_TAG(CopyWgtStorageDirectories)
 };
 
-}  // namespace copy_storage
+}  // namespace filesystem
 }  // namespace wgt
 
 #endif  // WGT_STEP_STEP_WGT_COPY_STORAGE_DIRECTORIES_H_

diff --git a/src/wgt/step/step_wgt_create_storage_directories.cc b/src/wgt/step/step_wgt_create_storage_directories.cc
index f93a251..4b24850 100644 (file)
--- a/src/wgt/step/step_wgt_create_storage_directories.cc
+++ b/src/wgt/step/step_wgt_create_storage_directories.cc
@@ -21,7 +21,7 @@ const char kResWgtSubPath[] = "res/wgt";
 }  // namespace
 
 namespace wgt {
-namespace create_storage {
+namespace filesystem {
 
 common_installer::Step::Status StepWgtCreateStorageDirectories::process() {
   if (!PrivateDir())
@@ -81,5 +81,5 @@ bool StepWgtCreateStorageDirectories::ShareDirFor3x() {
   return true;
 }
 
-}  // namespace create_storage
+}  // namespace filesystem
 }  // namespace wgt

diff --git a/src/wgt/step/step_wgt_create_storage_directories.h b/src/wgt/step/step_wgt_create_storage_directories.h
index 3f92a73..7c14890 100644 (file)
--- a/src/wgt/step/step_wgt_create_storage_directories.h
+++ b/src/wgt/step/step_wgt_create_storage_directories.h
@@ -9,7 +9,7 @@
 #include "utils/logging.h"
 
 namespace wgt {
-namespace create_storage {
+namespace filesystem {
 
 /**
  * \brief Installation (WGT).
@@ -27,10 +27,9 @@ namespace create_storage {
  * * TZ_SER_APPS/PKGID  (/{HOME}/apps_rw/PKGID)
  */
 class StepWgtCreateStorageDirectories :
-    public common_installer::create_storage::StepCreateStorageDirectories {
+    public common_installer::filesystem::StepCreateStorageDirectories {
  public:
-  using common_installer::create_storage::
-      StepCreateStorageDirectories::StepCreateStorageDirectories;
+  using StepCreateStorageDirectories::StepCreateStorageDirectories;
 
   Status process() override;
   Status clean() override { return Status::OK; }
@@ -44,7 +43,7 @@ class StepWgtCreateStorageDirectories :
   SCOPE_LOG_TAG(CreateWgtStorageDirectories)
 };
 
-}  // namespace create_storage
+}  // namespace filesystem
 }  // namespace wgt
 
 #endif  // WGT_STEP_STEP_WGT_CREATE_STORAGE_DIRECTORIES_H_

diff --git a/src/wgt/step/step_wgt_resource_directory.cc b/src/wgt/step/step_wgt_resource_directory.cc
index 4563a07..617fc46 100644 (file)
--- a/src/wgt/step/step_wgt_resource_directory.cc
+++ b/src/wgt/step/step_wgt_resource_directory.cc
@@ -13,7 +13,7 @@ namespace bf = boost::filesystem;
 namespace bs = boost::system;
 
 namespace wgt {
-namespace wgt_resources {
+namespace filesystem {
 
 common_installer::Step::Status StepWgtResourceDirectory::process() {
   bf::path temp_path = context_->unpacked_dir_path.get();
@@ -41,5 +41,5 @@ common_installer::Step::Status StepWgtResourceDirectory::process() {
   return Status::OK;
 }
 
-}  // namespace wgt_resources
+}  // namespace filesystem
 }  // namespace wgt

diff --git a/src/wgt/step/step_wgt_resource_directory.h b/src/wgt/step/step_wgt_resource_directory.h
index 0f9e90a..81a669e 100644 (file)
--- a/src/wgt/step/step_wgt_resource_directory.h
+++ b/src/wgt/step/step_wgt_resource_directory.h
@@ -11,7 +11,7 @@
 #include "common/utils/logging.h"
 
 namespace wgt {
-namespace wgt_resources {
+namespace filesystem {
 
 //
 // This step fixes unpacked directory structure so that all widget content
@@ -30,7 +30,7 @@ class StepWgtResourceDirectory : public common_installer::Step {
   SCOPE_LOG_TAG(CreateWgtResourceDirectory)
 };
 
-}  // namespace wgt_resources
+}  // namespace filesystem
 }  // namespace wgt
 
 #endif  // WGT_STEP_STEP_WGT_RESOURCE_DIRECTORY_H_

diff --git a/src/wgt/wgt_backend.cc b/src/wgt/wgt_backend.cc
index bfa6e0b..9bef1a2 100644 (file)
--- a/src/wgt/wgt_backend.cc
+++ b/src/wgt/wgt_backend.cc
@@ -53,56 +53,57 @@ int main(int argc, char** argv) {
   /* treat the request */
   switch (pkgmgr->GetRequestType()) {
     case ci::PkgMgrInterface::Type::Install : {
-      installer.AddStep<ci::configure::StepConfigure>();
-      installer.AddStep<ci::unzip::StepUnzip>();
+      installer.AddStep<ci::configuration::StepConfigure>();
+      installer.AddStep<ci::filesystem::StepUnzip>();
       installer.AddStep<wgt::parse::StepParse>();
-      installer.AddStep<ci::signature::StepCheckSignature>();
-      installer.AddStep<wgt::check_settings::StepCheckSettingsLevel>();
-      installer.AddStep<wgt::wgt_resources::StepWgtResourceDirectory>();
-      installer.AddStep<ci::copy::StepCopy>();
-      installer.AddStep<wgt::create_storage::StepWgtCreateStorageDirectories>();
-      installer.AddStep<wgt::symbolic_link::StepCreateSymbolicLink>();
-      installer.AddStep<ci::generate_xml::StepGenerateXml>();
-      installer.AddStep<ci::register_app::StepRegisterApplication>();
+      installer.AddStep<ci::security::StepCheckSignature>();
+      installer.AddStep<wgt::security::StepCheckSettingsLevel>();
+      installer.AddStep<wgt::filesystem::StepWgtResourceDirectory>();
+      installer.AddStep<ci::filesystem::StepCopy>();
+      installer.AddStep<wgt::filesystem::StepWgtCreateStorageDirectories>();
+      installer.AddStep<ci::filesystem::StepCreateStorageDirectories>();
+      installer.AddStep<wgt::filesystem::StepCreateSymbolicLink>();
+      installer.AddStep<ci::pkgmgr::StepGenerateXml>();
+      installer.AddStep<ci::pkgmgr::StepRegisterApplication>();
       installer.AddStep<ci::security::StepRegisterSecurity>();
       break;
     }
     case ci::PkgMgrInterface::Type::Update: {
-      installer.AddStep<ci::configure::StepConfigure>();
-      installer.AddStep<ci::unzip::StepUnzip>();
+      installer.AddStep<ci::configuration::StepConfigure>();
+      installer.AddStep<ci::filesystem::StepUnzip>();
       installer.AddStep<wgt::parse::StepParse>();
-      installer.AddStep<ci::signature::StepCheckSignature>();
-      installer.AddStep<wgt::check_settings::StepCheckSettingsLevel>();
-      installer.AddStep<ci::old_certificate::StepCheckOldCertificate>();
-      installer.AddStep<wgt::wgt_resources::StepWgtResourceDirectory>();
-      installer.AddStep<ci::old_manifest::StepOldManifest>();
-      installer.AddStep<ci::backup_manifest::StepBackupManifest>();
-      installer.AddStep<ci::backup_icons::StepBackupIcons>();
-      installer.AddStep<ci::copy_backup::StepCopyBackup>();
-      installer.AddStep<wgt::copy_storage::StepWgtCopyStorageDirectories>();
-      installer.AddStep<wgt::symbolic_link::StepCreateSymbolicLink>();
-      installer.AddStep<ci::update_security::StepUpdateSecurity>();
-      installer.AddStep<ci::generate_xml::StepGenerateXml>();
-      installer.AddStep<ci::update_app::StepUpdateApplication>();
+      installer.AddStep<ci::security::StepCheckSignature>();
+      installer.AddStep<wgt::security::StepCheckSettingsLevel>();
+      installer.AddStep<ci::security::StepCheckOldCertificate>();
+      installer.AddStep<wgt::filesystem::StepWgtResourceDirectory>();
+      installer.AddStep<ci::backup::StepOldManifest>();
+      installer.AddStep<ci::backup::StepBackupManifest>();
+      installer.AddStep<ci::backup::StepBackupIcons>();
+      installer.AddStep<ci::backup::StepCopyBackup>();
+      installer.AddStep<wgt::filesystem::StepWgtCopyStorageDirectories>();
+      installer.AddStep<wgt::filesystem::StepCreateSymbolicLink>();
+      installer.AddStep<ci::security::StepUpdateSecurity>();
+      installer.AddStep<ci::pkgmgr::StepGenerateXml>();
+      installer.AddStep<ci::pkgmgr::StepUpdateApplication>();
       break;
     }
     case ci::PkgMgrInterface::Type::Uninstall: {
-      installer.AddStep<ci::configure::StepConfigure>();
+      installer.AddStep<ci::configuration::StepConfigure>();
       installer.AddStep<ci::parse::StepParse>();
-      installer.AddStep<ci::backup_manifest::StepBackupManifest>();
-      installer.AddStep<ci::unregister_app::StepUnregisterApplication>();
-      installer.AddStep<ci::remove::StepRemoveFiles>();
-      installer.AddStep<ci::remove_icons::StepRemoveIcons>();
-      installer.AddStep<ci::revoke_security::StepRevokeSecurity>();
+      installer.AddStep<ci::backup::StepBackupManifest>();
+      installer.AddStep<ci::pkgmgr::StepUnregisterApplication>();
+      installer.AddStep<ci::filesystem::StepRemoveFiles>();
+      installer.AddStep<ci::filesystem::StepRemoveIcons>();
+      installer.AddStep<ci::security::StepRevokeSecurity>();
       break;
     }
     case ci::PkgMgrInterface::Type::Reinstall: {
-      installer.AddStep<ci::configure::StepConfigure>();
+      installer.AddStep<ci::configuration::StepConfigure>();
       installer.AddStep<wgt::parse::StepParse>();
-      installer.AddStep<ci::old_manifest::StepOldManifest>();
-      installer.AddStep<wgt::rds_parse::StepRDSParse>();
-      installer.AddStep<wgt::rds_modify::StepRDSModify>();
-      installer.AddStep<ci::update_security::StepUpdateSecurity>();
+      installer.AddStep<ci::backup::StepOldManifest>();
+      installer.AddStep<wgt::rds::StepRDSParse>();
+      installer.AddStep<wgt::rds::StepRDSModify>();
+      installer.AddStep<ci::security::StepUpdateSecurity>();
 
     break;
   }