Installer Logs are modified.

Change-Id: Ib15a4e13eb3fa9653ce0712d96529b2df98d1375

diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h
index 2987372..61601e5 100755 (executable)
--- a/inc/InstallerDefs.h
+++ b/inc/InstallerDefs.h
@@ -21,7 +21,7 @@
 #ifndef _INSTALLER_DEFS_H_
 #define _INSTALLER_DEFS_H_
 
-#define OSP_INSTALLER_VERSION "osp-installer version = 2012/10/31_(7)"
+#define OSP_INSTALLER_VERSION "osp-installer version = [2012/11/01]"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"
@@ -84,7 +84,12 @@
 #define DIR_MEMORYCARD_OSP_APPLICATIONS                        L"/opt/storage/sdcard/apps"
 #define DIR_MEMORYCARD_OSP_APPLICATIONS_TEMP   L"/opt/storage/sdcard/apps/__@@osp_tmp@@__"
 
-#define OSP_INSTALLER "osp-installer"
+#define OSP_INSTALLER  "osp-installer"
+
+#ifdef AppLogTag
+#undef AppLogTag
+#define AppLogTag(tag, ...)                                            AppLogTagInternal(tag, "", 0, __VA_ARGS__)
+#endif
 
 enum InstallationSetStep
 {

diff --git a/src/Context/InstallationContext.cpp b/src/Context/InstallationContext.cpp
index 0a7fab1..c7ee5d6 100755 (executable)
--- a/src/Context/InstallationContext.cpp
+++ b/src/Context/InstallationContext.cpp
@@ -102,7 +102,6 @@ InstallationContext::Construct(void)
 bool
 InstallationContext::ChangeStep(InstallationStep step)
 {
-       AppLogTag(OSP_INSTALLER, "step = [%d]", step);
        delete __pStep;
        __pStep = null;
 

diff --git a/src/Installer/DirectoryInstaller.cpp b/src/Installer/DirectoryInstaller.cpp
index 6ca7f1a..af6e21e 100755 (executable)
--- a/src/Installer/DirectoryInstaller.cpp
+++ b/src/Installer/DirectoryInstaller.cpp
@@ -154,7 +154,7 @@ DirectoryInstaller::RemoveInfoFiles(void)
        TryCatch(pDir, res = false, "[osp-installer] pDir is null");
 
        r = pDir->Construct(path);
-       TryCatch(!IsFailed(r), res = false, "[osp-installer] pDir->Construct() failed, path=[%ls]", path.GetPointer());
+       TryCatch(!IsFailed(r), res = false, "[osp-installer] pDir->Construct() failed, path = [%ls]", path.GetPointer());
 
        pDirEnum = pDir->ReadN();
        TryCatch(pDirEnum, res = false, "[osp-installer] pDirEnum is null");

diff --git a/src/Installer/Installer.cpp b/src/Installer/Installer.cpp
index 30f79f2..94b76b4 100755 (executable)
--- a/src/Installer/Installer.cpp
+++ b/src/Installer/Installer.cpp
@@ -78,8 +78,6 @@ Installer::Construct(InstallationContext* pContext)
 InstallationStep
 Installer::GetNext(InstallationStep step)
 {
-       AppLogTag(OSP_INSTALLER, "step = [%d]", step);
-
        if (step == INSTALLER_STEP_PARSE_SIGNATURE)
        {
                step = INSTALLER_STEP_END;
@@ -103,7 +101,8 @@ Installer::OnInit(void)
 InstallerError
 Installer::OnRegister(void)
 {
-       AppLogTag(OSP_INSTALLER, "START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, "Installer::OnRegister() - START");
        InstallationContext* pContext = GetContext();
        TryReturn(pContext, INSTALLER_ERROR_INTERNAL_STATE, "[osp-installer] pContext is null");
 
@@ -126,7 +125,8 @@ Installer::OnRegister(void)
        {
                pManagerImpl->UnregisterPackageInfo(pContext->GetAppId());
        }
-       AppLogTag(OSP_INSTALLER, "END");
+       AppLogTag(OSP_INSTALLER, "Installer::OnRegister() - END");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
        return INSTALLER_ERROR_NONE;
 }
@@ -134,7 +134,8 @@ Installer::OnRegister(void)
 InstallerError
 Installer::OnEnd(void)
 {
-       AppLogTag(OSP_INSTALLER, "START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, "Installer::OnEnd() - START");
        InstallationContext* pContext = GetContext();
        TryReturn(pContext, INSTALLER_ERROR_INTERNAL_STATE, "[osp-installer] pContext is null");
 
@@ -157,7 +158,9 @@ Installer::OnEnd(void)
                configurationManager.RemoveFile(pContext);
                configurationManager.UnregisterCertInfo(pContext);
        }
-       AppLogTag(OSP_INSTALLER, "END");
+
+       AppLogTag(OSP_INSTALLER, "Installer::OnEnd() - END");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
        return INSTALLER_ERROR_NONE;
 }

diff --git a/src/Installer/PackageInstaller.cpp b/src/Installer/PackageInstaller.cpp
index 611fccd..fbad41f 100755 (executable)
--- a/src/Installer/PackageInstaller.cpp
+++ b/src/Installer/PackageInstaller.cpp
@@ -19,6 +19,9 @@
  * @brief      This is the implementation file for %PackageInstaller class.
  */
 
+#include <FBaseLog.h>
+
+#include "InstallerDefs.h"
 #include "PackageInstaller.h"
 
 using namespace Osp::Io;
@@ -34,7 +37,6 @@ PackageInstaller::~PackageInstaller(void)
 InstallationStep
 PackageInstaller::GetNext(InstallationStep step)
 {
-       AppLogTag(OSP_INSTALLER, "PackageInstaller::GetNext()");
        return Installer::GetNext(step);
 }
 

diff --git a/src/Installer/PreloadedInstaller.cpp b/src/Installer/PreloadedInstaller.cpp
index b006c01..39d589a 100755 (executable)
--- a/src/Installer/PreloadedInstaller.cpp
+++ b/src/Installer/PreloadedInstaller.cpp
@@ -19,6 +19,8 @@
  * @brief      This is the implementation file for %PreloadedInstaller class.
  */
 
+#include <FBaseLog.h>
+
 #include "PreloadedInstaller.h"
 #include "InstallerUtil.h"
 

diff --git a/src/Manager/ConfigurationManager.cpp b/src/Manager/ConfigurationManager.cpp
index fca0e02..746bc0b 100755 (executable)
--- a/src/Manager/ConfigurationManager.cpp
+++ b/src/Manager/ConfigurationManager.cpp
@@ -273,20 +273,24 @@ ConfigurationManager::CreateFile(InstallationContext* pContext)
                CreateSystemXmlFile(pContext);
        }
        
-       AppLogTag(OSP_INSTALLER, "START(sync)");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, "sync() - START");
        sync();
-       AppLogTag(OSP_INSTALLER, "END(sync)");
+       AppLogTag(OSP_INSTALLER, "sync() - END");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
        
        if (hybridService == false)
        {
-               AppLogTag(OSP_INSTALLER, "pkgmgr_parser_parse_manifest_for_installation() START");
+               AppLogTag(OSP_INSTALLER, "------------------------------------------");
+               AppLogTag(OSP_INSTALLER, "pkgmgr_parser_parse_manifest_for_installation() - START");
                err = pkgmgr_parser_parse_manifest_for_installation(pXmlPath, null);
                if (err != 0)
                {
                        AppLogTag(OSP_INSTALLER, "pkgmgr_parser_parse_manifest_for_installation() is failed. error = [%d][%s]", err, pXmlPath);
                        fprintf(stderr, "pkgmgr_parser_parse_manifest_for_installation is failed. error = [%d][%s]\n", err, pXmlPath);
                }
-               AppLogTag(OSP_INSTALLER, "pkgmgr_parser_parse_manifest_for_installation() END");
+               AppLogTag(OSP_INSTALLER, "pkgmgr_parser_parse_manifest_for_installation() - END");
+               AppLogTag(OSP_INSTALLER, "------------------------------------------");
        }
 
        res = true;
@@ -370,6 +374,7 @@ CATCH:
 bool
 ConfigurationManager::RegisterCertInfo(InstallationContext* pContext) const
 {
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
        AppLogTag(OSP_INSTALLER, "RegisterCertInfo - START");
 
        int res = 0;
@@ -403,6 +408,7 @@ ConfigurationManager::RegisterCertInfo(InstallationContext* pContext) const
        TryCatch(res == 0, result = false, "[osp-installer] pkgmgr_installer_save_certinfo(%s) failed.[%d]", pAppId, res);
 
        AppLogTag(OSP_INSTALLER, "RegisterCertInfo - END");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
 CATCH:
        if (handle)
@@ -482,6 +488,7 @@ CATCH:
 bool
 ConfigurationManager::UnregisterCertInfo(InstallationContext* pContext) const
 {
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
        AppLogTag(OSP_INSTALLER, "UnregisterCertInfo - START");
        int res = 0;
        bool result = true;
@@ -494,6 +501,7 @@ ConfigurationManager::UnregisterCertInfo(InstallationContext* pContext) const
        TryCatch(res == 0, result = false, "[osp-installer] pkgmgr_installer_delete_certinfo(%s) failed.[%d]", pAppId, res);
 
        AppLogTag(OSP_INSTALLER, "UnregisterCertInfo - END");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
 CATCH:
        delete[] pAppId;
@@ -503,7 +511,8 @@ CATCH:
 bool
 ConfigurationManager::CreateSystemXmlFile(InstallationContext* pContext)
 {
-       AppLogTag(OSP_INSTALLER, "SystemXmlFile - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, "CreateSystemXmlFile() - START");
        bool ret = false;
 
        ManifestGenerator manifestGenerator;
@@ -515,7 +524,8 @@ ConfigurationManager::CreateSystemXmlFile(InstallationContext* pContext)
                fprintf(stderr, "manifestGenerator.Write() is failed.\n");
                AppLogTag(OSP_INSTALLER, "manifestGenerator.Write() is failed.");
        }
-       AppLogTag(OSP_INSTALLER, "SystemXmlFile - END");
+       AppLogTag(OSP_INSTALLER, "CreateSystemXmlFile() - END");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
        return ret;
 }
@@ -589,14 +599,16 @@ ConfigurationManager::CreateInfoFile(const String& filePath, const String* pCont
        r = file.Construct(filePath, "w");
        TryReturn(!IsFailed(r), false, "[osp-installer] file.Construct() failed, filePath=[%ls]", filePath.GetPointer());
 
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, "CreateInfoFile(), filePath = [%ls]", filePath.GetPointer());
+
        if (pContext)
        {
                r = file.Write(*pContext);
                TryReturn(!IsFailed(r), false, "[osp-installer] file.Write() failed, filePath=[%ls]", filePath.GetPointer());
-               AppLogTag(OSP_INSTALLER, "Context = [%ls]", pContext->GetPointer());
+               AppLogTag(OSP_INSTALLER, "string = [%ls]", pContext->GetPointer());
        }
-
-       AppLogTag(OSP_INSTALLER, "filePath = [%ls]", filePath.GetPointer());
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
        return true;
 }

diff --git a/src/Manager/InstallerManager.cpp b/src/Manager/InstallerManager.cpp
index 153e9fe..f386efe 100755 (executable)
--- a/src/Manager/InstallerManager.cpp
+++ b/src/Manager/InstallerManager.cpp
@@ -62,7 +62,6 @@ InstallerManager::GetInstance()
 {
        if (__pInstallerManager == null)
        {
-               AppLogTag(OSP_INSTALLER, "InstallerManager::GetInstance Create new instance.");
                __pInstallerManager = new InstallerManager();
                TryReturn(__pInstallerManager, null, "[osp-installer] __pInstallerManager is null");
        }
@@ -143,8 +142,6 @@ InstallerManager::Construct(const String& path, InstallerOperation operation, Re
        error = __pInstaller->Construct(__pContext);
        TryReturn(error == INSTALLER_ERROR_NONE, INSTALLER_ERROR_INTERNAL_STATE, "[osp-installer] __pInstaller->Construct() failed");
 
-       AppLogTag(OSP_INSTALLER, "Construct() is success");
-
        return error;
 }
 
@@ -163,37 +160,37 @@ InstallerManager::CreateInstaller(InstallerType installerType)
        switch (installerType)
        {
        case INSTALLER_TYPE_INSTALLER:
-               AppLogTag(OSP_INSTALLER, "INSTALLER_TYPE_INSTALLER");
+               AppLogTag(OSP_INSTALLER, "InstallerType = [Installer]");
                pInstaller = new Installer();
                break;
 
        case INSTALLER_TYPE_PACKAGE:
-               AppLogTag(OSP_INSTALLER, "INSTALLER_TYPE_PACKAGE");
+               AppLogTag(OSP_INSTALLER, "InstallerType = [PackageInstaller]");
                pInstaller = new PackageInstaller();
                break;
 
        case INSTALLER_TYPE_DIRECTORY:
-               AppLogTag(OSP_INSTALLER, "INSTALLER_TYPE_DIRECTORY");
+               AppLogTag(OSP_INSTALLER, "InstallerType = [DirectoryInstaller]");
                pInstaller = new DirectoryInstaller();
                break;
 
        case INSTALLER_TYPE_GUEST:
-               AppLogTag(OSP_INSTALLER, "INSTALLER_TYPE_GUEST");
+               AppLogTag(OSP_INSTALLER, "InstallerType = [GuestInstaller]");
                pInstaller = new GuestInstaller();
                break;
 
        case INSTALLER_TYPE_PRELOADED:
-               AppLogTag(OSP_INSTALLER, "INSTALLER_TYPE_PRELOADED");
+               AppLogTag(OSP_INSTALLER, "InstallerType = [PreloadedInstaller]");
                pInstaller = new PreloadedInstaller();
                break;
 
        case INSTALLER_TYPE_IDE:
-               AppLogTag(OSP_INSTALLER, "INSTALLER_TYPE_IDE");
+               AppLogTag(OSP_INSTALLER, "InstallerType = [IDEInstaller]");
                pInstaller = new IDEInstaller();
                break;
 
        case INSTALLER_TYPE_RESTORATION:
-               AppLogTag(OSP_INSTALLER, "INSTALLER_TYPE_RESTORATION");
+               AppLogTag(OSP_INSTALLER, "InstallerType = [RestorationInstaller]");
                pInstaller = new RestorationInstaller();
                break;
 
@@ -376,7 +373,7 @@ InstallerManager::RequestRecursiveDirectory(const Osp::Base::String& path, int&
        TryCatch(pDir, res = false, "[osp-installer] pDir is null");
 
        r = pDir->Construct(path);
-       TryCatch(!IsFailed(r), res = false, "[osp-installer] pDir->Construct() failed, path=[%ls]", path.GetPointer());
+       TryCatch(!IsFailed(r), res = false, "[osp-installer] pDir->Construct() failed, path = [%ls]", path.GetPointer());
 
        pDirEnum = pDir->ReadN();
        TryCatch(pDirEnum, res = false, "[osp-installer] pDirEnum is null");
@@ -479,13 +476,13 @@ InstallerManager::RequestByCommand(int argc, char **argv)
        fprintf(stderr, "%s\n", OSP_INSTALLER_VERSION);
        AppLogTag(OSP_INSTALLER, "%s", OSP_INSTALLER_VERSION);
 
-       fprintf(stderr, " - argc = [%d]\n", argc);
-       AppLogTag(OSP_INSTALLER, " - argc = [%d]", argc);
+       fprintf(stderr, " # argc = [%d]\n", argc);
+       AppLogTag(OSP_INSTALLER, " # argc = [%d]", argc);
 
        for (int i = 0; i < argc; i++)
        {
-               fprintf(stderr, " - argv[%d] = [%s]\n", i, argv[i]);
-               AppLogTag(OSP_INSTALLER, " - argv[%d] = [%s]", i, argv[i]);
+               fprintf(stderr, " # argv[%d] = [%s]\n", i, argv[i]);
+               AppLogTag(OSP_INSTALLER, " # argv[%d] = [%s]", i, argv[i]);
        }
 
        ParseCommandArg(argc, argv, &mode, buf, &output);

diff --git a/src/Manager/PermissionManager.cpp b/src/Manager/PermissionManager.cpp
index a4dd107..d1e1268 100755 (executable)
--- a/src/Manager/PermissionManager.cpp
+++ b/src/Manager/PermissionManager.cpp
@@ -49,94 +49,6 @@ PermissionManager::~PermissionManager(void)
 {
 }
 
-//bool
-//PermissionManager::ChangeHomeDirectoryOwner(const String& rootPath, int depth)
-//{
-//     Directory* pDir = null;
-//     DirEnumerator* pDirEnum = null;
-//     result r = E_SUCCESS;
-//     result res = false;
-//
-//     pDir = new Directory; // Allocate %Directory instance
-//     TryCatch(pDir, res = false, "[osp-installer] pDir is null");
-//
-//     r = pDir->Construct(rootPath);
-//     TryCatch(!IsFailed(r), res = false, "[osp-installer] pDir->Construct() failed, rootPath=[%ls]", rootPath.GetPointer());
-//
-//     pDirEnum = pDir->ReadN();
-//     TryCatch(pDirEnum, res = false, "[osp-installer] pDirEnum is null");
-//
-//     while (pDirEnum->MoveNext() == E_SUCCESS)
-//     {
-//             DirEntry entry = pDirEnum->GetCurrentDirEntry();
-//
-//             String entryName = entry.GetName();
-//             String entryDir = rootPath;
-//             entryDir += L"/";
-//             entryDir += entryName;
-//
-//             if (entryName == L".")
-//             {
-//                     InstallerUtil::ChangeOwner(entryDir);
-//                     InstallerUtil::ChangeMode(entryDir, S_IRUSR | S_IWUSR | S_IXUSR);
-//                     continue;
-//             }
-//             else if (entryName == L"..")
-//             {
-//             //      if (depth != 0)
-//             //      {
-//             //              ChangeOwner(entryDir);
-//             //      }
-//
-//                     continue;
-//             }
-//
-//             if (entry.IsDirectory() == false)
-//             {
-//                     InstallerUtil::ChangeOwner(entryDir);
-//                     InstallerUtil::ChangeMode(entryDir, S_IRUSR | S_IWUSR | S_IXUSR);
-//             }
-//             else
-//             {
-//                     ChangeHomeDirectoryOwner(entryDir, depth+1);
-//                     InstallerUtil::ChangeMode(entryDir, S_IRUSR | S_IWUSR | S_IXUSR);
-//             }
-//     }
-//
-//     delete pDir;
-//     pDir = null;
-//     return true;
-//
-//CATCH:
-//     delete pDir;
-//     return false;
-//}
-
-//bool
-//PermissionManager::ApplyHomeDirectoryPolicy(const String& rootPath)
-//{
-//     String dataPath;
-//     //char* pDataPath = null;
-//     //int           res = -1;
-//
-//     dataPath = rootPath;
-//     dataPath += DIR_DATA;
-//
-//     AppLogTag(OSP_INSTALLER, "ApplyHomeDirectoryPolicy [%ls]", dataPath.GetPointer());
-//
-//     if (File::IsFileExist(dataPath) == false)
-//     {
-//             result r = E_SUCCESS;
-//             r = Directory::Create(dataPath, false);
-//             TryReturn(!IsFailed(r), INSTALLER_ERROR_INTERNAL_STATE, "[osp-installer] Directory::Create() failed");
-//     }
-//
-//     ChangeHomeDirectoryOwner(dataPath, 0);
-//     InstallerUtil::ChangeMode(dataPath, S_IRUSR | S_IWUSR | S_IXUSR);
-//
-//     return true;
-//}
-
 bool
 PermissionManager::SetDirectory(InstallationContext* pContext)
 {
@@ -207,16 +119,19 @@ PermissionManager::SetDirectory(InstallationContext* pContext)
 
        String appId = pContext->GetAppId();
        String apiVersion = pPackageInfoImpl->GetAppApiVersion();
-       AppLogTag(OSP_INSTALLER, "Osp::Io > installed path: %ls, appId: %ls, API version: %ls",
-                       appRootPath.GetPointer(), appId.GetPointer(), apiVersion.GetPointer());
+
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, "[Osp::Io] # path = [%ls]", appRootPath.GetPointer());
+       AppLogTag(OSP_INSTALLER, "[Osp::Io] # appId = [%ls]", appId.GetPointer());
+       AppLogTag(OSP_INSTALLER, "[Osp::Io] # apiVersion = [%ls]", apiVersion.GetPointer());
 
        if (apiVersion.CompareTo(L"3.0") < 0)
        {
-               AppLogTag(OSP_INSTALLER, "Osp::Io > API version <= 2.0");
+               AppLogTag(OSP_INSTALLER, "[Osp::Io] apiVersion <= 2.0");
 
                if (_FileImpl::PrepareDataCaging(appRootPath, appId) == false)
                {
-                       AppLogTag(OSP_INSTALLER, "Osp::Io > _FileImpl::PrepareDataCaging() failed");
+                       AppLogTag(OSP_INSTALLER, "[Osp::Io] _FileImpl::PrepareDataCaging() failed");
                        return false;
                }
 
@@ -224,14 +139,15 @@ PermissionManager::SetDirectory(InstallationContext* pContext)
        }
        else
        {
-               AppLogTag(OSP_INSTALLER, "Osp::Io > API version >= 3.0");
+               AppLogTag(OSP_INSTALLER, "[Osp::Io] apiVersion >= 3.0");
 
                if (_FileImpl::CreateOspApplicationDirectories(appRootPath, appId) == false)
                {
-                       AppLogTag(OSP_INSTALLER, "Osp::Io > _FileImpl::CreateOspApplicationDirectories() failed.");
+                       AppLogTag(OSP_INSTALLER, "[Osp::Io] _FileImpl::CreateOspApplicationDirectories() failed");
                        return false;
                }
        }
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
        // Create AppId.ExecutableName directory
        // This will be removed.

diff --git a/src/Manager/PermissionManager.h b/src/Manager/PermissionManager.h
index 402a5ba..2b0fc70 100755 (executable)
--- a/src/Manager/PermissionManager.h
+++ b/src/Manager/PermissionManager.h
@@ -43,10 +43,6 @@ public:
        static bool SetFile(InstallationContext* pContext);
 
 private:
-       // static bool ChangeOwner(const Osp::Base::String& filePath);
-       // static bool ChangeHomeDirectoryOwner(const Osp::Base::String&, int depth);
-       // static bool ApplyHomeDirectoryPolicy(const Osp::Base::String& rootpath);
-       // static bool ChangeMode(const Osp::Base::String& filePath, int mode);
        static bool CreateSystemDirectory(InstallationContext* pContext, const Osp::Base::String& rootpath);
        static bool SetSymLink(InstallationContext* pContext);
     static bool PrepareDataCaging(InstallationContext* pContext);

diff --git a/src/Step/DrmStep.cpp b/src/Step/DrmStep.cpp
index 7e2db6c..e3631df 100755 (executable)
--- a/src/Step/DrmStep.cpp
+++ b/src/Step/DrmStep.cpp
@@ -36,7 +36,9 @@ InstallerError
 DrmStep::Run(InstallationContext* pContext)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "DrmStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, " DrmStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
        __pContext = pContext;
 
@@ -45,32 +47,32 @@ DrmStep::Run(InstallationContext* pContext)
                switch (__state)
                {
                case STATE_DRM_CHECKING:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_DRM_CHECKING");
+                       AppLogTag(OSP_INSTALLER, "[STATE_DRM_CHECKING]");
                        error = OnDrmChecking();
                        break;
 
                case STATE_DRM_PURCHASE_REQUEST:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_DRM_PURCHASE_REQUEST");
+                       AppLogTag(OSP_INSTALLER, "[STATE_DRM_PURCHASE_REQUEST]");
                        error = OnPurchaseRequest();
                        break;
 
                case STATE_DRM_LICENSE_REQUEST:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_DRM_LICENSE_REQUEST");
+                       AppLogTag(OSP_INSTALLER, "[STATE_DRM_LICENSE_REQUEST]");
                        error = OnLicenseRequest();
                        break;
 
                case STATE_DRM_LICENSE_RESPONSE:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_DRM_LICENSE_RESPONSE");
+                       AppLogTag(OSP_INSTALLER, "[STATE_DRM_LICENSE_RESPONSE]");
                        error = OnLicenseResponse();
                        break;
 
                case STATE_DRM_DECRYPT:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_DRM_DECRYPT");
+                       AppLogTag(OSP_INSTALLER, "[STATE_DRM_DECRYPT]");
                        error = OnDecryptPackage();
                        break;
 
                case STATE_DONE:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_DONE");
+                       AppLogTag(OSP_INSTALLER, "[STATE_DONE]");
                        error = OnStateDone();
                        break;
 
@@ -86,7 +88,9 @@ DrmStep::Run(InstallationContext* pContext)
 
                if (__state > STATE_DONE)
                {
-                       AppLogTag(OSP_INSTALLER, "DrmStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+                       AppLogTag(OSP_INSTALLER, " DrmStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
                        break;
                }
        }
@@ -104,7 +108,6 @@ InstallerError
 DrmStep::OnDrmChecking(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "DrmStep::OnDrmChecking()");
 
        GoNextState();
        return error;
@@ -114,7 +117,6 @@ InstallerError
 DrmStep::OnPurchaseRequest(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "DrmStep::OnPurchaseRequest()");
 
        GoNextState();
        return error;
@@ -124,7 +126,6 @@ InstallerError
 DrmStep::OnLicenseRequest(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "DrmStep::OnLicenseRequest()");
 
        GoNextState();
        return error;
@@ -134,7 +135,6 @@ InstallerError
 DrmStep::OnLicenseResponse(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "DrmStep::OnLicenseResponse()");
 
        GoNextState();
        return error;
@@ -144,7 +144,6 @@ InstallerError
 DrmStep::OnDecryptPackage(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "DrmStep::OnDecryptPackage()");
 
        GoNextState();
        return error;
@@ -154,7 +153,6 @@ InstallerError
 DrmStep::OnStateDone(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "DrmStep::OnStateDone()");
 
        GoNextState();
        return error;

diff --git a/src/Step/LicenseStep.cpp b/src/Step/LicenseStep.cpp
index a1a55d1..05192b8 100755 (executable)
--- a/src/Step/LicenseStep.cpp
+++ b/src/Step/LicenseStep.cpp
@@ -36,7 +36,9 @@ InstallerError
 LicenseStep::Run(InstallationContext* pContext)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "LicenseStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, " LicenseStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
        __pContext = pContext;
 
@@ -45,12 +47,12 @@ LicenseStep::Run(InstallationContext* pContext)
                switch (__state)
                {
                case STATE_LICENSE_VERIFICATION:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_LICENSE_VERIFICATION");
+                       AppLogTag(OSP_INSTALLER, "[STATE_LICENSE_VERIFICATION]");
                        error = OnStateLicenseVerification();
                        break;
 
                case STATE_DONE:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_DONE");
+                       AppLogTag(OSP_INSTALLER, "[STATE_DONE]");
                        error = OnStateDone();
                        break;
 
@@ -66,7 +68,9 @@ LicenseStep::Run(InstallationContext* pContext)
 
                if (__state > STATE_DONE)
                {
-                       AppLogTag(OSP_INSTALLER, "LicenseStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+                       AppLogTag(OSP_INSTALLER, " LicenseStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
                        break;
                }
        }
@@ -84,7 +88,6 @@ InstallerError
 LicenseStep::OnStateLicenseVerification(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "LicenseStep::OnStateLicenseVerification()");
 
        GoNextState();
        return error;
@@ -94,7 +97,6 @@ InstallerError
 LicenseStep::OnStateDone(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "LicenseStep::OnStateDone()");
 
        GoNextState();
        return error;

diff --git a/src/Step/ManifestXmlStep.cpp b/src/Step/ManifestXmlStep.cpp
index 02d1889..ba37087 100755 (executable)
--- a/src/Step/ManifestXmlStep.cpp
+++ b/src/Step/ManifestXmlStep.cpp
@@ -48,7 +48,9 @@ InstallerError
 ManifestXmlStep::Run(InstallationContext* pContext)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "ManifestXmlStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, " ManifestXmlStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
        __pContext = pContext;
 
@@ -57,12 +59,12 @@ ManifestXmlStep::Run(InstallationContext* pContext)
                switch (__state)
                {
                case STATE_MANIFEST_XML:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_MANIFEST");
+                       AppLogTag(OSP_INSTALLER, "[STATE_MANIFEST]");
                        error = OnStateManifestXml();
                        break;
 
                case STATE_DONE:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_DONE");
+                       AppLogTag(OSP_INSTALLER, "[STATE_DONE]");
                        error = OnStateDone();
                        break;
 
@@ -78,7 +80,10 @@ ManifestXmlStep::Run(InstallationContext* pContext)
 
                if (__state > STATE_DONE)
                {
-                       AppLogTag(OSP_INSTALLER, "ManifestXmlStep- END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+                       AppLogTag(OSP_INSTALLER, " ManifestXmlStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+
                        break;
                }
        }
@@ -95,31 +100,14 @@ ManifestXmlStep::GoNextState(void)
 InstallerError
 ManifestXmlStep::OnStateManifestXml(void)
 {
-       AppLogTag(OSP_INSTALLER, "ManifestXmlStep::OnStateManifest()");
-
        InstallerError error = INSTALLER_ERROR_NONE;
        bool ret = false;
-       // char *pFilepath = null;
        _PackageInfoImpl *pPackageInfoImpl = null;
        String manifestXmlPath;
-
-//     File file;
-//     const int bufSize = 32*1024;
-//     char *p = new char[bufSize];
-//     memset(p, 0, sizeof(bufSize));
        result r = E_SUCCESS;
-//     int size = 0;
 
-       // pFilepath = _StringConverter::CopyToCharArrayN(__pContext->GetManifestXmlPath());
        manifestXmlPath = __pContext->GetManifestXmlPath();
 
-//     r = file.Construct(__pContext->GetManifestXmlPath(), L"r");
-//     if (r != E_SUCCESS)
-//     {
-//             fprintf(stderr, "OnStateManifestXml - file.Construct is failed. [%ls]\n", __pContext->GetManifestXmlPath().GetPointer());
-//             AppLogTag(OSP_INSTALLER, "OnStateManifestXml - file.Construct is failed. [%ls]\n", __pContext->GetManifestXmlPath().GetPointer());
-//     }
-
        FileAttributes attr;
        r = File::GetAttributes(manifestXmlPath, attr);
        if (r != E_SUCCESS)
@@ -132,16 +120,7 @@ ManifestXmlStep::OnStateManifestXml(void)
        std::unique_ptr<char[]> pFilepath(_StringConverter::CopyToCharArrayN(manifestXmlPath));
        TryReturn(pFilepath, INSTALLER_ERROR_INVALID_PACKAGE, "[osp-installer] pFilepath is null");
 
-//     size = file.Read(p, bufSize);
-//     if (size <= 0)
-//     {
-//             fprintf(stderr, "OnStateManifestXml - file.Read is failed. [%ls]\n", __pContext->GetManifestXmlPath().GetPointer());
-//             AppLogTag(OSP_INSTALLER, "OnStateManifestXml - file.Read is failed. [%ls]\n", __pContext->GetManifestXmlPath().GetPointer());
-//     }
-
-//     if (strstr(p, "<Apps>") != null)
-//     {
-       AppLogTag(OSP_INSTALLER, "manifest file=(%ls)", manifestXmlPath.GetPointer());
+       AppLogTag(OSP_INSTALLER, "manifest file=[%ls]", manifestXmlPath.GetPointer());
 
        ManifestHandler manifestHandler;
        manifestHandler.Construct(__pContext);
@@ -155,20 +134,9 @@ ManifestXmlStep::OnStateManifestXml(void)
        pPackageInfoImpl = __pContext->GetPackageInfoImpl();
        TryReturn(pPackageInfoImpl, error = INSTALLER_ERROR_INVALID_MANIFEST, "[osp-installer] pPackageInfoImpl is null");
        __pContext->SetAppId(pPackageInfoImpl->GetAppId());
-//     }
-//     else
-//     {
-//             fprintf(stderr, "ManifestXmlStep::OnStateManifestXml - old manifest!! \n");
-//             AppLogTag(OSP_INSTALLER, "ManifestXmlStep::OnStateManifest() - error(INSTALLER_ERROR_INVALID_MANIFEST)");
-//             error = INSTALLER_ERROR_INVALID_MANIFEST;
-//     }
-
-// CATCH:
-//     delete[] p;
 
        GoNextState();
 
-       // delete[] pFilepath;
        return error;
 }
 
@@ -176,7 +144,6 @@ InstallerError
 ManifestXmlStep::OnStateDone(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "ManifestXmlStep::OnStateDone()");
 
        GoNextState();
        return error;

diff --git a/src/Step/PackageCheckStep.cpp b/src/Step/PackageCheckStep.cpp
index acdd6aa..c005fde 100755 (executable)
--- a/src/Step/PackageCheckStep.cpp
+++ b/src/Step/PackageCheckStep.cpp
@@ -44,7 +44,9 @@ InstallerError
 PackageCheckStep::Run(InstallationContext* pContext)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "PackageCheckStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, " PackageCheckStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
        __pContext = pContext;
 
@@ -53,12 +55,12 @@ PackageCheckStep::Run(InstallationContext* pContext)
                switch (__state)
                {
                case STATE_PACKAGE_CHECK:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_PACKAGE_CHECK");
+                       AppLogTag(OSP_INSTALLER, "[STATE_PACKAGE_CHECK]");
                        error = OnStatePackageCheck();
                        break;
 
                case STATE_DONE:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_DONE");
+                       AppLogTag(OSP_INSTALLER, "[STATE_DONE]");
                        error = OnStateDone();
                        break;
 
@@ -74,7 +76,9 @@ PackageCheckStep::Run(InstallationContext* pContext)
 
                if (__state > STATE_DONE)
                {
-                       AppLogTag(OSP_INSTALLER, "PackageCheckStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+                       AppLogTag(OSP_INSTALLER, " PackageCheckStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
                        break;
                }
        }
@@ -92,8 +96,6 @@ InstallerError
 PackageCheckStep::OnStatePackageCheck(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "PackageCheckStep::OnStatePackageCheck()");
-
        String tempDir;
 
        if (__pContext->GetInstallationStorage() == InstallationContext::INSTALLATION_STORAGE_INTERNAL)
@@ -139,7 +141,6 @@ InstallerError
 PackageCheckStep::OnStateDone(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "PackageCheckStep::OnStateDone()");
 
        GoNextState();
        return error;

diff --git a/src/Step/SignatureStep.cpp b/src/Step/SignatureStep.cpp
index 186b2d0..ebfcd26 100755 (executable)
--- a/src/Step/SignatureStep.cpp
+++ b/src/Step/SignatureStep.cpp
@@ -49,7 +49,9 @@ InstallerError
 SignatureStep::Run(InstallationContext* pContext)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "SignatureStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, " SignatureStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
        __pContext = pContext;
 
@@ -60,7 +62,7 @@ SignatureStep::Run(InstallationContext* pContext)
        r = File::GetAttributes(__pContext->GetSignatureXmlPath(), attr);
        if (r != E_SUCCESS)
        {
-               AppLogTag(OSP_INSTALLER, "Signature file is not existing. [%ls]\n", __pContext->GetSignatureXmlPath().GetPointer());
+               AppLogTag(OSP_INSTALLER, "Signature file not found. path = [%ls]\n", __pContext->GetSignatureXmlPath().GetPointer());
                return INSTALLER_ERROR_NONE;
        }
 
@@ -69,22 +71,22 @@ SignatureStep::Run(InstallationContext* pContext)
                switch (__state)
                {
                case STATE_SIGNER_CERT:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_SIGNER_CERT");
+                       AppLogTag(OSP_INSTALLER, "[STATE_SIGNER_CERT]");
                        error = OnStateSignerCert();
                        break;
 
                case STATE_CERT_CHAIN:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_CERT_CHAIN");
+                       AppLogTag(OSP_INSTALLER, "[STATE_CERT_CHAIN]");
                        error = OnStateCertChain();
                        break;
 
                case STATE_ROOT_CERT:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_ROOT_CERT");
+                       AppLogTag(OSP_INSTALLER, "[STATE_ROOT_CERT]");
                        error = OnStateRootCert();
                        break;
 
                case STATE_DONE:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_DONE");
+                       AppLogTag(OSP_INSTALLER, "[STATE_DONE]");
                        error = OnStateDone();
                        break;
 
@@ -101,7 +103,9 @@ SignatureStep::Run(InstallationContext* pContext)
 
                if (__state > STATE_DONE)
                {
-                       AppLogTag(OSP_INSTALLER, "SignatureStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+                       AppLogTag(OSP_INSTALLER, " SignatureStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
                        break;
                }
        }
@@ -118,8 +122,6 @@ SignatureStep::GoNextState(void)
 InstallerError
 SignatureStep::OnStateSignerCert(void)
 {
-       AppLogTag(OSP_INSTALLER, "SignatureStep::OnStateSignerCert()");
-
        InstallerError error = INSTALLER_ERROR_NONE;
        bool ret = true;
 
@@ -140,8 +142,6 @@ CATCH:
 InstallerError
 SignatureStep::OnStateCertChain(void)
 {
-       AppLogTag(OSP_INSTALLER, "SignatureStep::OnStateCertChain()");
-
        InstallerError error = INSTALLER_ERROR_NONE;
        bool ret = true;
        int rootCert = ROOT_CERTIFICATE_NORMAL;
@@ -180,8 +180,6 @@ CATCH:
 InstallerError
 SignatureStep::OnStateRootCert(void)
 {
-       AppLogTag(OSP_INSTALLER, "SignatureStep::OnStateRootCert()");
-
        InstallerError error = INSTALLER_ERROR_NONE;
        result r = E_SUCCESS;
        String privileges;
@@ -212,7 +210,6 @@ InstallerError
 SignatureStep::OnStateDone(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "SignatureStep::OnStateDone()");
 
        GoNextState();
        return error;

diff --git a/src/Step/SystemCheckStep.cpp b/src/Step/SystemCheckStep.cpp
index 6c59417..d4efb86 100755 (executable)
--- a/src/Step/SystemCheckStep.cpp
+++ b/src/Step/SystemCheckStep.cpp
@@ -36,7 +36,10 @@ InstallerError
 SystemCheckStep::Run(InstallationContext* pContext)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "SystemCheckStep - START");
+
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, " SystemCheckStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
        __pContext = pContext;
 
@@ -45,22 +48,22 @@ SystemCheckStep::Run(InstallationContext* pContext)
                switch (__state)
                {
                case STATE_SYSTEM_CHECK:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_SYSTEM_CHECK");
+                       AppLogTag(OSP_INSTALLER, "[STATE_SYSTEM_CHECK]");
                        error = OnStateSystemCheck();
                        break;
 
                case STATE_AGENT_CHECK:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_AGENT_CHECK");
+                       AppLogTag(OSP_INSTALLER, "[STATE_AGENT_CHECK]");
                        error = OnStateAgentCheck();
                        break;
 
                case STATE_AGENT_TIMER:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_AGENT_TIMER");
+                       AppLogTag(OSP_INSTALLER, "[STATE_AGENT_TIMER]");
                        error = OnStateAgentTimer();
                        break;
 
                case STATE_DONE:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_DONE");
+                       AppLogTag(OSP_INSTALLER, "[STATE_DONE]");
                        error = OnStateDone();
                        break;
 
@@ -76,7 +79,9 @@ SystemCheckStep::Run(InstallationContext* pContext)
 
                if (__state > STATE_DONE)
                {
-                       AppLogTag(OSP_INSTALLER, "SystemCheckStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+                       AppLogTag(OSP_INSTALLER, " SystemCheckStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
                        break;
                }
        }
@@ -94,7 +99,6 @@ InstallerError
 SystemCheckStep::OnStateSystemCheck(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "SystemCheckStep::OnStateSystemCheck()");
 
        // Check preferred storage
        __pContext->SetInstallationStorage(InstallationContext::INSTALLATION_STORAGE_INTERNAL);
@@ -107,7 +111,6 @@ InstallerError
 SystemCheckStep::OnStateAgentCheck(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "SystemCheckStep::OnStateAgentCheck()");
 
        GoNextState();
        return error;
@@ -117,7 +120,6 @@ InstallerError
 SystemCheckStep::OnStateAgentTimer(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "SystemCheckStep::OnStateStartTimer()");
 
        GoNextState();
        return error;
@@ -127,7 +129,6 @@ InstallerError
 SystemCheckStep::OnStateDone(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "SystemCheckStep::OnStateDone()");
 
        GoNextState();
        return error;

diff --git a/src/Step/UninstallStep.cpp b/src/Step/UninstallStep.cpp
index 5030369..1e5f4d2 100755 (executable)
--- a/src/Step/UninstallStep.cpp
+++ b/src/Step/UninstallStep.cpp
@@ -48,7 +48,9 @@ InstallerError
 UninstallStep::Run(InstallationContext* pContext)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "UninstallStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, " UninstallStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
        __pContext = pContext;
 
@@ -57,32 +59,32 @@ UninstallStep::Run(InstallationContext* pContext)
                switch (__state)
                {
                case STATE_GET_PACKAGEINFO:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_GET_PACKAGEINFO");
+                       AppLogTag(OSP_INSTALLER, "[STATE_GET_PACKAGEINFO]");
                        error = OnStateGetPackageInfo();
                        break;
 
                case STATE_CHECK_APP_RUNNING:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_CHECK_APP_RUNNING");
+                       AppLogTag(OSP_INSTALLER, "[STATE_CHECK_APP_RUNNING]");
                        error = OnStateCheckAppRunning();
                        break;
 
                case STATE_TERMINATE_APP:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_TERMINATE_APP");
+                       AppLogTag(OSP_INSTALLER, "[STATE_TERMINATE_APP]");
                        error = OnStateTerminateApp();
                        break;
 
                case STATE_START_TIMER:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_START_TIMER");
+                       AppLogTag(OSP_INSTALLER, "[STATE_START_TIMER]");
                        error = OnStateStartTimer();
                        break;
 
                case STATE_DELETE_DIR:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_DELETE_DIR");
+                       AppLogTag(OSP_INSTALLER, "[STATE_DELETE_DIR]");
                        error = OnStateRemoveDir();
                        break;
 
                case STATE_DONE:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_DONE");
+                       AppLogTag(OSP_INSTALLER, "[STATE_DONE]");
                        error = OnStateDone();
                        break;
 
@@ -98,7 +100,9 @@ UninstallStep::Run(InstallationContext* pContext)
 
                if (__state > STATE_DONE)
                {
-                       AppLogTag(OSP_INSTALLER, "UninstallStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+                       AppLogTag(OSP_INSTALLER, " UninstallStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
                        break;
                }
        }
@@ -116,7 +120,6 @@ InstallerError
 UninstallStep::OnStateGetPackageInfo(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "UninstallStep::OnStateCheckAppRunning()");
 
        if (__pContext->IsHybridService() == true)
        {
@@ -158,7 +161,6 @@ InstallerError
 UninstallStep::OnStateCheckAppRunning(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "UninstallStep::OnStateCheckAppRunning()");
 
        GoNextState();
        return error;
@@ -168,7 +170,6 @@ InstallerError
 UninstallStep::OnStateTerminateApp(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "UninstallStep::OnStateTerminateApp()");
 
        GoNextState();
        return error;
@@ -178,7 +179,6 @@ InstallerError
 UninstallStep::OnStateStartTimer(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "UninstallStep::OnStateStartTimer()");
 
        GoNextState();
        return error;
@@ -188,7 +188,6 @@ InstallerError
 UninstallStep::OnStateRemoveDir(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "UninstallStep::OnStateRemoveDir()");
 
        _PackageInfoImpl* pPackageInfoImpl = __pContext->GetPackageInfoImpl();
        TryReturn(pPackageInfoImpl, INSTALLER_ERROR_INTERNAL_STATE, "[osp-installer] pPackageInfoImpl is null");
@@ -243,7 +242,6 @@ InstallerError
 UninstallStep::OnStateDone(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "UninstallStep::OnStateDone()");
 
        GoNextState();
        return error;

diff --git a/src/Step/UnpackStep.cpp b/src/Step/UnpackStep.cpp
index 10ee8c5..b33bdfd 100755 (executable)
--- a/src/Step/UnpackStep.cpp
+++ b/src/Step/UnpackStep.cpp
@@ -48,7 +48,9 @@ InstallerError
 UnpackStep::Run(InstallationContext* pContext)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "UnpackStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, " UnpackStep - START");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
        __pContext = pContext;
 
@@ -57,27 +59,27 @@ UnpackStep::Run(InstallationContext* pContext)
                switch (__state)
                {
                case STATE_UNZIP:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_UNZIP");
+                       AppLogTag(OSP_INSTALLER, "[STATE_UNZIP]");
                        error = OnUnzip();
                        break;
 
                case STATE_VERSION_CHECK:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_VERSION_CHECK");
+                       AppLogTag(OSP_INSTALLER, "[STATE_VERSION_CHECK]");
                        error = OnStateVersionCheck();
                        break;
 
                case STATE_FILE_MOVE:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_FILE_MOVE");
+                       AppLogTag(OSP_INSTALLER, "[STATE_FILE_MOVE]");
                        error = OnStateFileMove();
                        break;
 
                case STATE_CREATE_DIR:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_CREATE_DIR");
+                       AppLogTag(OSP_INSTALLER, "[STATE_CREATE_DIR]");
                        error = OnCreateDir();
                        break;
 
                case STATE_DONE:
-                       AppLogTag(OSP_INSTALLER, "[State] STATE_DONE");
+                       AppLogTag(OSP_INSTALLER, "[STATE_DONE]");
                        error = OnStateDone();
                        break;
 
@@ -93,7 +95,9 @@ UnpackStep::Run(InstallationContext* pContext)
 
                if (__state > STATE_DONE)
                {
-                       AppLogTag(OSP_INSTALLER, "UnpackStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+                       AppLogTag(OSP_INSTALLER, " UnpackStep - END");
+                       AppLogTag(OSP_INSTALLER, "------------------------------------------");
                        break;
                }
        }
@@ -111,73 +115,8 @@ InstallerError
 UnpackStep::OnUnzip(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "OnUnzip()");
        _PackageInfoImpl *pPackageInfoImpl = null;
 
-#if 0
-       FileUnzipper unzFile;
-       String packagePath = __pContext->GetPackagePath();
-       AppLogTag(OSP_INSTALLER, "packagePath = [%S]", packagePath.GetPointer());
-
-
-       if (!File::IsFileExist(packagePath))
-       {
-               AppLogException("  ##UnpackStep::OnUnzip packagePath=[%S] does not exist", packagePath.GetPointer());
-       }
-       else
-       {
-               AppLogException("  ##UnpackStep::OnUnzip packagePath=[%S] exists", packagePath.GetPointer());
-       }
-
-       r = unzFile.Construct(packagePath);
-
-       if (r != E_SUCCESS)
-       {
-               AppLogException("  ##UnpackStep::OnUnzip Fail to construct, err=[%s]", GetErrorMessage(r));
-       }
-       else
-       {
-               AppLogException("  ##UnpackStep::OnUnzip Success to construct, err=[%s]", GetErrorMessage(r));
-       }
-
-       if (__pContext->IsMmc())
-       {
-               tempDir = DIR_OSP_APPLICATION_MMC;
-       }
-       else
-       {
-               tempDir = DIR_OSP_APPLICATION_PHONE;
-       }
-
-       tempDir.Append(DIR_OSP_APPLICATION_TMP);
-
-       if (File::IsFileExist(tempDir))
-       {
-               Directory::Remove(tempDir, true);
-       }
-
-       __pContext->SetTemporaryDir(tempDir);
-       CreateDefaultDir();
-
-       AppLogException("  ##UnpackStep::OnUnzip UnzipTo path=[%S]", tempDir.GetPointer());
-
-       // r = unzFile.UnzipTo(tempDir);
-       // temp
-
-       // Unzip(packagePath, tempDir);
-
-
-       if (r != E_SUCCESS)
-       {
-               AppLogException("  ##UnpackStep::OnUnzip Fail to UnzipTo path=[%S], err=[%s].", tempDir.GetPointer(), GetErrorMessage(r));
-       }
-       else
-       {
-               AppLogException("  ##UnpackStep::OnUnzip Success to UnzipTo path=[%S], err=[%s].", tempDir.GetPointer(), GetErrorMessage(r));
-       }
-       // r = unzFile.UnzipTo(tempDir.GetPointer(), "EntryName");
-#endif
-
        String installPath;
        installPath = PATH_OPT_USR_APPS;
        installPath += "/";
@@ -218,7 +157,6 @@ InstallerError
 UnpackStep::OnStateVersionCheck(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "UnpackStep::OnStateVersionCheck()");
 
        GoNextState();
        return error;
@@ -228,33 +166,7 @@ InstallerError
 UnpackStep::OnStateFileMove(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "UnpackStep::OnStateFileMove()");
-//     result r = E_SUCCESS;
 
-//
-//     String workingDir = __pContext->GetWorkingDir();
-//     String installDir = __pContext->GetInstallDir();
-//
-//     r = File::Remove(installDir);
-//     if (r != E_SUCCESS)
-//     {
-//             AppLogException("  ##UnpackStep::OnCreateDir Fail to remove installdir, []", installDir.GetPointer());
-//     }
-//     else
-//     {
-//             AppLogException("  ##UnpackStep::OnCreateDir Success to remove installdir, []", installDir.GetPointer());
-//     }
-//
-//     r = File::Move(workingDir, installDir);
-//     if (r != E_SUCCESS)
-//     {
-//             AppLogException("  ##UnpackStep::OnCreateDir Failed, srcpath=[%S], dstpath=[%S]", workingDir.GetPointer(), installDir.GetPointer());
-//     }
-//     else
-//     {
-//             AppLogException("  ##UnpackStep::OnCreateDir Success, srcpath=[%S], dstpath=[%S]", workingDir.GetPointer(), installDir.GetPointer());
-//     }
-//
        GoNextState();
        return error;
 }
@@ -263,9 +175,6 @@ InstallerError
 UnpackStep::OnCreateDir(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "UnpackStep::OnCreateDir()");
-
-       //Directory::Create(path, true);  // Share, TrustShare, Data under InstallDir
 
        GoNextState();
        return error;
@@ -275,7 +184,6 @@ InstallerError
 UnpackStep::OnStateDone(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
-       AppLogTag(OSP_INSTALLER, "UnpackStep::OnStateDone()");
 
        GoNextState();
        return error;

diff --git a/src/Util/InstallerUtil.cpp b/src/Util/InstallerUtil.cpp
index 325231c..00ebd93 100755 (executable)
--- a/src/Util/InstallerUtil.cpp
+++ b/src/Util/InstallerUtil.cpp
@@ -56,23 +56,23 @@ InstallerUtil::Remove(const Osp::Base::String& filePath)
        TryReturn(pFilePath, false, "[osp-installer] pFilePath is null");
 
        err = lstat(pFilePath.get(), &fileinfo);
-       TryReturn(err >= 0, false, "[osp-installer] lstat() failed, filepath=%s", pFilePath.get());
+       TryReturn(err >= 0, false, "[osp-installer] lstat() failed, filepath = [%s]", pFilePath.get());
 
        if (S_ISLNK(fileinfo.st_mode))
        {
-               AppLogTag(OSP_INSTALLER, "remove symlink, pFilePath=%s", pFilePath.get());
+               AppLogTag(OSP_INSTALLER, "Remove(): symlink, pFilePath=%s", pFilePath.get());
                err = unlink(pFilePath.get());
-               TryReturn(err >= 0, false, "[osp-installer] unlink() failed, filepath=%s", pFilePath.get());
+               TryReturn(err >= 0, false, "[osp-installer] unlink() failed, filepath = [%s]", pFilePath.get());
        }
        else if (S_ISDIR(fileinfo.st_mode))
        {
-               AppLogTag(OSP_INSTALLER, "remove directory, filePath=%ls", filePath.GetPointer());
+               AppLogTag(OSP_INSTALLER, "Remove(): directory, filePath=%ls", filePath.GetPointer());
                r = Directory::Remove(filePath, true);
                TryReturn(!IsFailed(r), false, "[osp-installer] Directory::Remove() failed, filePath=%ls", filePath.GetPointer());
        }
        else
        {
-               AppLogTag(OSP_INSTALLER, "remove file, filePath=%ls", filePath.GetPointer());
+               AppLogTag(OSP_INSTALLER, "Remove(): file, filePath=%ls", filePath.GetPointer());
                r = File::Remove(filePath);
                TryReturn(!IsFailed(r), false, "[osp-installer] File::Remove() failed, filePath=%ls", filePath.GetPointer());
        }
@@ -179,7 +179,7 @@ InstallerUtil::IsSymlink(const Osp::Base::String& filePath)
        TryReturn(pFilePath, false, "[osp-installer] pFilePath is null");
 
        err = lstat(pFilePath.get(), &fileinfo);
-       TryReturn(err >= 0, false, "[osp-installer] lstat() failed, filepath=%s", pFilePath.get());
+       TryReturn(err >= 0, false, "[osp-installer] lstat() failed, filepath = [%s]", pFilePath.get());
 
        if (S_ISLNK(fileinfo.st_mode))
        {
@@ -205,7 +205,7 @@ InstallerUtil::CreateSymlink(const String& oldPath, const String& newPath)
        TryReturn(pNewPath, false, "[osp-installer] pNewPath is null");
 
        err = symlink(pOldPath.get(), pNewPath.get());
-       TryReturn(err == 0, false, "[osp-installer] symlink() is failed, oldpath=(%s), newpath=(%s)", pOldPath.get(), pNewPath.get());
+       TryReturn(err == 0, false, "[osp-installer] symlink() is failed, oldpath = [%s], newpath = [%s]", pOldPath.get(), pNewPath.get());
 
        return true;
 }
@@ -219,7 +219,7 @@ InstallerUtil::ChangeMode(const String& filePath, int mode)
        TryReturn(pFilePath, false, "[osp-installer] pFilePath is null");
 
        err = chmod(pFilePath.get(), mode);
-       TryReturn(err == 0, false, "[osp-installer] chmod() is failed, filepath=[%s], mode=[%o]", pFilePath.get(), mode);
+       TryReturn(err == 0, false, "[osp-installer] chmod() is failed, filepath = [%s], mode = [%o]", pFilePath.get(), mode);
 
        return true;
 }
@@ -233,7 +233,7 @@ InstallerUtil::ChangeOwner(const String& filePath)
        TryReturn(pFilePath, false, "[osp-installer] pFilePath is null");
 
        err = chown(pFilePath.get(), APP_OWNER_ID, APP_GROUP_ID);
-       TryReturn(err == 0, false, "[osp-installer] chown() is failed, filepath=[%s]", pFilePath.get());
+       TryReturn(err == 0, false, "[osp-installer] chown() is failed, filepath = [%s]", pFilePath.get());
 
        return true;
 }
@@ -242,12 +242,16 @@ bool
 InstallerUtil::ChangeDirectoryPermission(const String& filePath, int mode)
 {
        result r = E_SUCCESS;
+       bool res = false;
+
+       res = File::IsFileExist(filePath);
+       TryReturn(res == true, false, "[osp-installer] file not found, filePath = [%ls]", filePath.GetPointer());
 
        std::unique_ptr<Directory> pDir(new Directory);
        TryReturn(pDir, false, "[osp-installer] pDir is null.");
 
        r = pDir->Construct(filePath);
-       TryReturn(!IsFailed(r), false, "[osp-installer] pDir->Construct() failed, filePath=[%ls].", filePath.GetPointer());
+       TryReturn(!IsFailed(r), false, "[osp-installer] pDir->Construct() failed, filePath = [%ls]", filePath.GetPointer());
 
        std::unique_ptr<DirEnumerator> pDirEnum(pDir->ReadN());
        TryReturn(pDirEnum, false, "[osp-installer] pDirEnum is null.");
@@ -288,16 +292,16 @@ InstallerUtil::ChangeDirectoryPermission(const String& filePath, int mode)
 }
 
 bool
-InstallerUtil::IsDrmFile(const Osp::Base::String& packagePath)
+InstallerUtil::IsDrmFile(const Osp::Base::String& path)
 {
-       AppLogTag(OSP_INSTALLER, "IsDrmFile() called, packagePath=%ls", packagePath.GetPointer());
+       AppLogTag(OSP_INSTALLER, "IsDrmFile() called, path = [%ls]", path.GetPointer());
        return false;
 }
 
 bool
 InstallerUtil::DecryptPackage(const Osp::Base::String& packagePath)
 {
-       AppLogTag(OSP_INSTALLER, "DecryptPackage() called, packagePath=%ls", packagePath.GetPointer());
+       AppLogTag(OSP_INSTALLER, "DecryptPackage() called, packagePath = [%ls]", packagePath.GetPointer());
        return true;
 }
 
@@ -374,3 +378,17 @@ InstallerUtil::CreateSymlinkForAppId(const String& inPath, String& outPath)
 
        return true;
 }
+
+void
+InstallerUtil::Log(const char* pTagName, const char* pFormat, ...)
+{
+       va_list args;
+
+       va_start(args, pFormat);
+
+       AppLogTagInternal(OSP_INSTALLER, "", 0, pFormat, args);
+
+       va_end(args);
+
+}
+

diff --git a/src/Util/InstallerUtil.h b/src/Util/InstallerUtil.h
index 5733386..0386ae5 100755 (executable)
--- a/src/Util/InstallerUtil.h
+++ b/src/Util/InstallerUtil.h
@@ -54,12 +54,14 @@ public:
        static bool     ChangeOwner(const Osp::Base::String& filePath);
        static bool     ChangeDirectoryPermission(const Osp::Base::String& filePath, int mode);
 
-       static bool IsDrmFile(const Osp::Base::String& packagePath);
+       static bool IsDrmFile(const Osp::Base::String& path);
        static bool DecryptPackage(const Osp::Base::String& packagePath);
 
        static Osp::Base::String GetCategory(int categoryType);
        static CategoryType GetCategoryType(char* pCategory);
 
+       static void Log(const char* pTagName, const char* pFormat, ...);
+
 private:
        InstallerUtil(const InstallerUtil& value);
        InstallerUtil& operator =(const InstallerUtil& source);

diff --git a/src/XmlHandler/ManifestHandler.cpp b/src/XmlHandler/ManifestHandler.cpp
index 3561bee..628d3bc 100755 (executable)
--- a/src/XmlHandler/ManifestHandler.cpp
+++ b/src/XmlHandler/ManifestHandler.cpp
@@ -101,6 +101,10 @@ ManifestHandler::OnStartElement(const char *pName)
                AppLogTag(OSP_INSTALLER, "------------------------------------------");
                AppLogTag(OSP_INSTALLER, "<%s>", pName);
        }
+       else if (strcasecmp(pName, "Apps") == 0)
+       {
+               AppLogTag(OSP_INSTALLER, "<%s>", pName);
+       }
        else if (strcasecmp(pName, "UiApp") == 0)
        {
                status = OnUiAppElement();
@@ -393,7 +397,7 @@ ManifestHandler::OnPrivilegesEndElement(void)
        r = File::GetAttributes(__pContext->GetSignatureXmlPath(), attr);
        if (r != E_SUCCESS)
        {
-               AppLogTag(OSP_INSTALLER, "Signature file is not existing. [%ls]\n", __pContext->GetSignatureXmlPath().GetPointer());
+               AppLogTag(OSP_INSTALLER, "Signature file not found. [%ls]\n", __pContext->GetSignatureXmlPath().GetPointer());
 
                String privileges;
                String hmacPrivileges;

diff --git a/src/XmlHandler/XmlWriter.cpp b/src/XmlHandler/XmlWriter.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 7f17474..5d82efa
--- a/src/XmlHandler/XmlWriter.cpp
+++ b/src/XmlHandler/XmlWriter.cpp
@@ -40,7 +40,6 @@ using namespace Osp::Io;
 XmlWriter::XmlWriter(void)
 :__pXmlWriter(null), __pXmlBuffer(null)
 {
-       AppLogTag(OSP_INSTALLER, "Xml Generator Start");
 }
 
 XmlWriter::~XmlWriter(void)
@@ -63,7 +62,10 @@ XmlWriter::~XmlWriter(void)
                        AppLogTag(OSP_INSTALLER, "file.Write() failed, __xmlFilePath=[%ls]", __xmlFilePath.GetPointer());
                }
 
-               AppLogTag(OSP_INSTALLER, "Xml File is generated... \n\n%s", __pXmlBuffer->content);
+               AppLogTag(OSP_INSTALLER, "------------------------------------------");
+               AppLogTag(OSP_INSTALLER, "%ls is generated", __xmlFilePath.GetPointer());
+               AppLogTag(OSP_INSTALLER, "------------------------------------------");
+               AppLogTag(OSP_INSTALLER, "%s", __pXmlBuffer->content);
        }
 
        if (__pXmlWriter)
@@ -75,8 +77,6 @@ XmlWriter::~XmlWriter(void)
        {
                xmlBufferFree(__pXmlBuffer);
        }
-
-       AppLogTag(OSP_INSTALLER, "Xml Generator End");
 }
 
 bool
@@ -84,7 +84,6 @@ XmlWriter::Construct(const Osp::Base::String& filepath)
 {
        bool res = false;
        int err = 0;
-       AppLogTag(OSP_INSTALLER, "Construct()");
 
        __pXmlBuffer = xmlBufferCreate();
        TryCatch(__pXmlBuffer, res = false, "[osp-installer] __pXmlBuffer is null");

diff --git a/src/backend/backend.cpp b/src/backend/backend.cpp
index 588eded..92dbced 100755 (executable)
--- a/src/backend/backend.cpp
+++ b/src/backend/backend.cpp
@@ -31,6 +31,7 @@
 
 #include "InstallerManager.h"
 #include "InstallerDefs.h"
+#include "InstallerUtil.h"
 
 using namespace Osp::Base;
 
@@ -53,8 +54,10 @@ main(int argc, char **argv)
        Osp_Initialize();
 
        AppLogTag(OSP_INSTALLER, "\n\n\n\n\n\n");
-       AppLogTag(OSP_INSTALLER, "---------------------------------------------------");
+       AppLogTag(OSP_INSTALLER, "==========================================");
+       fprintf(stderr, "==========================================\n");
        AppLogTag(OSP_INSTALLER, " # %s", OSP_INSTALLER_VERSION);
+       fprintf(stderr, " # %s\n", OSP_INSTALLER_VERSION);
        AppLogTag(OSP_INSTALLER, " # argc = %d", argc);
 
        if (argc == TEST_ARG_COUNT)
@@ -81,7 +84,7 @@ main(int argc, char **argv)
 
        pkg_info = pkgmgr_installer_get_request_info(pi);
        pkg_path = (const_cast<char*>(pkg_info));
-       AppLogTag(OSP_INSTALLER, "osp-installer is called. pkg_path = %s", pkg_path);
+       AppLogTag(OSP_INSTALLER, " # path = [%s]", pkg_path);
 
        path = pkg_path;
 
@@ -105,7 +108,7 @@ main(int argc, char **argv)
                                AppLogTag(OSP_INSTALLER, "_pi is null");
                        }
 
-                       AppLogTag(OSP_INSTALLER, "---------------------------------------------------");
+                       AppLogTag(OSP_INSTALLER, "==========================================");
                        AppLogTag(OSP_INSTALLER, " # appId     = [%ls], error = [%d]\n", appId.GetPointer(), errorType);
 
                        if (errorType != 0)
@@ -118,7 +121,8 @@ main(int argc, char **argv)
                                AppLogTag(OSP_INSTALLER, " # result    = [Installation][success]");
                        }
 
-                       AppLogTag(OSP_INSTALLER, "---------------------------------------------------");
+                       AppLogTag(OSP_INSTALLER, " # %s", OSP_INSTALLER_VERSION);
+                       AppLogTag(OSP_INSTALLER, "==========================================");
 
                        __osp_installer_report_result(appId, errorType);
                }
@@ -155,7 +159,7 @@ main(int argc, char **argv)
                                AppLogTag(OSP_INSTALLER, "_pi is null");
                        }
 
-                       AppLogTag(OSP_INSTALLER, "---------------------------------------------------");
+                       AppLogTag(OSP_INSTALLER, "==========================================");
                        AppLogTag(OSP_INSTALLER, " # appId     = [%ls], error = [%d]", appId.GetPointer(), errorType);
 
                        if (errorType != 0)
@@ -167,7 +171,8 @@ main(int argc, char **argv)
                                AppLogTag(OSP_INSTALLER, " # result    = [Uninstallation][success]");
                        }
 
-                       AppLogTag(OSP_INSTALLER, "---------------------------------------------------");
+                       AppLogTag(OSP_INSTALLER, " # %s", OSP_INSTALLER_VERSION);
+                       AppLogTag(OSP_INSTALLER, "==========================================");
 
                        __osp_installer_report_result(appId, errorType);
                }
@@ -183,11 +188,11 @@ main(int argc, char **argv)
                goto CATCH;
        }
 
-       AppLogTag(OSP_INSTALLER, "---------------------------------------------------");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
        return errorType;
 
 CATCH:
-       AppLogTag(OSP_INSTALLER, "---------------------------------------------------");
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
        pkgmgr_installer_send_signal(_pi, "sample", "abcd", "end", "ok");
        return errorType;
 }
@@ -200,8 +205,12 @@ __osp_installer_report_result(const String& appId, int errorType)
        const char* pAppId = null;
        InstallerManager manager;
 
-       AppLogTag(OSP_INSTALLER, "__result_callback: request_type = [%d], request_info = [%s], session_id = [%s]\n",
-               pkgmgr_installer_get_request_type(_pi), pkgmgr_installer_get_request_info(_pi), pkgmgr_installer_get_session_id(_pi));
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
+       AppLogTag(OSP_INSTALLER, "__osp_installer_report_result()");
+       AppLogTag(OSP_INSTALLER, " # request_type = [%d]", pkgmgr_installer_get_request_type(_pi));
+       AppLogTag(OSP_INSTALLER, " # request_info = [%s]", pkgmgr_installer_get_request_info(_pi));
+       AppLogTag(OSP_INSTALLER, " # session_id = [%s]", pkgmgr_installer_get_session_id(_pi));
+       AppLogTag(OSP_INSTALLER, "------------------------------------------");
 
        if (_pi == 0)
        {