Remove 'id' in log

Change-Id: Iac509f56f931796a49a8a355d8824ef60640ad65
Signed-off-by: Duyoung Jang <duyoung.jang@samsung.com>

diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h
index dd40ad0..a376e3f 100755 (executable)
--- a/inc/InstallerDefs.h
+++ b/inc/InstallerDefs.h
@@ -23,7 +23,7 @@
 
 #include "InstallerUtil.h"
 
-#define OSP_INSTALLER_VERSION "version=[20130417.3]"
+#define OSP_INSTALLER_VERSION "version=[20130418.1]"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"

diff --git a/src/Manager/InstallerManager.cpp b/src/Manager/InstallerManager.cpp
index 7f4161c..41f5af5 100755 (executable)
--- a/src/Manager/InstallerManager.cpp
+++ b/src/Manager/InstallerManager.cpp
@@ -159,7 +159,7 @@ InstallerManager::Construct(const String& path, InstallerOperation operation, In
                        PackageId packageId;
                        pOptionalData->SubString(0, PACKAGE_ID_LENGTH, packageId);
                        __pContext->__packageId = packageId;
-                       AppLog(" # packageId = [%ls]", packageId.GetPointer());
+                       AppLog(" # package = [%ls]", packageId.GetPointer());
 
                        // format -> pOptionalData = "abcde12345:StoreClientId=12345abcde.TizenStore"
                        int indexOf = 0;
@@ -170,14 +170,14 @@ InstallerManager::Construct(const String& path, InstallerOperation operation, In
                        {
                                pOptionalData->SubString(indexOf + tokenDelimiter.GetLength(), storeClientId);
                                __pContext->__storeClientId = storeClientId;
-                               AppLog(" # storeClientId = [%ls]", storeClientId.GetPointer());
+                               AppLog(" # storeClient = [%ls]", storeClientId.GetPointer());
                        }
 
                        SendEvent(__pContext, __pContext->__packageId, "start", "install");
                }
                else
                {
-                       AppLog("Input param(packageId) is null in case of cmd, hybrid package.");
+                       AppLog("Input param(package) is null in case of cmd, hybrid package.");
                }
        }
        else if (operation == INSTALLER_OPERATION_UNINSTALL)
@@ -628,13 +628,13 @@ InstallerManager::PrintResult(void)
        AppLog("==========================================");
        AppLog(" # operation = %s", pOperation);
        AppLog(" # %s", OSP_INSTALLER_VERSION);
-       AppLog(" # PackageId = [%ls]", pPackageId);
+       AppLog(" # Package   = [%ls]", pPackageId);
        AppLog(" # MainApp   = [%ls]", pMainAppName);
        AppLog(" # Time      = [%d]ms", duration);
        PrintError(errorType);
        AppLog("==========================================");
 
-       fprintf(stderr, "  ## osp-installer: operation=[%s] result=[%s(%03d)] package id=[%ls] main appname=[%ls] time=[%d]ms\n",
+       fprintf(stderr, "  ## osp-installer: operation=[%s] result=[%s(%03d)] package=[%ls] main appname=[%ls] time=[%d]ms\n",
                        pOperation, pError, errorType, pPackageId, pMainAppName, duration);
 }
 

diff --git a/src/Manager/PermissionManager.cpp b/src/Manager/PermissionManager.cpp
index 66ba2de..6fbd18e 100755 (executable)
--- a/src/Manager/PermissionManager.cpp
+++ b/src/Manager/PermissionManager.cpp
@@ -153,7 +153,7 @@ PermissionManager::SetDirectory(InstallationContext* pContext)
 
        AppLog("------------------------------------------");
        AppLog("[Tizen::Io] # path = [%ls]", appRootPath.GetPointer());
-       AppLog("[Tizen::Io] # packageId = [%ls]", packageId.GetPointer());
+       AppLog("[Tizen::Io] # package = [%ls]", packageId.GetPointer());
        AppLog("[Tizen::Io] # apiVersion = [%ls]", apiVersion.GetPointer());
 
        if (pContext->__isOspCompat == true)

diff --git a/src/Manager/SmackManager.cpp b/src/Manager/SmackManager.cpp
index 00ea2a5..5244d03 100755 (executable)
--- a/src/Manager/SmackManager.cpp
+++ b/src/Manager/SmackManager.cpp
@@ -272,7 +272,7 @@ SmackManager::AddSharedDirReaders(const Tizen::Base::String& label)
 
        for (int i = 0; pList[i] != null; i++)
        {
-               //AppLog("delete PackageId - [%s]", pList[i]);
+               //AppLog("delete Package - [%s]", pList[i]);
                delete[] pList[i];
         }
        delete[] pList;

diff --git a/src/Step/SignatureStep.cpp b/src/Step/SignatureStep.cpp
index 54da6b6..e58fd8a 100755 (executable)
--- a/src/Step/SignatureStep.cpp
+++ b/src/Step/SignatureStep.cpp
@@ -222,7 +222,7 @@ SignatureStep::OnStateRootCert(void)
        {
                __pContext->__privilegeLevel = __pSignatureManager->GetPrivilegeLevel(apiVisibility);
        }
-       AppLog("PackageId = [%ls], CertType = [%d], ApiVisibility = [%d], preloaded = [%d], privilege level = [%d]",
+       AppLog("Package = [%ls], CertType = [%d], ApiVisibility = [%d], preloaded = [%d], privilege level = [%d]",
                        packageId.GetPointer(), certType, apiVisibility, __pContext->__isPreloaded, __pContext->__privilegeLevel);
 
        if (pPrivilegeList != null)

diff --git a/src/Step/SystemCheckStep.cpp b/src/Step/SystemCheckStep.cpp
index 0b65159..4bb6119 100755 (executable)
--- a/src/Step/SystemCheckStep.cpp
+++ b/src/Step/SystemCheckStep.cpp
@@ -111,13 +111,13 @@ SystemCheckStep::OnStateVersionCheck(void)
 
                if (res == VERSION_SAME)
                {
-                       AppLog("Same version: packageId = [%ls], version = [%ls]", __pContext->__packageId.GetPointer(), oldVersion.GetPointer());
+                       AppLog("Same version: package = [%ls], version = [%ls]", __pContext->__packageId.GetPointer(), oldVersion.GetPointer());
                }
                else if (res == VERSION_NEW)
                {
                        __pContext->__isUpdated = true;
 
-                       AppLog("Update version: packageId = [%ls]", __pContext->__packageId.GetPointer());
+                       AppLog("Update version: package = [%ls]", __pContext->__packageId.GetPointer());
                        AppLog("Update version: oldVersion = [%ls] -> newVersion = [%ls]", oldVersion.GetPointer(), newVersion.GetPointer());
                }
                else if (res == VERSION_OLD)

diff --git a/src/Step/UninstallStep.cpp b/src/Step/UninstallStep.cpp
index e43f941..aeade2b 100755 (executable)
--- a/src/Step/UninstallStep.cpp
+++ b/src/Step/UninstallStep.cpp
@@ -126,7 +126,7 @@ UninstallStep::OnStateGetPackageInfo(void)
        std::unique_ptr< _PackageInfoImpl > pPackageInfoImpl(new (std::nothrow) _PackageInfoImpl());
        TryReturn(pPackageInfoImpl, INSTALLER_ERROR_OUT_OF_MEMORY, "pPackageInfoImpl is null.");
 
-       AppLog("packageId = %ls", packageId.GetPointer());
+       AppLog("package = %ls", packageId.GetPointer());
 
        result r = pPackageInfoImpl->Construct(packageId);
        TryReturn(r == E_SUCCESS, INSTALLER_ERROR_INTERNAL_STATE, "pPackageInfoImpl->Construct(%ls) failed.", packageId.GetPointer());

diff --git a/src/XmlHandler/ManifestHandler.cpp b/src/XmlHandler/ManifestHandler.cpp
index a680ae3..9012a7e 100755 (executable)
--- a/src/XmlHandler/ManifestHandler.cpp
+++ b/src/XmlHandler/ManifestHandler.cpp
@@ -540,7 +540,7 @@ ManifestHandler::OnDataControlStartElement(void)
 
        __pDataControlInfo->__providerId = pProviderId;
 
-       AppLog("<DataControl ProviderId=\"%s\">", pProviderId);
+       AppLog("<DataControl Provider=\"%s\">", pProviderId);
 
        return true;
 }
@@ -591,7 +591,7 @@ ManifestHandler::OnContentStartElement(void)
                }
        }
 
-       AppLog("<Content Id=\"%s\" EntryName=\"%s\">", pId, pEntryName);
+       AppLog("<Content=\"%s\" EntryName=\"%s\">", pId, pEntryName);
 
        return true;
 }
@@ -843,7 +843,7 @@ ManifestHandler::OnManifestEndElement(void)
 bool
 ManifestHandler::OnIdValue(const char* pCharacters)
 {
-       AppLog("<Id>%s</Id>", pCharacters);
+       AppLog("<Package>%s</Package>", pCharacters);
 
        if (__pContext->__packageId.IsEmpty() == true)
        {
@@ -854,12 +854,12 @@ ManifestHandler::OnIdValue(const char* pCharacters)
                String id(pCharacters);
                if (__pContext->__packageId != id)
                {
-                       AppLog("input packageId = [%ls], id(manifest) = [%s] is different.", __pContext->__packageId.GetPointer(), pCharacters);
+                       AppLog("input package = [%ls], manifest = [%s] is different.", __pContext->__packageId.GetPointer(), pCharacters);
                        return false;
                }
                else
                {
-                       AppLog("input packageId = [%ls], id(manifest) = [%s] is the same.", __pContext->__packageId.GetPointer(), pCharacters);
+                       AppLog("input package = [%ls], manifest = [%s] is the same.", __pContext->__packageId.GetPointer(), pCharacters);
                }
        }
 
@@ -1453,7 +1453,7 @@ ManifestHandler::ParseAppAttribute(XmlAttribute* pAttr, bool isUiApp)
                }
        }
 
-       AppLog(" - appId=%ls", __pAppData->__appId.GetPointer());
+       AppLog(" - app=%ls", __pAppData->__appId.GetPointer());
 
        return true;
 }

diff --git a/src/XmlHandler/Parser/ManifestAccountsParser.cpp b/src/XmlHandler/Parser/ManifestAccountsParser.cpp
index f703141..edb70bb 100755 (executable)
--- a/src/XmlHandler/Parser/ManifestAccountsParser.cpp
+++ b/src/XmlHandler/Parser/ManifestAccountsParser.cpp
@@ -146,12 +146,12 @@ ManifestAccountsParser::OnAccountProviderStartElement(void)
        if (pProviderId)
        {
                __pAccountData->__providerId = pProviderId;
-               AppLog("   - ProviderId=%s", pProviderId);
+               AppLog("   - Provider=%s", pProviderId);
        }
        else
        {
                __pAccountData->__providerId = L"none";
-               AppLog("   - ProviderId=%s", "none");
+               AppLog("   - Provider=%s", "none");
        }
 
        char *pMultipleAccountsSupport = pAttr->Find("MultipleAccountsSupport");

diff --git a/src/XmlHandler/Parser/ManifestAppControlsParser.cpp b/src/XmlHandler/Parser/ManifestAppControlsParser.cpp
index 7462c54..cdd090b 100755 (executable)
--- a/src/XmlHandler/Parser/ManifestAppControlsParser.cpp
+++ b/src/XmlHandler/Parser/ManifestAppControlsParser.cpp
@@ -164,7 +164,7 @@ ManifestAppControlsParser::OnAppControlStartElement(void)
        char* pProviderId = pAttr->Find("ProviderId");
        if (pProviderId)
        {
-               AppLog("   - ProviderId=%s", pProviderId);
+               AppLog("   - Provider=%s", pProviderId);
                pHandler->__pAppControlInfoImpl->SetProviderId(pProviderId);
                __legacyAppControls = true;
        }
@@ -198,7 +198,7 @@ ManifestAppControlsParser::OnCapabilityStartElement(void)
        char* pOperationId = pAttr->Find("OperationId");
        if (pOperationId)
        {
-               AppLog("   - OperationId=%s", pOperationId);
+               AppLog("   - Operation=%s", pOperationId);
 
                pHandler->__pAppControlCapabilityInfoImpl = new (std::nothrow) _AppControlCapabilityInfo;
                TryReturn(pHandler->__pAppControlCapabilityInfoImpl, false, "pHandler->__pAppControlCapabilityInfoImpl is null");

diff --git a/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp b/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp
index 12de63a..0a4c3ff 100755 (executable)
--- a/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp
+++ b/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp
@@ -278,7 +278,7 @@ bool
 ManifestLiveboxesParser::OnConfigurationAppControlAppIdValue(const char* pCharacters)
 {
        __pLiveboxData->__configurationAppControlAppId = pCharacters;
-       AppLog("  <ConfigurationAppControlAppId>%s</ConfigurationAppControlAppId>", pCharacters);
+       AppLog("  <ConfigurationAppControlApp>%s</ConfigurationAppControlApp>", pCharacters);
 
        return true;
 }

diff --git a/src/XmlHandler/SignatureHandler.cpp b/src/XmlHandler/SignatureHandler.cpp
index ca4401d..0cd5c2a 100755 (executable)
--- a/src/XmlHandler/SignatureHandler.cpp
+++ b/src/XmlHandler/SignatureHandler.cpp
@@ -167,7 +167,7 @@ SignatureHandler::OnSignatureStartElement(void)
        pId = pAttr->Find("Id");
        if (pId)
        {
-               AppLog("<Id = %s>", pId);
+               AppLog("<%s>", pId);
 
                if (strcasecmp(pId, "AuthorSignature") == 0)
                {

diff --git a/src/backend/backend.cpp b/src/backend/backend.cpp
index b67284c..83ba9b7 100755 (executable)
--- a/src/backend/backend.cpp
+++ b/src/backend/backend.cpp
@@ -172,7 +172,7 @@ main(int argc, char **argv)
 
                        path.SubString(0, PACKAGE_ID_LENGTH, reqeustPackageId);
 
-                       AppLog("reqeustPackageId = %ls", reqeustPackageId.GetPointer());
+                       AppLog("reqeustPackage = %ls", reqeustPackageId.GetPointer());
                        ret = InstallerManager::Request(reqeustPackageId, INSTALLER_OPERATION_UNINSTALL, INSTALLER_OPTION_NORMAL, _pi);
 
                        __osp_installer_report_result(reqeustPackageId, errorType);
@@ -185,7 +185,7 @@ main(int argc, char **argv)
 
                        path.SubString(0, PACKAGE_ID_LENGTH, rdsPackageId);
 
-                       AppLog("rdsPackageId = %ls", rdsPackageId.GetPointer());
+                       AppLog("rdsPackage = %ls", rdsPackageId.GetPointer());
                        ret = InstallerManager::Request(rdsPackageId, INSTALLER_OPERATION_REINSTALL, INSTALLER_OPTION_NORMAL, _pi, &rdsPackageId);
 
                        __osp_installer_report_result(rdsPackageId, errorType);
@@ -230,10 +230,10 @@ __osp_installer_report_result(const PackageId& packageId, int errorType)
        AppLog("osp_installer_report_result");
        AppLog(" # request_type = [%d]", pkgmgr_installer_get_request_type(_pi));
        AppLog(" # request_info = [%s]", pkgmgr_installer_get_request_info(_pi));
-       AppLog(" # session_id = [%s]", pkgmgr_installer_get_session_id(_pi));
+       AppLog(" # session = [%s]", pkgmgr_installer_get_session_id(_pi));
        if (packageId.IsEmpty() == false)
        {
-               AppLog(" # packageId = [%ls]", packageId.GetPointer());
+               AppLog(" # package = [%ls]", packageId.GetPointer());
        }
        AppLog(" # errorType = [%d]", errorType);
        AppLog("------------------------------------------");