Rename ContextInstaller to InstallerContext

Class is a context, not installer.

Change-Id: I63d31467b768de76ffb00212196ae869005bc5e0

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index cbeabc9..d0d3617 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -2,7 +2,7 @@
 SET(SRCS
   app_installer.cc
   backup_paths.cc
-  context_installer.cc
+  installer_context.cc
   pkgmgr_interface.cc
   pkgmgr_registration.cc
   pkgmgr_signal.cc

diff --git a/src/common/app_installer.cc b/src/common/app_installer.cc
index 54c36ee..4bab794 100644 (file)
--- a/src/common/app_installer.cc
+++ b/src/common/app_installer.cc
@@ -6,7 +6,7 @@
 #include <cstdio>
 
 #include "common/app_installer.h"
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/pkgmgr_interface.h"
 #include "common/pkgmgr_signal.h"
 #include "common/utils/logging.h"
@@ -21,7 +21,7 @@ namespace common_installer {
 
 AppInstaller::AppInstaller(const char* package_type, PkgMgrPtr pkgmgr)
     : pkgmgr_(pkgmgr),
-      context_(new ContextInstaller()) {
+      context_(new InstallerContext()) {
   pi_.reset(new PkgmgrSignal(pkgmgr.get()->GetRawPi(),
                              pkgmgr->GetRequestType()));
 

diff --git a/src/common/app_installer.h b/src/common/app_installer.h
index 242cd49..b701867 100644 (file)
--- a/src/common/app_installer.h
+++ b/src/common/app_installer.h
@@ -48,7 +48,7 @@ class AppInstaller {
 
  private:
   std::list<std::unique_ptr<Step>> steps_;
-  std::unique_ptr<ContextInstaller> context_;
+  std::unique_ptr<InstallerContext> context_;
 
   // data used to send signal
   std::unique_ptr<PkgmgrSignal> pi_;

diff --git a/src/common/context_installer.cc b/src/common/installer_context.cc
similarity index 92%
rename from src/common/context_installer.cc
rename to src/common/installer_context.cc
index 293223d..e7f8dda 100644 (file)
--- a/src/common/context_installer.cc
+++ b/src/common/installer_context.cc
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 
 #include <unistd.h>
 #include <cstdlib>
@@ -30,14 +30,14 @@ const char* PrivilegeLevelToString(PrivilegeLevel level) {
   }
 }
 
-ContextInstaller::ContextInstaller()
+InstallerContext::InstallerContext()
     : manifest_data(static_cast<manifest_x*>(calloc(1, sizeof(manifest_x)))),
       old_manifest_data(nullptr),
       uid(getuid()),
       backend_data(nullptr),
       privilege_level(PrivilegeLevel::UNTRUSTED) {}
 
-ContextInstaller::~ContextInstaller() {
+InstallerContext::~InstallerContext() {
   if (manifest_data.get())
     pkgmgr_parser_free_manifest_xml(manifest_data.get());
   if (old_manifest_data.get())

diff --git a/src/common/context_installer.h b/src/common/installer_context.h
similarity index 95%
rename from src/common/context_installer.h
rename to src/common/installer_context.h
index 14a76aa..e0ac906 100644 (file)
--- a/src/common/context_installer.h
+++ b/src/common/installer_context.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef COMMON_CONTEXT_INSTALLER_H_
-#define COMMON_CONTEXT_INSTALLER_H_
+#ifndef COMMON_INSTALLER_CONTEXT_H_
+#define COMMON_INSTALLER_CONTEXT_H_
 
 #include <boost/filesystem/path.hpp>
 
@@ -93,10 +93,10 @@ const char* PrivilegeLevelToString(PrivilegeLevel level);
 //  CtxUninstall class that inherits from Context
 //  It is because Uninstallation does not need so many fields.
 //  similarly, installation may not need some of them
-class ContextInstaller {
+class InstallerContext {
  public:
-  ContextInstaller();
-  ~ContextInstaller();
+  InstallerContext();
+  ~InstallerContext();
 
   // package_type
   Property<std::string> pkg_type;
@@ -152,4 +152,4 @@ class ContextInstaller {
 
 }  // namespace common_installer
 
-#endif  // COMMON_CONTEXT_INSTALLER_H_
+#endif  // COMMON_INSTALLER_CONTEXT_H_

diff --git a/src/common/pkgmgr_registration.h b/src/common/pkgmgr_registration.h
index dec8052..2a72d77 100644 (file)
--- a/src/common/pkgmgr_registration.h
+++ b/src/common/pkgmgr_registration.h
@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 
 namespace common_installer {
 

diff --git a/src/common/recovery_file.cc b/src/common/recovery_file.cc
index 1f44be6..d9bd79d 100644 (file)
--- a/src/common/recovery_file.cc
+++ b/src/common/recovery_file.cc
@@ -10,7 +10,7 @@
 #include <array>
 #include <cstring>
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/utils/logging.h"
 
 namespace {

diff --git a/src/common/security_registration.h b/src/common/security_registration.h
index 4d761ef..646c182 100644 (file)
--- a/src/common/security_registration.h
+++ b/src/common/security_registration.h
@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 
 namespace common_installer {
 

diff --git a/src/common/step/step.h b/src/common/step/step.h
index 6c7fafa..961a239 100644 (file)
--- a/src/common/step/step.h
+++ b/src/common/step/step.h
@@ -26,7 +26,7 @@
 #ifndef COMMON_STEP_STEP_H_
 #define COMMON_STEP_STEP_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 
 namespace common_installer {
 
@@ -47,7 +47,7 @@ class Step {
   };
 
   /** Standard constructor */
-  explicit Step(ContextInstaller* context) : context_(context) { }
+  explicit Step(InstallerContext* context) : context_(context) { }
 
   /** Virtual "empty" destructor */
   virtual ~Step() { }
@@ -65,7 +65,7 @@ class Step {
   virtual Status precheck() = 0;
 
  protected:
-  ContextInstaller* context_;
+  InstallerContext* context_;
 };
 
 }  // namespace common_installer

diff --git a/src/common/step/step_backup_icons.h b/src/common/step/step_backup_icons.h
index b11eca5..2118ed3 100644 (file)
--- a/src/common/step/step_backup_icons.h
+++ b/src/common/step/step_backup_icons.h
@@ -9,7 +9,7 @@
 #include <utility>
 #include <vector>
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_backup_manifest.h b/src/common/step/step_backup_manifest.h
index 60a6893..eba6ff7 100644 (file)
--- a/src/common/step/step_backup_manifest.h
+++ b/src/common/step/step_backup_manifest.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_BACKUP_MANIFEST_H_
 #define COMMON_STEP_STEP_BACKUP_MANIFEST_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_check_old_certificate.h b/src/common/step/step_check_old_certificate.h
index fcd75d9..1a67004 100644 (file)
--- a/src/common/step/step_check_old_certificate.h
+++ b/src/common/step/step_check_old_certificate.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_CHECK_OLD_CERTIFICATE_H_
 #define COMMON_STEP_STEP_CHECK_OLD_CERTIFICATE_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_check_signature.h b/src/common/step/step_check_signature.h
index 71331d9..d3bb421 100644 (file)
--- a/src/common/step/step_check_signature.h
+++ b/src/common/step/step_check_signature.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_CHECK_SIGNATURE_H_
 #define COMMON_STEP_STEP_CHECK_SIGNATURE_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_configure.cc b/src/common/step/step_configure.cc
index 8df7685..c128065 100644 (file)
--- a/src/common/step/step_configure.cc
+++ b/src/common/step/step_configure.cc
@@ -15,7 +15,7 @@ namespace configuration {
 
 const char *kStrEmpty = "";
 
-StepConfigure::StepConfigure(ContextInstaller* context, PkgMgrPtr pkgmgr)
+StepConfigure::StepConfigure(InstallerContext* context, PkgMgrPtr pkgmgr)
     : Step(context),
       pkgmgr_(pkgmgr) {
 }

diff --git a/src/common/step/step_configure.h b/src/common/step/step_configure.h
index f05e720..2fd8a96 100644 (file)
--- a/src/common/step/step_configure.h
+++ b/src/common/step/step_configure.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_CONFIGURE_H_
 #define COMMON_STEP_STEP_CONFIGURE_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 
 #include "common/pkgmgr_interface.h"
 #include "common/step/step.h"
@@ -16,13 +16,13 @@ namespace configuration {
 
 /**
  * \brief Installation,Update, Deinstallation, RDS.
- *        Responsible for filling ContextInstaller based on the request type.
+ *        Responsible for filling InstallerContext based on the request type.
  *
- * Based on started request, process fills ContextInstaller with proper data.
+ * Based on started request, process fills InstallerContext with proper data.
  */
 class StepConfigure : public Step {
  public:
-  StepConfigure(ContextInstaller* context, PkgMgrPtr pkgmgr);
+  StepConfigure(InstallerContext* context, PkgMgrPtr pkgmgr);
 
   Status process() override;
   Status clean() override;

diff --git a/src/common/step/step_copy.h b/src/common/step/step_copy.h
index d3457ea..6d3aead 100644 (file)
--- a/src/common/step/step_copy.h
+++ b/src/common/step/step_copy.h
@@ -6,7 +6,7 @@
 #ifndef COMMON_STEP_STEP_COPY_H_
 #define COMMON_STEP_STEP_COPY_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 
 #include "common/step/step.h"
 #include "common/utils/logging.h"

diff --git a/src/common/step/step_copy_backup.h b/src/common/step/step_copy_backup.h
index 92d5f91..1a63af3 100644 (file)
--- a/src/common/step/step_copy_backup.h
+++ b/src/common/step/step_copy_backup.h
@@ -7,7 +7,7 @@
 
 #include <boost/filesystem/path.hpp>
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_create_icons.h b/src/common/step/step_create_icons.h
index 9e97b35..fb52c56 100644 (file)
--- a/src/common/step/step_create_icons.h
+++ b/src/common/step/step_create_icons.h
@@ -9,7 +9,7 @@
 #include <utility>
 #include <vector>
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_fail.h b/src/common/step/step_fail.h
index 067b2af..d31ca3e 100644 (file)
--- a/src/common/step/step_fail.h
+++ b/src/common/step/step_fail.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_FAIL_H_
 #define COMMON_STEP_STEP_FAIL_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 
 #include "common/step/step.h"
 #include "common/utils/logging.h"

diff --git a/src/common/step/step_generate_xml.h b/src/common/step/step_generate_xml.h
index 2f469ab..f706b32 100644 (file)
--- a/src/common/step/step_generate_xml.h
+++ b/src/common/step/step_generate_xml.h
@@ -8,7 +8,7 @@
 
 #include <libxml/xmlwriter.h>
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_kill_apps.h b/src/common/step/step_kill_apps.h
index 6dd6f31..9253b09 100644 (file)
--- a/src/common/step/step_kill_apps.h
+++ b/src/common/step/step_kill_apps.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_KILL_APPS_H_
 #define COMMON_STEP_STEP_KILL_APPS_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_old_manifest.h b/src/common/step/step_old_manifest.h
index a3732b6..35785c3 100644 (file)
--- a/src/common/step/step_old_manifest.h
+++ b/src/common/step/step_old_manifest.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_OLD_MANIFEST_H_
 #define COMMON_STEP_STEP_OLD_MANIFEST_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 
 #include "common/step/step.h"
 #include "common/utils/logging.h"

diff --git a/src/common/step/step_open_recovery_file.h b/src/common/step/step_open_recovery_file.h
index 39a693d..9afa862 100644 (file)
--- a/src/common/step/step_open_recovery_file.h
+++ b/src/common/step/step_open_recovery_file.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_OPEN_RECOVERY_FILE_H_
 #define COMMON_STEP_STEP_OPEN_RECOVERY_FILE_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 
 #include "common/step/step.h"
 #include "common/utils/logging.h"

diff --git a/src/common/step/step_parse.h b/src/common/step/step_parse.h
index 5ba83ff..e0fe4b7 100644 (file)
--- a/src/common/step/step_parse.h
+++ b/src/common/step/step_parse.h
@@ -6,7 +6,7 @@
 #ifndef COMMON_STEP_STEP_PARSE_H_
 #define COMMON_STEP_STEP_PARSE_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 
 #include "common/step/step.h"
 #include "common/utils/logging.h"

diff --git a/src/common/step/step_privilege_compatibility.h b/src/common/step/step_privilege_compatibility.h
index 29ed20b..d9c7b36 100644 (file)
--- a/src/common/step/step_privilege_compatibility.h
+++ b/src/common/step/step_privilege_compatibility.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_PRIVILEGE_COMPATIBILITY_H_
 #define COMMON_STEP_STEP_PRIVILEGE_COMPATIBILITY_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_recover_application.h b/src/common/step/step_recover_application.h
index 211362f..b79e08f 100644 (file)
--- a/src/common/step/step_recover_application.h
+++ b/src/common/step/step_recover_application.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_RECOVER_APPLICATION_H_
 #define COMMON_STEP_STEP_RECOVER_APPLICATION_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step_recovery.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_recover_files.h b/src/common/step/step_recover_files.h
index 8c8656d..a1ca73c 100644 (file)
--- a/src/common/step/step_recover_files.h
+++ b/src/common/step/step_recover_files.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_RECOVER_FILES_H_
 #define COMMON_STEP_STEP_RECOVER_FILES_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step_recovery.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_recover_icons.h b/src/common/step/step_recover_icons.h
index d003584..16ca97a 100644 (file)
--- a/src/common/step/step_recover_icons.h
+++ b/src/common/step/step_recover_icons.h
@@ -9,7 +9,7 @@
 #include <utility>
 #include <vector>
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step_recovery.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_recover_manifest.h b/src/common/step/step_recover_manifest.h
index 467cb88..4bfb379 100644 (file)
--- a/src/common/step/step_recover_manifest.h
+++ b/src/common/step/step_recover_manifest.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_RECOVER_MANIFEST_H_
 #define COMMON_STEP_STEP_RECOVER_MANIFEST_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step_recovery.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_recover_security.h b/src/common/step/step_recover_security.h
index 5090d72..38bc2c0 100644 (file)
--- a/src/common/step/step_recover_security.h
+++ b/src/common/step/step_recover_security.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_RECOVER_SECURITY_H_
 #define COMMON_STEP_STEP_RECOVER_SECURITY_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step_recovery.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_recover_storage_directories.h b/src/common/step/step_recover_storage_directories.h
index 7b3da48..9584c3b 100644 (file)
--- a/src/common/step/step_recover_storage_directories.h
+++ b/src/common/step/step_recover_storage_directories.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_RECOVER_STORAGE_DIRECTORIES_H_
 #define COMMON_STEP_STEP_RECOVER_STORAGE_DIRECTORIES_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step_recovery.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_recovery.h b/src/common/step/step_recovery.h
index 9dbcfad..678472f 100644 (file)
--- a/src/common/step/step_recovery.h
+++ b/src/common/step/step_recovery.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_RECOVERY_H_
 #define COMMON_STEP_STEP_RECOVERY_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 
 #include "common/step/step.h"
 

diff --git a/src/common/step/step_register_app.h b/src/common/step/step_register_app.h
index 9cd9eaf..f7ff7f3 100644 (file)
--- a/src/common/step/step_register_app.h
+++ b/src/common/step/step_register_app.h
@@ -3,7 +3,7 @@
 #ifndef COMMON_STEP_STEP_REGISTER_APP_H_
 #define COMMON_STEP_STEP_REGISTER_APP_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_remove_files.h b/src/common/step/step_remove_files.h
index 55ed31c..84ffffb 100755 (executable)
--- a/src/common/step/step_remove_files.h
+++ b/src/common/step/step_remove_files.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_REMOVE_FILES_H_
 #define COMMON_STEP_STEP_REMOVE_FILES_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 
 #include "common/step/step.h"
 #include "common/utils/logging.h"

diff --git a/src/common/step/step_remove_icons.h b/src/common/step/step_remove_icons.h
index d3e0013..a582250 100644 (file)
--- a/src/common/step/step_remove_icons.h
+++ b/src/common/step/step_remove_icons.h
@@ -10,7 +10,7 @@
 #include <utility>
 #include <vector>
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_remove_temporary_directory.cc b/src/common/step/step_remove_temporary_directory.cc
index 3457a44..9dba601 100644 (file)
--- a/src/common/step/step_remove_temporary_directory.cc
+++ b/src/common/step/step_remove_temporary_directory.cc
@@ -6,7 +6,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/system/error_code.hpp>
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 
 namespace common_installer {
 namespace filesystem {

diff --git a/src/common/step/step_unregister_app.h b/src/common/step/step_unregister_app.h
index 164b7dd..876885d 100755 (executable)
--- a/src/common/step/step_unregister_app.h
+++ b/src/common/step/step_unregister_app.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_UNREGISTER_APP_H_
 #define COMMON_STEP_STEP_UNREGISTER_APP_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/common/step/step_unzip.h b/src/common/step/step_unzip.h
index 12bac76..c9658a7 100644 (file)
--- a/src/common/step/step_unzip.h
+++ b/src/common/step/step_unzip.h
@@ -8,7 +8,7 @@
 
 #include <boost/filesystem/path.hpp>
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 
@@ -27,7 +27,7 @@ namespace filesystem {
  * Unzip unpacks resources to following directory:
  * * TZ_SYS_RW/tmpuniquedir (/usr/apps/tmpuniquedir)
  * * TZ_SER_APPS/tmpdir  (/{HOME}/apps_rw/tmpuniquedir)
- * ContextInstaller::unpacked_dir_path points to this location.
+ * InstallerContext::unpacked_dir_path points to this location.
  */
 class StepUnzip : public Step {
  public:

diff --git a/src/common/step/step_update_app.h b/src/common/step/step_update_app.h
index 149ffb7..ae1da1f 100644 (file)
--- a/src/common/step/step_update_app.h
+++ b/src/common/step/step_update_app.h
@@ -5,7 +5,7 @@
 #ifndef COMMON_STEP_STEP_UPDATE_APP_H_
 #define COMMON_STEP_STEP_UPDATE_APP_H_
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/tpk/step/step_create_symbolic_link.cc b/src/tpk/step/step_create_symbolic_link.cc
index 12edd7d..559c7dd 100644 (file)
--- a/src/tpk/step/step_create_symbolic_link.cc
+++ b/src/tpk/step/step_create_symbolic_link.cc
@@ -8,7 +8,7 @@
 
 #include "common/step/step.h"
 #include "common/app_installer.h"
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/utils/clist_helpers.h"
 #include "common/utils/file_util.h"
 #include "common/utils/logging.h"
@@ -17,12 +17,12 @@ namespace tpk {
 namespace filesystem {
 
 namespace bf = boost::filesystem;
-using common_installer::ContextInstaller;
+using common_installer::InstallerContext;
 typedef common_installer::Step::Status Status;
 
 namespace {
 
-bool CreateSymLink(application_x* app, ContextInstaller* context) {
+bool CreateSymLink(application_x* app, InstallerContext* context) {
   boost::system::error_code boost_error;
   bf::path bindir = context->pkg_path.get() /
       bf::path("bin");
@@ -56,7 +56,7 @@ bool CreateSymLink(application_x* app, ContextInstaller* context) {
   return true;
 }
 
-bool RemoveSymLink(application_x* app, ContextInstaller* context) {
+bool RemoveSymLink(application_x* app, InstallerContext* context) {
   /* NOTE: Unlike WRT app, tpk apps have bin/ directory by default.
    * So we don't remove the bin/ directory.
    */

diff --git a/src/tpk/step/step_parse.cc b/src/tpk/step/step_parse.cc
index 7ee3245..1b0dbf6 100644 (file)
--- a/src/tpk/step/step_parse.cc
+++ b/src/tpk/step/step_parse.cc
@@ -26,7 +26,7 @@
 #include <vector>
 
 #include "common/app_installer.h"
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "utils/clist_helpers.h"
 
@@ -382,7 +382,7 @@ common_installer::Step::Status StepParse::process() {
     return common_installer::Step::Status::ERROR;
   }
 
-  // Copy data from ManifestData to ContextInstaller
+  // Copy data from ManifestData to InstallerContext
   std::shared_ptr<const PackageInfo> info =
       std::static_pointer_cast<const PackageInfo>(
           parser_->GetManifestData(

diff --git a/src/tpk/step/step_parse.h b/src/tpk/step/step_parse.h
index 3df25a3..ad964f6 100644 (file)
--- a/src/tpk/step/step_parse.h
+++ b/src/tpk/step/step_parse.h
@@ -14,7 +14,7 @@
 #include <string>
 
 #include "common/app_installer.h"
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 
@@ -24,7 +24,7 @@ namespace parse {
 class StepParse : public common_installer::Step {
  public:
   using Step::Step;
-  explicit StepParse(common_installer::ContextInstaller* context,
+  explicit StepParse(common_installer::InstallerContext* context,
       bool check_start_file);
 
   Status process() override;

diff --git a/src/wgt/step/step_check_settings_level.h b/src/wgt/step/step_check_settings_level.h
index 1fa8fdc..75f4047 100644 (file)
--- a/src/wgt/step/step_check_settings_level.h
+++ b/src/wgt/step/step_check_settings_level.h
@@ -6,7 +6,7 @@
 #define WGT_STEP_STEP_CHECK_SETTINGS_LEVEL_H_
 
 #include "common/app_installer.h"
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/wgt/step/step_create_symbolic_link.h b/src/wgt/step/step_create_symbolic_link.h
index 89ce8d6..60cb10d 100644 (file)
--- a/src/wgt/step/step_create_symbolic_link.h
+++ b/src/wgt/step/step_create_symbolic_link.h
@@ -8,7 +8,7 @@
 #include <boost/filesystem.hpp>
 
 #include "common/app_installer.h"
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/wgt/step/step_parse.cc b/src/wgt/step/step_parse.cc
index e374588..9d5dbfe 100755 (executable)
--- a/src/wgt/step/step_parse.cc
+++ b/src/wgt/step/step_parse.cc
@@ -27,7 +27,7 @@
 #include <vector>
 
 #include "common/app_installer.h"
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "utils/clist_helpers.h"
 #include "wgt/wgt_backend_data.h"
@@ -56,7 +56,7 @@ namespace parse {
 
 namespace app_keys = wgt::application_widget_keys;
 
-StepParse::StepParse(common_installer::ContextInstaller* context,
+StepParse::StepParse(common_installer::InstallerContext* context,
                      bool check_start_file)
     : Step(context),
       check_start_file_(check_start_file) {
@@ -316,7 +316,7 @@ common_installer::Step::Status StepParse::process() {
     return common_installer::Step::Status::ERROR;
   }
 
-  // Copy data from ManifestData to ContextInstaller
+  // Copy data from ManifestData to InstallerContext
   std::shared_ptr<const TizenApplicationInfo> info =
       std::static_pointer_cast<const TizenApplicationInfo>(
           parser_->GetManifestData(

diff --git a/src/wgt/step/step_parse.h b/src/wgt/step/step_parse.h
index b0b4d49..10df0f7 100644 (file)
--- a/src/wgt/step/step_parse.h
+++ b/src/wgt/step/step_parse.h
@@ -14,7 +14,7 @@
 #include <string>
 
 #include "common/app_installer.h"
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 
@@ -23,7 +23,7 @@ namespace parse {
 
 class StepParse : public common_installer::Step {
  public:
-  explicit StepParse(common_installer::ContextInstaller* context,
+  explicit StepParse(common_installer::InstallerContext* context,
       bool check_start_file);
 
   Status process() override;

diff --git a/src/wgt/step/step_parse_recovery.cc b/src/wgt/step/step_parse_recovery.cc
index 9ec6306..23de8b6 100644 (file)
--- a/src/wgt/step/step_parse_recovery.cc
+++ b/src/wgt/step/step_parse_recovery.cc
@@ -5,7 +5,7 @@
 #include "wgt/step/step_parse_recovery.h"
 
 #include "common/backup_paths.h"
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 
 namespace {
 
@@ -17,7 +17,7 @@ namespace wgt {
 namespace parse {
 
 StepParseRecovery::StepParseRecovery(
-    common_installer::ContextInstaller* context)
+    common_installer::InstallerContext* context)
     : StepParse(context, false) {
 }
 

diff --git a/src/wgt/step/step_parse_recovery.h b/src/wgt/step/step_parse_recovery.h
index db6a349..86dc1f6 100644 (file)
--- a/src/wgt/step/step_parse_recovery.h
+++ b/src/wgt/step/step_parse_recovery.h
@@ -24,7 +24,7 @@ namespace parse {
  */
 class StepParseRecovery : public StepParse {
  public:
-  explicit StepParseRecovery(common_installer::ContextInstaller* context);
+  explicit StepParseRecovery(common_installer::InstallerContext* context);
 
   Status process() override;
   Status precheck() override;

diff --git a/src/wgt/step/step_rds_modify.cc b/src/wgt/step/step_rds_modify.cc
index 2204497..4c6d13d 100644 (file)
--- a/src/wgt/step/step_rds_modify.cc
+++ b/src/wgt/step/step_rds_modify.cc
@@ -16,7 +16,7 @@ namespace bf = boost::filesystem;
 namespace bs = boost::system;
 namespace cu = common_installer;
 
-StepRDSModify::StepRDSModify(common_installer::ContextInstaller* context)
+StepRDSModify::StepRDSModify(common_installer::InstallerContext* context)
     : Step(context),
       backend_data_(nullptr) {}
 

diff --git a/src/wgt/step/step_rds_modify.h b/src/wgt/step/step_rds_modify.h
index 6670abb..8841ad6 100644 (file)
--- a/src/wgt/step/step_rds_modify.h
+++ b/src/wgt/step/step_rds_modify.h
@@ -18,7 +18,7 @@ namespace rds {
 
 class StepRDSModify : public common_installer::Step {
  public:
-  explicit StepRDSModify(common_installer::ContextInstaller* context);
+  explicit StepRDSModify(common_installer::InstallerContext* context);
   Status process() override;
   Status clean() override;
   Status undo() override;

diff --git a/src/wgt/step/step_wgt_resource_directory.h b/src/wgt/step/step_wgt_resource_directory.h
index 81a669e..1cc3f2d 100644 (file)
--- a/src/wgt/step/step_wgt_resource_directory.h
+++ b/src/wgt/step/step_wgt_resource_directory.h
@@ -6,7 +6,7 @@
 #define WGT_STEP_STEP_WGT_RESOURCE_DIRECTORY_H_
 
 #include "common/app_installer.h"
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/step/step.h"
 #include "common/utils/logging.h"
 

diff --git a/src/wgt/wgt_backend_data.h b/src/wgt/wgt_backend_data.h
index c8049c7..0ff19fc 100644 (file)
--- a/src/wgt/wgt_backend_data.h
+++ b/src/wgt/wgt_backend_data.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "common/context_installer.h"
+#include "common/installer_context.h"
 #include "common/utils/property.h"
 
 namespace wgt {