diff options
author | Seokhyun Kim <swank.kim@samsung.com> | 2012-12-08 11:09:21 +0900 |
---|---|---|
committer | Seokhyun Kim <swank.kim@samsung.com> | 2012-12-08 11:09:21 +0900 |
commit | 6c3ad5829e71f60dc92f2971569af76c86a346cb (patch) | |
tree | 981d54d05f6385e0216b29a0aa79b81a944f8020 | |
parent | 78f8c1b6ff3627a9c9ac843f73a2e242796ea29f (diff) | |
download | installer-6c3ad5829e71f60dc92f2971569af76c86a346cb.tar.gz installer-6c3ad5829e71f60dc92f2971569af76c86a346cb.tar.bz2 installer-6c3ad5829e71f60dc92f2971569af76c86a346cb.zip |
Osp:: => Tizen::, apiVersion 3.0 => apiVersion 2.1
Change-Id: Ibea8770591c18f89aa53243e6437f4a433680587
37 files changed, 259 insertions, 259 deletions
diff --git a/manifest.xml b/manifest.xml index c629e5c..18ee478 100755 --- a/manifest.xml +++ b/manifest.xml @@ -8,7 +8,7 @@ <Url/> <Requirements/> <Apps> - <ApiVersion>3.0</ApiVersion> + <ApiVersion>2.1</ApiVersion> <Secret/> <Privileges/> <ServiceApp AutoRestart="False" Default="True" ExecutableName="osp-installer" LaunchOnBoot="False"> diff --git a/plugin/osp-installer-plugin.cpp b/plugin/osp-installer-plugin.cpp index 257e5e4..9f5388d 100755..100644 --- a/plugin/osp-installer-plugin.cpp +++ b/plugin/osp-installer-plugin.cpp @@ -34,9 +34,9 @@ #include "InstallerDefs.h" -using namespace Osp::Base; -using namespace Osp::Io; -using namespace Osp::App; +using namespace Tizen::Base; +using namespace Tizen::Io; +using namespace Tizen::App; #ifdef __cplusplus extern "C" diff --git a/src/Context/InstallationContext.cpp b/src/Context/InstallationContext.cpp index 74fc46d..38d3f0a 100755..100644 --- a/src/Context/InstallationContext.cpp +++ b/src/Context/InstallationContext.cpp @@ -31,11 +31,11 @@ #include <FApp_PackageInfoImpl.h> -using namespace Osp::Base; -using namespace Osp::Base::Collection; -using namespace Osp::Io; -using namespace Osp::Security::Cert; -using namespace Osp::App; +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::Io; +using namespace Tizen::Security::Cert; +using namespace Tizen::App; InstallationContext::InstallationContext(void) :__pStep(null) @@ -217,7 +217,7 @@ InstallationContext::GetStep(void) } void -InstallationContext::SetInputPath(const Osp::Base::String& path) +InstallationContext::SetInputPath(const Tizen::Base::String& path) { __inputPath = path; } diff --git a/src/Context/InstallationContext.h b/src/Context/InstallationContext.h index 430f610..648db20 100755..100644 --- a/src/Context/InstallationContext.h +++ b/src/Context/InstallationContext.h @@ -69,8 +69,8 @@ public: IInstallationStep* GetStep(void); - void SetInputPath(const Osp::Base::String& path); - const Osp::Base::String& GetInputPath(void) const; + void SetInputPath(const Tizen::Base::String& path); + const Tizen::Base::String& GetInputPath(void) const; void SetInstallerOperation(InstallerOperation op); InstallerOperation GetInstallerOperation(void) const; @@ -90,45 +90,45 @@ public: bool IsVerificationMode(void); void SetVerificationMode(bool verificationMode); - const Osp::Base::String& GetPackagePath(void) const; - void SetPackagePath(const Osp::Base::String& packagePath); + const Tizen::Base::String& GetPackagePath(void) const; + void SetPackagePath(const Tizen::Base::String& packagePath); - const Osp::Base::String& GetLicensePath(void) const; - void SetLicensePath(const Osp::Base::String& licensePath); + const Tizen::Base::String& GetLicensePath(void) const; + void SetLicensePath(const Tizen::Base::String& licensePath); - const Osp::Base::String& GetTemporaryDir(void) const; - void SetTemporaryDir(const Osp::Base::String& temporaryDir); + const Tizen::Base::String& GetTemporaryDir(void) const; + void SetTemporaryDir(const Tizen::Base::String& temporaryDir); - const Osp::Base::String& GetInstallDir(void) const; - void SetInstallDir(const Osp::Base::String& installDir); + const Tizen::Base::String& GetInstallDir(void) const; + void SetInstallDir(const Tizen::Base::String& installDir); - const Osp::Base::String& GetWorkingDir(void) const; - void SetWorkingDir(const Osp::Base::String& workingDir); + const Tizen::Base::String& GetWorkingDir(void) const; + void SetWorkingDir(const Tizen::Base::String& workingDir); - const Osp::Base::String& GetAppId(void) const; - void SetAppId(const Osp::Base::String& appId); + const Tizen::Base::String& GetAppId(void) const; + void SetAppId(const Tizen::Base::String& appId); - const Osp::Base::String& GetAppVersion(void) const; - void SetAppVersion(const Osp::Base::String& appVersion); + const Tizen::Base::String& GetAppVersion(void) const; + void SetAppVersion(const Tizen::Base::String& appVersion); - Osp::Base::String GetManifestXmlPath(void); - Osp::Base::String GetSignatureXmlPath(void); - Osp::Base::String GetAuthorSignatureXmlPath(void); + Tizen::Base::String GetManifestXmlPath(void); + Tizen::Base::String GetSignatureXmlPath(void); + Tizen::Base::String GetAuthorSignatureXmlPath(void); - const Osp::Base::Collection::ArrayList* GetPrivilegeList(void) const; - void SetPrivilegeList(Osp::Base::Collection::ArrayList* privilegeList); + const Tizen::Base::Collection::ArrayList* GetPrivilegeList(void) const; + void SetPrivilegeList(Tizen::Base::Collection::ArrayList* privilegeList); - Osp::Base::Collection::ArrayList* GetLiveBoxList(void) const; - void SetLiveBoxList(Osp::Base::Collection::ArrayList* pLiveBoxList); + Tizen::Base::Collection::ArrayList* GetLiveBoxList(void) const; + void SetLiveBoxList(Tizen::Base::Collection::ArrayList* pLiveBoxList); - Osp::Base::Collection::ArrayList* GetContentInfoList(void) const; - void SetContentInfoList(Osp::Base::Collection::ArrayList* pContentInfoList); + Tizen::Base::Collection::ArrayList* GetContentInfoList(void) const; + void SetContentInfoList(Tizen::Base::Collection::ArrayList* pContentInfoList); - Osp::Security::Cert::X509CertificatePath* GetAuthorCertPath(void) const; - void SetAuthorCertPath(Osp::Security::Cert::X509CertificatePath* pAuthorCertPath); + Tizen::Security::Cert::X509CertificatePath* GetAuthorCertPath(void) const; + void SetAuthorCertPath(Tizen::Security::Cert::X509CertificatePath* pAuthorCertPath); - Osp::Security::Cert::X509CertificatePath* GetDistributorCertPath(void) const; - void SetDistributorCertPath(Osp::Security::Cert::X509CertificatePath* pDistributorCertPath); + Tizen::Security::Cert::X509CertificatePath* GetDistributorCertPath(void) const; + void SetDistributorCertPath(Tizen::Security::Cert::X509CertificatePath* pDistributorCertPath); RootCertificateType GetRootCertType(void) const; void SetRootCertType(RootCertificateType certType); @@ -139,7 +139,7 @@ public: app2ext_handle* GetApp2ExtHandle(void) const; void SetApp2ExtHandle(app2ext_handle* pHandle); - Osp::App::_PackageInfoImpl* GetPackageInfoImpl(void) const; + Tizen::App::_PackageInfoImpl* GetPackageInfoImpl(void) const; private: InstallationContext(const InstallationContext& value); @@ -157,35 +157,35 @@ private: bool __hybridService; bool __verificationMode; - Osp::Base::String __inputPath; + Tizen::Base::String __inputPath; InstallerOperation __operation; InstallationStorage __storage; - Osp::Base::String __packagePath; - Osp::Base::String __licensePath; - Osp::Base::String __temporaryDir; - Osp::Base::String __installDir; - Osp::Base::String __workingDir; - Osp::Base::String __appId; - Osp::Base::String __appVersion; - Osp::Base::String __appRootPath; - - Osp::Base::Collection::ArrayList* __pPrivilegeList; - Osp::Base::Collection::ArrayList* __pLiveBoxList; - Osp::Base::Collection::ArrayList* __pContentInfoList; - Osp::Security::Cert::X509CertificatePath* __pAuthorCertPath; - Osp::Security::Cert::X509CertificatePath* __pDistributorCertPath; + Tizen::Base::String __packagePath; + Tizen::Base::String __licensePath; + Tizen::Base::String __temporaryDir; + Tizen::Base::String __installDir; + Tizen::Base::String __workingDir; + Tizen::Base::String __appId; + Tizen::Base::String __appVersion; + Tizen::Base::String __appRootPath; + + Tizen::Base::Collection::ArrayList* __pPrivilegeList; + Tizen::Base::Collection::ArrayList* __pLiveBoxList; + Tizen::Base::Collection::ArrayList* __pContentInfoList; + Tizen::Security::Cert::X509CertificatePath* __pAuthorCertPath; + Tizen::Security::Cert::X509CertificatePath* __pDistributorCertPath; RootCertificateType __rootCertType; int __packageNameType; app2ext_handle* __pApp2ExtHandle; - Osp::App::_PackageInfoImpl* __pPackageInfoImpl; + Tizen::App::_PackageInfoImpl* __pPackageInfoImpl; }; // InstallationContext class LiveboxInfo - : public Osp::Base::Object + : public Tizen::Base::Object { public: LiveboxInfo(void); @@ -194,59 +194,59 @@ public: result SetUpdatePeriod(long long period); long long GetUpdatePeriod(void) const; - result SetPopupEnabled(const Osp::Base::String& value); - const Osp::Base::String& GetPopupEnabled(void) const; + result SetPopupEnabled(const Tizen::Base::String& value); + const Tizen::Base::String& GetPopupEnabled(void) const; - result SetIcon(const Osp::Base::String& icon); - const Osp::Base::String& GetIcon(void) const; + result SetIcon(const Tizen::Base::String& icon); + const Tizen::Base::String& GetIcon(void) const; - result SetName(const Osp::Base::String& name); - const Osp::Base::String& GetName(void) const; + result SetName(const Tizen::Base::String& name); + const Tizen::Base::String& GetName(void) const; - result AddName(const Osp::Base::String& language, const Osp::Base::String& name); - Osp::Base::Collection::HashMap* GetNameList(void) const; + result AddName(const Tizen::Base::String& language, const Tizen::Base::String& name); + Tizen::Base::Collection::HashMap* GetNameList(void) const; - result AddSize(const Osp::Base::String& size); - Osp::Base::Collection::ArrayList* GetSizeList(void) const; + result AddSize(const Tizen::Base::String& size); + Tizen::Base::Collection::ArrayList* GetSizeList(void) const; private: LiveboxInfo(const LiveboxInfo& value); LiveboxInfo& operator =(const LiveboxInfo& source); long long __updatePeriod; - Osp::Base::String __popupEnabled; - Osp::Base::String __icon; - Osp::Base::String __name; + Tizen::Base::String __popupEnabled; + Tizen::Base::String __icon; + Tizen::Base::String __name; - Osp::Base::Collection::HashMap* __pNameList; - Osp::Base::Collection::ArrayList* __pSizeList; + Tizen::Base::Collection::HashMap* __pNameList; + Tizen::Base::Collection::ArrayList* __pSizeList; }; // LiveboxInfo class ContentInfo - : public Osp::Base::Object + : public Tizen::Base::Object { public: ContentInfo(void); virtual ~ContentInfo(void); - result SetContentId(const Osp::Base::String& contentId); - const Osp::Base::String& GetContentId(void) const; + result SetContentId(const Tizen::Base::String& contentId); + const Tizen::Base::String& GetContentId(void) const; - result SetIcon(const Osp::Base::String& icon); - const Osp::Base::String& GetIcon(void) const; + result SetIcon(const Tizen::Base::String& icon); + const Tizen::Base::String& GetIcon(void) const; - result AddName(const Osp::Base::String& language, const Osp::Base::String& name); - Osp::Base::Collection::HashMap* GetNameList(void) const; + result AddName(const Tizen::Base::String& language, const Tizen::Base::String& name); + Tizen::Base::Collection::HashMap* GetNameList(void) const; private: ContentInfo(const ContentInfo& value); ContentInfo& operator =(const ContentInfo& source); - Osp::Base::String __icon; - Osp::Base::String __contentId; + Tizen::Base::String __icon; + Tizen::Base::String __contentId; - Osp::Base::Collection::HashMap* __pNameList; + Tizen::Base::Collection::HashMap* __pNameList; }; // ContentInfo diff --git a/src/Installer/DirectoryInstaller.cpp b/src/Installer/DirectoryInstaller.cpp index 6f45d4f..0184b87 100755..100644 --- a/src/Installer/DirectoryInstaller.cpp +++ b/src/Installer/DirectoryInstaller.cpp @@ -27,9 +27,9 @@ #include "DirectoryInstaller.h" #include "InstallerUtil.h" -using namespace Osp::App; -using namespace Osp::Base; -using namespace Osp::Io; +using namespace Tizen::App; +using namespace Tizen::Base; +using namespace Tizen::Io; DirectoryInstaller::DirectoryInstaller(void) { diff --git a/src/Installer/Installer.cpp b/src/Installer/Installer.cpp index 9790b29..74a25b1 100755..100644 --- a/src/Installer/Installer.cpp +++ b/src/Installer/Installer.cpp @@ -32,10 +32,10 @@ #include "ConfigurationManager.h" #include "InstallerUtil.h" -using namespace Osp::Base; -using namespace Osp::Base::Collection; -using namespace Osp::App; -using namespace Osp::Io; +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::App; +using namespace Tizen::Io; Installer::Installer(void) :__pContext(null) diff --git a/src/Installer/PackageInstaller.cpp b/src/Installer/PackageInstaller.cpp index fbad41f..54317c1 100755..100644 --- a/src/Installer/PackageInstaller.cpp +++ b/src/Installer/PackageInstaller.cpp @@ -24,7 +24,7 @@ #include "InstallerDefs.h" #include "PackageInstaller.h" -using namespace Osp::Io; +using namespace Tizen::Io; PackageInstaller::PackageInstaller(void) { diff --git a/src/Installer/PreloadedInstaller.cpp b/src/Installer/PreloadedInstaller.cpp index 4453894..dc83311 100755..100644 --- a/src/Installer/PreloadedInstaller.cpp +++ b/src/Installer/PreloadedInstaller.cpp @@ -25,8 +25,8 @@ #include "PreloadedInstaller.h" #include "InstallerUtil.h" -using namespace Osp::Base; -using namespace Osp::Io; +using namespace Tizen::Base; +using namespace Tizen::Io; PreloadedInstaller::PreloadedInstaller(void) { diff --git a/src/Manager/ConfigurationManager.cpp b/src/Manager/ConfigurationManager.cpp index 494834a..9b88a1b 100755..100644 --- a/src/Manager/ConfigurationManager.cpp +++ b/src/Manager/ConfigurationManager.cpp @@ -40,12 +40,12 @@ #include "ManifestGenerator.h" #include "InstallerUtil.h" -using namespace Osp::Base; -using namespace Osp::Base::Collection; -using namespace Osp::Base::Utility; -using namespace Osp::Security::Cert; -using namespace Osp::App; -using namespace Osp::Io; +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::Base::Utility; +using namespace Tizen::Security::Cert; +using namespace Tizen::App; +using namespace Tizen::Io; ConfigurationManager::ConfigurationManager(void) { diff --git a/src/Manager/ConfigurationManager.h b/src/Manager/ConfigurationManager.h index cac1b7d..da6ed44 100755..100644 --- a/src/Manager/ConfigurationManager.h +++ b/src/Manager/ConfigurationManager.h @@ -54,11 +54,11 @@ public: private: bool CreateSystemXmlFile(InstallationContext* pContext); bool CreateHybridServiceDesktopFile(InstallationContext* pContext); - bool CreateInfoFile(const Osp::Base::String& filePath, const Osp::Base::String* pContext); - bool CreateImeSymlink(const Osp::Base::String& binaryPath, const Osp::Base::String& packageName); - bool FindPrivilege(InstallationContext* pContext, const Osp::Base::String& privilege) const; - bool SetCertHashValue(void* pHandle, Osp::Security::Cert::X509CertificatePath* pCertPath, int certType) const; - char* GetCertValueN(Osp::Security::Cert::ICertificate* pCert) const; + bool CreateInfoFile(const Tizen::Base::String& filePath, const Tizen::Base::String* pContext); + bool CreateImeSymlink(const Tizen::Base::String& binaryPath, const Tizen::Base::String& packageName); + bool FindPrivilege(InstallationContext* pContext, const Tizen::Base::String& privilege) const; + bool SetCertHashValue(void* pHandle, Tizen::Security::Cert::X509CertificatePath* pCertPath, int certType) const; + char* GetCertValueN(Tizen::Security::Cert::ICertificate* pCert) const; }; // ConfigurationManager diff --git a/src/Manager/InstallerManager.cpp b/src/Manager/InstallerManager.cpp index 9f53bcf..7a14a11 100755..100644 --- a/src/Manager/InstallerManager.cpp +++ b/src/Manager/InstallerManager.cpp @@ -33,11 +33,11 @@ #include "RestorationInstaller.h" #include "InstallerUtil.h" -using namespace Osp::Base; -using namespace Osp::Base::Utility; -using namespace Osp::Base::Collection; -using namespace Osp::Io; -using namespace Osp::App; +using namespace Tizen::Base; +using namespace Tizen::Base::Utility; +using namespace Tizen::Base::Collection; +using namespace Tizen::Io; +using namespace Tizen::App; const int BUFSIZE = 512; InstallerManager* InstallerManager::__pInstallerManager = null; @@ -361,7 +361,7 @@ CATCH: } int -InstallerManager::RequestRecursiveDirectory(const Osp::Base::String& path, int& errorType) +InstallerManager::RequestRecursiveDirectory(const Tizen::Base::String& path, int& errorType) { Directory* pDir = null; DirEnumerator* pDirEnum = null; @@ -679,8 +679,8 @@ InstallerManager::ReqeustByTest(void) { int errorType = 0; String appId; - Osp::Io::File file; - Osp::Io::FileAttributes attr; + Tizen::Io::File file; + Tizen::Io::FileAttributes attr; result r = E_SUCCESS; char readBuf[512] = {0}; diff --git a/src/Manager/InstallerManager.h b/src/Manager/InstallerManager.h index 9e4a05f..5eadd56 100755..100644 --- a/src/Manager/InstallerManager.h +++ b/src/Manager/InstallerManager.h @@ -38,16 +38,16 @@ class InstallerManager { public: InstallerManager(void); - InstallerError Construct(const Osp::Base::String& path, InstallerOperation op, RequesterType requesterType, bool hybridService = false); + InstallerError Construct(const Tizen::Base::String& path, InstallerOperation op, RequesterType requesterType, bool hybridService = false); virtual ~InstallerManager(void); static InstallerManager* GetInstance(void); void Release(void); - int Request(const Osp::Base::String& path, InstallerOperation op, RequesterType requesterType, bool hybridService = false); - int RequestRecursiveDirectory(const Osp::Base::String& path, int& errorType); + int Request(const Tizen::Base::String& path, InstallerOperation op, RequesterType requesterType, bool hybridService = false); + int RequestRecursiveDirectory(const Tizen::Base::String& path, int& errorType); - bool RemoveGarbage(const Osp::Base::String& filePath); + bool RemoveGarbage(const Tizen::Base::String& filePath); int RequestByCommand(int argc, char **argv); int ReqeustByTest(void); @@ -55,8 +55,8 @@ public: void PrintPackageInfo(const char* appId); void PrintResult(void); - const Osp::Base::String& GetAppId(void) const; - void SetAppId(const Osp::Base::String& appId); + const Tizen::Base::String& GetAppId(void) const; + void SetAppId(const Tizen::Base::String& appId); int GetErrorType(void) const; void SetErrorType(int errorType); @@ -91,7 +91,7 @@ private: InstallationContext* __pContext; Installer* __pInstaller; - Osp::Base::String __appId; + Tizen::Base::String __appId; int __errorType; InstallerOperation __operation; diff --git a/src/Manager/PermissionManager.cpp b/src/Manager/PermissionManager.cpp index b3fd74a..68fbbdb 100755..100644 --- a/src/Manager/PermissionManager.cpp +++ b/src/Manager/PermissionManager.cpp @@ -35,11 +35,11 @@ #include "PermissionManager.h" #include "InstallerUtil.h" -using namespace Osp::Base; -using namespace Osp::Base::Collection; -using namespace Osp::Base::Utility; -using namespace Osp::Io; -using namespace Osp::App; +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::Base::Utility; +using namespace Tizen::Io; +using namespace Tizen::App; PermissionManager::PermissionManager(void) { @@ -121,17 +121,17 @@ PermissionManager::SetDirectory(InstallationContext* pContext) String apiVersion = pPackageInfoImpl->GetAppApiVersion(); 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()); + AppLogTag(OSP_INSTALLER, "[Tizen::Io] # path = [%ls]", appRootPath.GetPointer()); + AppLogTag(OSP_INSTALLER, "[Tizen::Io] # appId = [%ls]", appId.GetPointer()); + AppLogTag(OSP_INSTALLER, "[Tizen::Io] # apiVersion = [%ls]", apiVersion.GetPointer()); if (apiVersion.CompareTo(L"3.0") < 0) { - AppLogTag(OSP_INSTALLER, "[Osp::Io] apiVersion <= 2.0"); + AppLogTag(OSP_INSTALLER, "[Tizen::Io] apiVersion <= 2.0"); if (_FileImpl::PrepareDataCaging(appRootPath, appId) == false) { - AppLogTag(OSP_INSTALLER, "[Osp::Io] _FileImpl::PrepareDataCaging() failed"); + AppLogTag(OSP_INSTALLER, "[Tizen::Io] _FileImpl::PrepareDataCaging() failed"); return false; } @@ -139,11 +139,11 @@ PermissionManager::SetDirectory(InstallationContext* pContext) } else { - AppLogTag(OSP_INSTALLER, "[Osp::Io] apiVersion >= 3.0"); + AppLogTag(OSP_INSTALLER, "[Tizen::Io] apiVersion >= 3.0"); if (_FileImpl::CreateOspApplicationDirectories(appRootPath, appId) == false) { - AppLogTag(OSP_INSTALLER, "[Osp::Io] _FileImpl::CreateOspApplicationDirectories() failed"); + AppLogTag(OSP_INSTALLER, "[Tizen::Io] _FileImpl::CreateOspApplicationDirectories() failed"); return false; } } @@ -187,7 +187,7 @@ PermissionManager::SetFile(InstallationContext* pContext) } bool -PermissionManager::CreateSystemDirectory(InstallationContext* pContext, const Osp::Base::String& rootpath) +PermissionManager::CreateSystemDirectory(InstallationContext* pContext, const Tizen::Base::String& rootpath) { _PackageInfoImpl *pPackageInfoImpl = null; _PackageAppInfoImpl* pAppInfoImpl = null; diff --git a/src/Manager/PermissionManager.h b/src/Manager/PermissionManager.h index 2b0fc70..379493d 100755..100644 --- a/src/Manager/PermissionManager.h +++ b/src/Manager/PermissionManager.h @@ -43,7 +43,7 @@ public: static bool SetFile(InstallationContext* pContext); private: - static bool CreateSystemDirectory(InstallationContext* pContext, const Osp::Base::String& rootpath); + static bool CreateSystemDirectory(InstallationContext* pContext, const Tizen::Base::String& rootpath); static bool SetSymLink(InstallationContext* pContext); static bool PrepareDataCaging(InstallationContext* pContext); diff --git a/src/Manager/SignatureManager.cpp b/src/Manager/SignatureManager.cpp index 4545971..2a43186 100755..100644 --- a/src/Manager/SignatureManager.cpp +++ b/src/Manager/SignatureManager.cpp @@ -23,10 +23,10 @@ #include "SignatureManager.h" -using namespace Osp::Base; -using namespace Osp::Security::Cert; -using namespace Osp::Base::Collection; -using namespace Osp::Base::Utility; +using namespace Tizen::Base; +using namespace Tizen::Security::Cert; +using namespace Tizen::Base::Collection; +using namespace Tizen::Base::Utility; SignatureManager::SignatureManager(void) :__pContext(null) @@ -204,7 +204,7 @@ SignatureManager::AddCertificate(X509CertificatePath* pCertPath, IList* pCertCha for (int i = 0; i < pCertChain->GetCount(); i++) { - Osp::Base::ByteBuffer* pByteBuffer = dynamic_cast <ByteBuffer*>(pCertChain->GetAt(i)); + Tizen::Base::ByteBuffer* pByteBuffer = dynamic_cast <ByteBuffer*>(pCertChain->GetAt(i)); if (pByteBuffer) { diff --git a/src/Manager/SignatureManager.h b/src/Manager/SignatureManager.h index 4321040..70fc7c7 100755..100644 --- a/src/Manager/SignatureManager.h +++ b/src/Manager/SignatureManager.h @@ -53,17 +53,17 @@ private: SignatureManager(const SignatureManager& value); SignatureManager& operator =(const SignatureManager& source); - bool Validate(Osp::Security::Cert::X509CertificatePath* pCertPath); - bool AddCertificate(Osp::Security::Cert::X509CertificatePath* pCertPath, Osp::Base::Collection::IList* pCertChain); - bool AddDistributorRootCert(Osp::Security::Cert::X509CertificatePath* pCertPath); - bool AddAuthorRootCert(Osp::Security::Cert::X509CertificatePath* pCertPath); + bool Validate(Tizen::Security::Cert::X509CertificatePath* pCertPath); + bool AddCertificate(Tizen::Security::Cert::X509CertificatePath* pCertPath, Tizen::Base::Collection::IList* pCertChain); + bool AddDistributorRootCert(Tizen::Security::Cert::X509CertificatePath* pCertPath); + bool AddAuthorRootCert(Tizen::Security::Cert::X509CertificatePath* pCertPath); private: InstallationContext* __pContext; SignatureHandler* __pAuthorSignature; SignatureHandler* __pDistributorSignature; - Osp::Security::Cert::X509CertificatePath* __pAuthorCertPath; - Osp::Security::Cert::X509CertificatePath* __pDistributorCertPath; + Tizen::Security::Cert::X509CertificatePath* __pAuthorCertPath; + Tizen::Security::Cert::X509CertificatePath* __pDistributorCertPath; }; // SignatureManager diff --git a/src/Step/ManifestXmlStep.cpp b/src/Step/ManifestXmlStep.cpp index ba37087..e5f11b7 100755..100644 --- a/src/Step/ManifestXmlStep.cpp +++ b/src/Step/ManifestXmlStep.cpp @@ -30,9 +30,9 @@ #include "ManifestHandler.h" #include "ManifestXmlStep.h" -using namespace Osp::Base; -using namespace Osp::App; -using namespace Osp::Io; +using namespace Tizen::Base; +using namespace Tizen::App; +using namespace Tizen::Io; ManifestXmlStep::ManifestXmlStep(void) :__state(STATE_MANIFEST_XML) diff --git a/src/Step/PackageCheckStep.cpp b/src/Step/PackageCheckStep.cpp index 49a77d5..1c79748 100755..100644 --- a/src/Step/PackageCheckStep.cpp +++ b/src/Step/PackageCheckStep.cpp @@ -26,9 +26,9 @@ #include "PackageCheckStep.h" #include "InstallerUtil.h" -using namespace Osp::Base; -using namespace Osp::Base::Utility; -using namespace Osp::Io; +using namespace Tizen::Base; +using namespace Tizen::Base::Utility; +using namespace Tizen::Io; PackageCheckStep::PackageCheckStep(void) :__state(STATE_PACKAGE_CHECK) diff --git a/src/Step/SignatureStep.cpp b/src/Step/SignatureStep.cpp index cbe1df6..da69dfe 100755..100644 --- a/src/Step/SignatureStep.cpp +++ b/src/Step/SignatureStep.cpp @@ -28,10 +28,10 @@ #include "SignatureHandler.h" #include "SignatureStep.h" -using namespace Osp::App; -using namespace Osp::Base; -using namespace Osp::Base::Collection; -using namespace Osp::Io; +using namespace Tizen::App; +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::Io; SignatureStep::SignatureStep(void) :__state(STATE_SIGNER_CERT) diff --git a/src/Step/UninstallStep.cpp b/src/Step/UninstallStep.cpp index ca55db7..cef930b 100755..100644 --- a/src/Step/UninstallStep.cpp +++ b/src/Step/UninstallStep.cpp @@ -32,10 +32,10 @@ #include "UninstallStep.h" #include "InstallerUtil.h" -using namespace Osp::Base; -using namespace Osp::Base::Collection; -using namespace Osp::App; -using namespace Osp::Io; +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::App; +using namespace Tizen::Io; UninstallStep::UninstallStep(void) :__state(STATE_GET_PACKAGEINFO) diff --git a/src/Step/UnpackStep.cpp b/src/Step/UnpackStep.cpp index e9ea41a..c4d065c 100755..100644 --- a/src/Step/UnpackStep.cpp +++ b/src/Step/UnpackStep.cpp @@ -32,11 +32,11 @@ #include "UnpackStep.h" #include "InstallerUtil.h" -using namespace Osp::Base; -using namespace Osp::Base::Collection; -using namespace Osp::Base::Utility; -using namespace Osp::App; -using namespace Osp::Io; +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::Base::Utility; +using namespace Tizen::App; +using namespace Tizen::Io; UnpackStep::UnpackStep(void) :__state(STATE_UNZIP) diff --git a/src/Step/UnpackStep.h b/src/Step/UnpackStep.h index c4209cc..db7feff 100755..100644 --- a/src/Step/UnpackStep.h +++ b/src/Step/UnpackStep.h @@ -64,8 +64,8 @@ private: InstallerError OnStateDone(void); bool CreateDefaultDir(void); - bool GetUncompressedInfo(const Osp::Base::Utility::FileUnzipper& unzipper); - bool AddDirectory(const Osp::Base::String& directory); + bool GetUncompressedInfo(const Tizen::Base::Utility::FileUnzipper& unzipper); + bool AddDirectory(const Tizen::Base::String& directory); private: int __state; diff --git a/src/Util/InstallerUtil.cpp b/src/Util/InstallerUtil.cpp index 6b47f51..4f17f8b 100755..100644 --- a/src/Util/InstallerUtil.cpp +++ b/src/Util/InstallerUtil.cpp @@ -35,10 +35,10 @@ #include <drm-oem-intel.h> -using namespace Osp::Base; -using namespace Osp::Base::Collection; -using namespace Osp::App; -using namespace Osp::Io; +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::App; +using namespace Tizen::Io; InstallerUtil::InstallerUtil(void) { @@ -49,7 +49,7 @@ InstallerUtil::~InstallerUtil(void) } bool -InstallerUtil::Remove(const Osp::Base::String& filePath) +InstallerUtil::Remove(const Tizen::Base::String& filePath) { int err = -1; result r = E_SUCCESS; @@ -181,7 +181,7 @@ InstallerUtil::CopyDirectory(const String& srcFilePath, const String& destFilePa } bool -InstallerUtil::IsSymlink(const Osp::Base::String& filePath) +InstallerUtil::IsSymlink(const Tizen::Base::String& filePath) { int err = -1; struct stat fileinfo; @@ -332,7 +332,7 @@ InstallerUtil::ChangeDirectoryPermission(const String& filePath, int mode) } bool -InstallerUtil::IsDrmFile(const Osp::Base::String& path) +InstallerUtil::IsDrmFile(const Tizen::Base::String& path) { bool res = true; char* pFilePath = null; @@ -359,7 +359,7 @@ InstallerUtil::IsDrmFile(const Osp::Base::String& path) } bool -InstallerUtil::DecryptPackage(const Osp::Base::String& packagePath) +InstallerUtil::DecryptPackage(const Tizen::Base::String& packagePath) { bool res = true; char* pFilePath = null; diff --git a/src/Util/InstallerUtil.h b/src/Util/InstallerUtil.h index a83a7b8..c7c04c9 100755..100644 --- a/src/Util/InstallerUtil.h +++ b/src/Util/InstallerUtil.h @@ -23,7 +23,7 @@ #ifndef _INSTALLER_UTIL_H_ #define _INSTALLER_UTIL_H_ -namespace Osp { namespace Base +namespace Tizen { namespace Base { class String; }} @@ -42,24 +42,24 @@ public: InstallerUtil(void); virtual ~InstallerUtil(void); - static bool Remove(const Osp::Base::String& filePath); - static bool Copy(const Osp::Base::String& srcFilePath, const Osp::Base::String& destFilePath); - static bool CopyDirectory(const Osp::Base::String& srcFilePath, const Osp::Base::String& destFilePath); - static bool IsSymlink(const Osp::Base::String& filePath); - static bool GetRealPath(const Osp::Base::String& filePath, Osp::Base::String& realPath); + static bool Remove(const Tizen::Base::String& filePath); + static bool Copy(const Tizen::Base::String& srcFilePath, const Tizen::Base::String& destFilePath); + static bool CopyDirectory(const Tizen::Base::String& srcFilePath, const Tizen::Base::String& destFilePath); + static bool IsSymlink(const Tizen::Base::String& filePath); + static bool GetRealPath(const Tizen::Base::String& filePath, Tizen::Base::String& realPath); - static bool CreateSymlink(const Osp::Base::String& oldPath, const Osp::Base::String& newPath); - static bool ChangeMode(const Osp::Base::String& filePath, int mode); - static bool ChangeOwner(const Osp::Base::String& filePath); - static bool ChangeDirectoryPermission(const Osp::Base::String& filePath, int mode); + static bool CreateSymlink(const Tizen::Base::String& oldPath, const Tizen::Base::String& newPath); + static bool ChangeMode(const Tizen::Base::String& filePath, int mode); + static bool ChangeOwner(const Tizen::Base::String& filePath); + static bool ChangeDirectoryPermission(const Tizen::Base::String& filePath, int mode); - static bool IsDrmFile(const Osp::Base::String& path); - static bool DecryptPackage(const Osp::Base::String& packagePath); + static bool IsDrmFile(const Tizen::Base::String& path); + static bool DecryptPackage(const Tizen::Base::String& packagePath); - static Osp::Base::String GetCategory(int categoryType); + static Tizen::Base::String GetCategory(int categoryType); static CategoryType GetCategoryType(char* pCategory); - static bool CreateSymlinkForAppDirectory(const Osp::Base::String& inPath, Osp::Base::String& outPath); + static bool CreateSymlinkForAppDirectory(const Tizen::Base::String& inPath, Tizen::Base::String& outPath); static bool DumpLog(const char* pBuf); diff --git a/src/XmlHandler/ManifestGenerator.cpp b/src/XmlHandler/ManifestGenerator.cpp index 8975555..0c8a22a 100755..100644 --- a/src/XmlHandler/ManifestGenerator.cpp +++ b/src/XmlHandler/ManifestGenerator.cpp @@ -26,10 +26,10 @@ #include "ManifestGenerator.h" #include "InstallerUtil.h" -using namespace Osp::Base; -using namespace Osp::Base::Collection; -using namespace Osp::App; -using namespace Osp::Locales; +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::App; +using namespace Tizen::Locales; ManifestGenerator::ManifestGenerator(void) :__pContext(null) diff --git a/src/XmlHandler/ManifestGenerator.h b/src/XmlHandler/ManifestGenerator.h index 0bcb8d1..dfeb9ea 100755..100644 --- a/src/XmlHandler/ManifestGenerator.h +++ b/src/XmlHandler/ManifestGenerator.h @@ -50,15 +50,15 @@ private: ManifestGenerator(const ManifestGenerator& value); ManifestGenerator& operator =(const ManifestGenerator& source); - bool FindFeatureValue(Osp::Base::Collection::ArrayList* pFeatureList, const Osp::Base::String& feature, const Osp::Base::String& value) const; - bool WriteLanguageValue(Osp::Base::Collection::IMap* pList, const Osp::Base::String& label) const; - bool WriteLiveboxes(Osp::App::_PackageAppInfoImpl* pAppInfoImpl) const; - bool WriteAppControl(Osp::App::_PackageAppInfoImpl* pAppInfoImpl) const; - Osp::Base::String GetGlFrameValue(Osp::Base::Collection::ArrayList* pFeatureList) const; + bool FindFeatureValue(Tizen::Base::Collection::ArrayList* pFeatureList, const Tizen::Base::String& feature, const Tizen::Base::String& value) const; + bool WriteLanguageValue(Tizen::Base::Collection::IMap* pList, const Tizen::Base::String& label) const; + bool WriteLiveboxes(Tizen::App::_PackageAppInfoImpl* pAppInfoImpl) const; + bool WriteAppControl(Tizen::App::_PackageAppInfoImpl* pAppInfoImpl) const; + Tizen::Base::String GetGlFrameValue(Tizen::Base::Collection::ArrayList* pFeatureList) const; private: InstallationContext* __pContext; - Osp::App::_PackageInfoImpl* __pPackageInfoImpl; + Tizen::App::_PackageInfoImpl* __pPackageInfoImpl; XmlWriter* __pWriter; }; // ManifestGenerator diff --git a/src/XmlHandler/ManifestHandler.cpp b/src/XmlHandler/ManifestHandler.cpp index 02e8bc9..b77c8d7 100755..100644 --- a/src/XmlHandler/ManifestHandler.cpp +++ b/src/XmlHandler/ManifestHandler.cpp @@ -29,12 +29,12 @@ #include "InstallerUtil.h" -using namespace Osp::Base; -using namespace Osp::Base::Collection; -using namespace Osp::Base::Utility; -using namespace Osp::App; -using namespace Osp::Io; -using namespace Osp::System; +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::Base::Utility; +using namespace Tizen::App; +using namespace Tizen::Io; +using namespace Tizen::System; ManifestHandler::ManifestHandler(void) :__pContext(null) @@ -1299,7 +1299,7 @@ bool ManifestHandler::FindElement(const char *pName) { bool res = false; - Osp::Base::Collection::IEnumerator* pEnum = GetElementEnumeratorN(); + Tizen::Base::Collection::IEnumerator* pEnum = GetElementEnumeratorN(); if (pEnum) { @@ -1324,7 +1324,7 @@ ManifestHandler::FindElement(const char *pName) } bool -ManifestHandler::AddAppFeature(const Osp::Base::String& name, const Osp::Base::String& value) +ManifestHandler::AddAppFeature(const Tizen::Base::String& name, const Tizen::Base::String& value) { _AppFeatureInfoImpl* pAppFeatureInfo = new _AppFeatureInfoImpl; TryReturn(pAppFeatureInfo, false, "[osp-installer] pAppFeatureInfo is null"); diff --git a/src/XmlHandler/ManifestHandler.h b/src/XmlHandler/ManifestHandler.h index 5e74553..62595f6 100755..100644 --- a/src/XmlHandler/ManifestHandler.h +++ b/src/XmlHandler/ManifestHandler.h @@ -91,22 +91,22 @@ private: bool OnServiceAppElement(void); bool FindElement(const char *pName); - bool AddAppFeature(const Osp::Base::String& name, const Osp::Base::String& value); + bool AddAppFeature(const Tizen::Base::String& name, const Tizen::Base::String& value); private: InstallationContext* __pContext; - Osp::Base::Collection::ArrayList* __pPrivilegeList; - Osp::Base::Collection::ArrayList* __pLiveBoxList; - Osp::Base::Collection::ArrayList* __pContentInfoList; - Osp::App::_PackageInfoImpl* __pPackageInfoImpl; - Osp::App::_PackageAppInfoImpl* __pPackageAppInfoImpl; - Osp::App::_AppControlInfoImpl* __pAppControlInfoImpl; - Osp::App::_AppControlCapabilityInfoImpl* __pAppControlCapabilityInfoImpl; - Osp::App::_AppControlResolutionInfoImpl* __pAppControlResolutionInfoImpl; - Osp::App::_DataControlInfoImpl* __pDataControlInfoImpl; - Osp::App::_DataControlTypeImpl* __pDataControlTypeImpl; - Osp::App::_LaunchConditionInfoImpl* __pLaunchConditionImpl; - Osp::App::_NotificationInfoImpl* __pNotificationImpl; + Tizen::Base::Collection::ArrayList* __pPrivilegeList; + Tizen::Base::Collection::ArrayList* __pLiveBoxList; + Tizen::Base::Collection::ArrayList* __pContentInfoList; + Tizen::App::_PackageInfoImpl* __pPackageInfoImpl; + Tizen::App::_PackageAppInfoImpl* __pPackageAppInfoImpl; + Tizen::App::_AppControlInfoImpl* __pAppControlInfoImpl; + Tizen::App::_AppControlCapabilityInfoImpl* __pAppControlCapabilityInfoImpl; + Tizen::App::_AppControlResolutionInfoImpl* __pAppControlResolutionInfoImpl; + Tizen::App::_DataControlInfoImpl* __pDataControlInfoImpl; + Tizen::App::_DataControlTypeImpl* __pDataControlTypeImpl; + Tizen::App::_LaunchConditionInfoImpl* __pLaunchConditionImpl; + Tizen::App::_NotificationInfoImpl* __pNotificationImpl; LiveboxInfo* __pLiveboxInfo; ContentInfo* __pContentInfo; char* __pDefaultIconType; diff --git a/src/XmlHandler/PrivilegeHandler.cpp b/src/XmlHandler/PrivilegeHandler.cpp index bcdec8a..4437dbe 100755..100644 --- a/src/XmlHandler/PrivilegeHandler.cpp +++ b/src/XmlHandler/PrivilegeHandler.cpp @@ -32,13 +32,13 @@ #include "PrivilegeHandler.h" -using namespace Osp::App; -using namespace Osp::Base; -using namespace Osp::Base::Collection; -using namespace Osp::Base::Utility; -using namespace Osp::Security; -using namespace Osp::Security::Crypto; -using namespace Osp::Text; +using namespace Tizen::App; +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::Base::Utility; +using namespace Tizen::Security; +using namespace Tizen::Security::Crypto; +using namespace Tizen::Text; result PrivilegeHandler::GenerateCipherPrivilege(const AppId& appId, const IList& privilegeList, String& encryptedPrivileges, String& checksum) diff --git a/src/XmlHandler/PrivilegeHandler.h b/src/XmlHandler/PrivilegeHandler.h index af88ccb..90373e6 100644 --- a/src/XmlHandler/PrivilegeHandler.h +++ b/src/XmlHandler/PrivilegeHandler.h @@ -26,12 +26,12 @@ #include <FSec_AccessControlTypes.h> -namespace Osp { namespace Base { namespace Collection +namespace Tizen { namespace Base { namespace Collection { class IList; }}} -namespace Osp { namespace Base +namespace Tizen { namespace Base { class String; }} @@ -39,7 +39,7 @@ class String; /** * @class PrivilegeHandler * @brief This class represents the class of PrivilegeHandler. - * @since 3.0 + * @since 2.1 * * This class represents the class of PrivilegeHandler. * @@ -48,13 +48,13 @@ class PrivilegeHandler { public: - static result GenerateCipherPrivilege(const Osp::App::AppId& appId, const Osp::Base::Collection::IList& privilegeList, Osp::Base::String& encryptedPrivileges, Osp::Base::String& checksum); - static result GenerateCipherPrivilege(const Osp::App::AppId& appId, const Osp::Base::Collection::IList& privilegeList, int visibilityLevel, Osp::Base::String& encryptedPrivileges, Osp::Base::String& checksum); + static result GenerateCipherPrivilege(const Tizen::App::AppId& appId, const Tizen::Base::Collection::IList& privilegeList, Tizen::Base::String& encryptedPrivileges, Tizen::Base::String& checksum); + static result GenerateCipherPrivilege(const Tizen::App::AppId& appId, const Tizen::Base::Collection::IList& privilegeList, int visibilityLevel, Tizen::Base::String& encryptedPrivileges, Tizen::Base::String& checksum); private: - static byte* PackPrivilegeN(const Osp::Base::Collection::IList& privilegeList); - static result PackPrivilegeN(const Osp::Base::Collection::IList& privilegeList, int visibilityLevel, byte** ppBitwisePrivilege); - static result GetEncryptedBitwise(byte* __bitwisePrivilege, Osp::Base::String& encryptedPrivileges); - static result GetChecksum(Osp::App::AppId appId, byte* __bitwisePrivilege, Osp::Base::String& checksum); + static byte* PackPrivilegeN(const Tizen::Base::Collection::IList& privilegeList); + static result PackPrivilegeN(const Tizen::Base::Collection::IList& privilegeList, int visibilityLevel, byte** ppBitwisePrivilege); + static result GetEncryptedBitwise(byte* __bitwisePrivilege, Tizen::Base::String& encryptedPrivileges); + static result GetChecksum(Tizen::App::AppId appId, byte* __bitwisePrivilege, Tizen::Base::String& checksum); }; // PrivilegeHandler diff --git a/src/XmlHandler/SignatureHandler.cpp b/src/XmlHandler/SignatureHandler.cpp index 0b60282..9aa8434 100755..100644 --- a/src/XmlHandler/SignatureHandler.cpp +++ b/src/XmlHandler/SignatureHandler.cpp @@ -21,8 +21,8 @@ #include "SignatureHandler.h" -using namespace Osp::Base; -using namespace Osp::Base::Collection; +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; SignatureHandler::SignatureHandler(void) :__pContext(null) diff --git a/src/XmlHandler/SignatureHandler.h b/src/XmlHandler/SignatureHandler.h index fb52a1b..6078fba 100755..100644 --- a/src/XmlHandler/SignatureHandler.h +++ b/src/XmlHandler/SignatureHandler.h @@ -44,8 +44,8 @@ public: bool Construct(InstallationContext *pConext); bool Parse(const char *pFilepath); - Osp::Base::Collection::ArrayList* GetAuthorCertChain(void); - Osp::Base::Collection::ArrayList* GetDistributorCertChain(void); + Tizen::Base::Collection::ArrayList* GetAuthorCertChain(void); + Tizen::Base::Collection::ArrayList* GetDistributorCertChain(void); private: SignatureHandler(const SignatureHandler& value); @@ -61,8 +61,8 @@ private: private: InstallationContext* __pContext; - Osp::Base::Collection::ArrayList* __pAuthorCertChain; - Osp::Base::Collection::ArrayList* __pDistributorCertChain; + Tizen::Base::Collection::ArrayList* __pAuthorCertChain; + Tizen::Base::Collection::ArrayList* __pDistributorCertChain; bool __isAuthorSignature; bool __isDistributorSignature; diff --git a/src/XmlHandler/XmlHandler.cpp b/src/XmlHandler/XmlHandler.cpp index c2fa904..5654c4c 100755..100644 --- a/src/XmlHandler/XmlHandler.cpp +++ b/src/XmlHandler/XmlHandler.cpp @@ -31,9 +31,9 @@ #include "InstallerDefs.h" #include "XmlHandler.h" -using namespace Osp::Base; -using namespace Osp::Base::Collection; -using namespace Osp::Io; +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::Io; XmlHandler::XmlHandler(void) :__pAttr(null) diff --git a/src/XmlHandler/XmlHandler.h b/src/XmlHandler/XmlHandler.h index c1227e2..57ddba5 100755..100644 --- a/src/XmlHandler/XmlHandler.h +++ b/src/XmlHandler/XmlHandler.h @@ -29,7 +29,7 @@ #include "XmlAttribute.h" -namespace Osp { namespace Base { namespace Collection +namespace Tizen { namespace Base { namespace Collection { class IEnumerator; }}} @@ -77,7 +77,7 @@ protected: XmlAttribute* GetAttribute(void); void DeleteAttribute(void); - Osp::Base::Collection::IEnumerator* GetElementEnumeratorN(void); + Tizen::Base::Collection::IEnumerator* GetElementEnumeratorN(void); int GetElementCount(void); private: @@ -92,7 +92,7 @@ private: XmlAttribute* __pAttr; char* __pElementName; - Osp::Base::Collection::Stack __elementStack; + Tizen::Base::Collection::Stack __elementStack; bool __error; diff --git a/src/XmlHandler/XmlWriter.cpp b/src/XmlHandler/XmlWriter.cpp index 86e39d5..2d6459f 100755..100644 --- a/src/XmlHandler/XmlWriter.cpp +++ b/src/XmlHandler/XmlWriter.cpp @@ -33,10 +33,10 @@ #include "XmlWriter.h" #include "InstallerUtil.h" -using namespace Osp::Base; -using namespace Osp::Base::Collection; -using namespace Osp::Base::Utility; -using namespace Osp::Io; +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::Base::Utility; +using namespace Tizen::Io; XmlWriter::XmlWriter(void) :__pXmlWriter(null), __pXmlBuffer(null) @@ -82,7 +82,7 @@ XmlWriter::~XmlWriter(void) } bool -XmlWriter::Construct(const Osp::Base::String& filepath) +XmlWriter::Construct(const Tizen::Base::String& filepath) { bool res = false; int err = 0; @@ -119,7 +119,7 @@ CATCH: } bool -XmlWriter::StartElement(const Osp::Base::String& name) +XmlWriter::StartElement(const Tizen::Base::String& name) { ByteBuffer* pNameBuf = null; @@ -134,7 +134,7 @@ XmlWriter::StartElement(const Osp::Base::String& name) } bool -XmlWriter::WriteAttribute(const Osp::Base::String& name, const Osp::Base::String& content) +XmlWriter::WriteAttribute(const Tizen::Base::String& name, const Tizen::Base::String& content) { ByteBuffer* pNameBuf = null; ByteBuffer* pContentBuf = null; @@ -153,7 +153,7 @@ XmlWriter::WriteAttribute(const Osp::Base::String& name, const Osp::Base::String } bool -XmlWriter::WriteString(const Osp::Base::String& content) +XmlWriter::WriteString(const Tizen::Base::String& content) { ByteBuffer* pContentBuf = null; diff --git a/src/XmlHandler/XmlWriter.h b/src/XmlHandler/XmlWriter.h index 677dbf6..5754ffe 100755..100644 --- a/src/XmlHandler/XmlWriter.h +++ b/src/XmlHandler/XmlWriter.h @@ -41,11 +41,11 @@ class XmlWriter public: XmlWriter(void); virtual ~XmlWriter(void); - bool Construct(const Osp::Base::String& filepath); + bool Construct(const Tizen::Base::String& filepath); - bool StartElement(const Osp::Base::String& name); - bool WriteAttribute(const Osp::Base::String& name, const Osp::Base::String& content); - bool WriteString(const Osp::Base::String& content); + bool StartElement(const Tizen::Base::String& name); + bool WriteAttribute(const Tizen::Base::String& name, const Tizen::Base::String& content); + bool WriteString(const Tizen::Base::String& content); bool EndElement(void); private: @@ -55,7 +55,7 @@ private: // bool __error; xmlTextWriterPtr __pXmlWriter; xmlBufferPtr __pXmlBuffer; - Osp::Base::String __xmlFilePath; + Tizen::Base::String __xmlFilePath; }; // XmlWriter diff --git a/src/backend/backend.cpp b/src/backend/backend.cpp index 597e5de..1f6e72d 100755..100644 --- a/src/backend/backend.cpp +++ b/src/backend/backend.cpp @@ -33,7 +33,7 @@ #include "InstallerDefs.h" #include "InstallerUtil.h" -using namespace Osp::Base; +using namespace Tizen::Base; extern "C" void Osp_Initialize(); static bool __osp_installer_report_result(const String& appId, int errorType); |