# HG changeset patch # User hgs # Date 1270825661 -19800 # Node ID 1fa9b890f29c2c2cecf7174f0a64148c03adc53a # Parent 7ae31d8de4bc0e6e27b6c9d71e9b14203ebcce10 201009 diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/group/bld.inf --- a/imservices/group/bld.inf Fri Apr 09 20:09:00 2010 +0530 +++ b/imservices/group/bld.inf Fri Apr 09 20:37:41 2010 +0530 @@ -30,7 +30,6 @@ #include "../searchfeatureplugin/group/bld.inf" #include "../xmppsettingsapi/group/bld.inf" #include "../xmppsettingsfetcher/group/bld.inf" -#include "../ossprotocoladaptation/group/bld.inf" #include "../instantmessagingcache/group/bld.inf" PRJ_TESTMMPFILES diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/imfeatureplugin/srcutils/imlogutils.cpp --- a/imservices/imfeatureplugin/srcutils/imlogutils.cpp Fri Apr 09 20:09:00 2010 +0530 +++ b/imservices/imfeatureplugin/srcutils/imlogutils.cpp Fri Apr 09 20:37:41 2010 +0530 @@ -27,12 +27,14 @@ void XImLogger::Log(TRefByValue aFmt,...) { +#ifdef _DEBUG VA_LIST list; VA_START(list, aFmt); // Print to log file TBuf buf; buf.FormatList(aFmt, list); RFileLogger::Write(KImLogDir, KImLogFile, EFileLoggingModeAppend, buf); +#endif } // End of File diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/instantmessagingcache/imcacheclient/src/cimcacheaccesseventhandler.cpp --- a/imservices/instantmessagingcache/imcacheclient/src/cimcacheaccesseventhandler.cpp Fri Apr 09 20:09:00 2010 +0530 +++ b/imservices/instantmessagingcache/imcacheclient/src/cimcacheaccesseventhandler.cpp Fri Apr 09 20:37:41 2010 +0530 @@ -120,11 +120,20 @@ break; } case EIMOperationUnRegistered: - { - TRACE( T_LIT("CIMCacheEventHandler::RunL() EIMOperationUnRegistered") ); - iContinueObserving = EFalse; - break; - } + { + TRACE(T_LIT( + "CIMCacheEventHandler::RunL() EIMOperationUnRegistered")); + iContinueObserving = EFalse; + break; + } + case KErrServerTerminated: + { + // This case handles when the server terminated status is set. + // This is scenario is typically scene when imcache server is uninstalled. + UnRegisterObserver(); + DoCancel(); + break; + } default : { TRACE( T_LIT("CIMCacheEventHandler::RunL() default") ); diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp --- a/imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp Fri Apr 09 20:09:00 2010 +0530 +++ b/imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp Fri Apr 09 20:37:41 2010 +0530 @@ -135,6 +135,16 @@ iContinueObserving = EFalse; break; } + case KErrServerTerminated: + { + // This case handles when the server terminated status is set. + // This is scenario is typically scene when imcache server is uninstalled. + + UnRegisterObserver(); + DoCancel(); + break; + } + default : { TRACE( T_LIT("CIMCacheEventHandler::RunL() default") ); diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/instantmessagingcache/imcacheserver/group/imcacheserver.mmp --- a/imservices/instantmessagingcache/imcacheserver/group/imcacheserver.mmp Fri Apr 09 20:09:00 2010 +0530 +++ b/imservices/instantmessagingcache/imcacheserver/group/imcacheserver.mmp Fri Apr 09 20:37:41 2010 +0530 @@ -2,9 +2,9 @@ * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available -* under the terms of the License "Symbian Foundation License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available -* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* at the URL "http://www.eclipse.org/legal/epl-v10.html". * * Initial Contributors: * Nokia Corporation - initial contribution. @@ -24,7 +24,7 @@ TARGET imcacheserver.exe TARGETTYPE exe -UID 0x0 KIMCacheServerUid3 +UID KStaticInterfaceDllUid2 KIMCacheServerUid3 VENDORID VID_DEFAULT CAPABILITY CAP_SERVER TARGETPATH /system/libs diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/searchfeatureplugin/srcutils/searchlogutils.cpp --- a/imservices/searchfeatureplugin/srcutils/searchlogutils.cpp Fri Apr 09 20:09:00 2010 +0530 +++ b/imservices/searchfeatureplugin/srcutils/searchlogutils.cpp Fri Apr 09 20:37:41 2010 +0530 @@ -27,12 +27,14 @@ void XSearchLogger::Log(TRefByValue aFmt,...) { +#ifdef _DEBUG VA_LIST list; VA_START(list, aFmt); // Print to log file TBuf buf; buf.FormatList(aFmt, list); RFileLogger::Write(KImLogDir, KImLogFile, EFileLoggingModeAppend, buf); +#endif } // End of File diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/xmppsettingsapi/EABI/xmppsettingsapiu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imservices/xmppsettingsapi/EABI/xmppsettingsapiu.def Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,23 @@ +EXPORTS + _ZN16CXmppSettingsApi12RemoveParamLEmRK7TDesC16 @ 1 NONAME + _ZN16CXmppSettingsApi17GetRepositoryKeyLEmRK7TDesC16iRm @ 2 NONAME + _ZN16CXmppSettingsApi21CreateSettingsRecordLERm @ 3 NONAME + _ZN16CXmppSettingsApi21RemoveSettingsRecordLEm @ 4 NONAME + _ZN16CXmppSettingsApi22DefaultSettingsRecordLERm @ 5 NONAME + _ZN16CXmppSettingsApi25GetSettingsRecordIdArrayLER6RArrayImE @ 6 NONAME + _ZN16CXmppSettingsApi4NewLEv @ 7 NONAME + _ZN16CXmppSettingsApi5NewLCEv @ 8 NONAME + _ZN16CXmppSettingsApi9GetParamLEmRK7TDesC16R6TDes16 @ 9 NONAME + _ZN16CXmppSettingsApi9GetParamLEmRK7TDesC16Ri @ 10 NONAME + _ZN16CXmppSettingsApi9SetParamLEmRK7TDesC16S2_ @ 11 NONAME + _ZN16CXmppSettingsApi9SetParamLEmRK7TDesC16i @ 12 NONAME + _ZN16CXmppSettingsApiD0Ev @ 13 NONAME + _ZN16CXmppSettingsApiD1Ev @ 14 NONAME + _ZN16CXmppSettingsApiD2Ev @ 15 NONAME + _ZTI16CXmppSettingsApi @ 16 NONAME ; ## + _ZTI19CXmppSettingsColumn @ 17 NONAME ; ## + _ZTI19CXmppSettingsRecord @ 18 NONAME ; ## + _ZTV16CXmppSettingsApi @ 19 NONAME ; ## + _ZTV19CXmppSettingsColumn @ 20 NONAME ; ## + _ZTV19CXmppSettingsRecord @ 21 NONAME ; ## + diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/xmppsettingsapi/tsrc/Bmarm/xmppsettings_apiU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imservices/xmppsettingsapi/tsrc/Bmarm/xmppsettings_apiU.DEF Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,3 @@ +EXPORTS + LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &) + diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/xmppsettingsapi/tsrc/Bwins/xmppsettings_apiU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imservices/xmppsettingsapi/tsrc/Bwins/xmppsettings_apiU.DEF Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,3 @@ +EXPORTS + ?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &) + diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/xmppsettingsapi/tsrc/EABI/xmppsettings_apiU.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imservices/xmppsettingsapi/tsrc/EABI/xmppsettings_apiU.def Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,3 @@ +EXPORTS + _Z9LibEntryLR13CTestModuleIf @ 1 NONAME + diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/xmppsettingsapi/tsrc/group/Bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imservices/xmppsettingsapi/tsrc/group/Bld.inf Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,54 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +PRJ_PLATFORMS +// specify the platforms your component needs to be built for here +// defaults to WINS MARM so you can ignore this if you just build these + + DEFAULT + +PRJ_TESTEXPORTS +// NOTE: If using ARS requirements all export operations should be done under this. +// 'abld test export' + +PRJ_EXPORTS +// Specify the source file followed by its destination here +// copy will be used to copy the source file to its destination +// If there's no destination then the source file will be copied +// +// Example: +/* + +*/ +../init/TestFramework.ini /epoc32/winscw/c/TestFramework/TestFramework.ini +../conf/xmppsettings_api.cfg /epoc32/winscw/c/TestFramework/xmppsettings_api.cfg +PRJ_TESTMMPFILES + + xmppsettings_api.mmp + + +// Specify the .mmp files required for building the important component +// releasables. +// +// Specify "tidy" if the component you need to build doesn't need to be +// released. Specify "ignore" if the MMP file exists but should be +// ignored. +// Example: +// + + +// End of File diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt --- a/imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt Fri Apr 09 20:09:00 2010 +0530 +++ b/imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt Fri Apr 09 20:37:41 2010 +0530 @@ -2,9 +2,9 @@ # Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" +# under the terms of the License "Symbian Foundation License v1.0" # which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". # # Initial Contributors: # Nokia Corporation - initial contribution. diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/Bmarm/xmppsettingsfetchermtU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/Bmarm/xmppsettingsfetchermtU.DEF Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,4 @@ +EXPORTS + LibEntryL__Fv @ 1 NONAME R3UNUSED ; LibEntryL(void) + SetRequirements__FRP16CTestModuleParamRUl @ 2 NONAME R3UNUSED ; SetRequirements(CTestModuleParam *&, unsigned long &) + diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/Bwins/xmppsettingsfetchermtU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/Bwins/xmppsettingsfetchermtU.DEF Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,4 @@ +EXPORTS + ?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void) + ?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &) + diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/EABI/xmppsettingsfetchermtU.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/EABI/xmppsettingsfetchermtU.def Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,4 @@ +EXPORTS + _Z9LibEntryLv @ 1 NONAME + _Z15SetRequirementsRP16CTestModuleParamRm @ 2 NONAME + diff -r 7ae31d8de4bc -r 1fa9b890f29c imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/group/Bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/group/Bld.inf Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,57 @@ +/* +* Copyright (c) 2002 - 2007 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: bld.inf +* +*/ + + + +PRJ_PLATFORMS +// specify the platforms your component needs to be built for here +// defaults to WINS MARM so you can ignore this if you just build these +DEFAULT + +PRJ_TESTEXPORTS +// NOTE: If using ARS requirements all export operations should be done under this. +// 'abld test export' + +PRJ_EXPORTS +// Specify the source file followed by its destination here +// copy will be used to copy the source file to its destination +// If there's no destination then the source file will be copied +// to the same name in /epoc32/include + +../init/TestFramework.ini /epoc32/winscw/c/TestFramework/TestFramework.ini + +PRJ_TESTMMPFILES +// NOTE: If using ARS requirements .mmp file operation should be done under this. +// 'abld test build' +xmppsettingsfetchermt.mmp +PRJ_MMPFILES +// Specify the .mmp files required for building the important component +// releasables. +// +// Specify "tidy" if the component you need to build doesn't need to be +// released. Specify "ignore" if the MMP file exists but should be +// ignored. +// Example: +/* +/agnmodel/group/agnmodel.mmp +#if defined(MARM) +/agnmodel/group/agsvexe.mmp +#endif +*/ + + +// End of File \ No newline at end of file diff -r 7ae31d8de4bc -r 1fa9b890f29c imsrv_plat/ximp_core_feature_plugin_api/inc/ximpfeaturepluginIfids.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imsrv_plat/ximp_core_feature_plugin_api/inc/ximpfeaturepluginIfids.hrh Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,31 @@ +/* +* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: feature plugin if ids +* +*/ + +#ifndef XIMPFEATUREPLUGINIFIDS_HRH +#define XIMPFEATUREPLUGINIFIDS_HRH + +// datmodel +#define XIMP_ECOM_IF_UID_PROTOCOL_DATAMODEL_CODEC_INTERFACE 0x2000B5E9 + +// operations +#define XIMP_ECOM_IF_UID_OPERATIONS_INTERFACE 0x20015A0D + +//processor +#define XIMP_ECOM_IF_UID_PROTOCOL_DATA_HOST_INTERFACE 0x20015A0E + +#endif //XIMPFEATUREPLUGINIFIDS_HRH + diff -r 7ae31d8de4bc -r 1fa9b890f29c imsrv_plat/ximp_im_data_model_api/inc/imoperationfactoryimp.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imsrv_plat/ximp_im_data_model_api/inc/imoperationfactoryimp.h Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,69 @@ +/* +* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Symbian Foundation License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Im Service Connection operation factory + * +*/ + + +#ifndef IMCOPERATIONFACTORYIMP_H +#define IMCOPERATIONFACTORYIMP_H + + +#include +class CXIMPOperationBase; + +#include "ximpoperationfactory.h" + +/** + * Operation factory + * Class is owned by and handled as singleton by CXIMPGlobals. + * + * @lib imoperation.dll + * @since S60 v4.0 + */ +class CImOperationFactory : public CBase, + public MXIMPOperationFactory + { + public: // Construction and desctruction + + IMPORT_C static CImOperationFactory* NewL(); + + ~CImOperationFactory(); + + private: // Construction + + /** + * C++ default constructor. + */ + CImOperationFactory(); + + /** + * Symbian 2nd phase constructor + */ + void ConstructL(); + + + public: // From MXIMPOperationFactory + + /** + * @see MXIMPOperationFactory + */ + CXIMPOperationBase* CreateOperationL( TInt aOperation ); + + private: // Data + + }; + +#endif // IMCOPERATIONFACTORYIMP_H + diff -r 7ae31d8de4bc -r 1fa9b890f29c imsrv_plat/xmpp_settings_api/tsrc/Bmarm/xmppsettings_apiU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imsrv_plat/xmpp_settings_api/tsrc/Bmarm/xmppsettings_apiU.DEF Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,3 @@ +EXPORTS + LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &) + diff -r 7ae31d8de4bc -r 1fa9b890f29c imsrv_plat/xmpp_settings_api/tsrc/Bwins/xmppsettings_apiU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imsrv_plat/xmpp_settings_api/tsrc/Bwins/xmppsettings_apiU.DEF Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,3 @@ +EXPORTS + ?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &) + diff -r 7ae31d8de4bc -r 1fa9b890f29c imsrv_plat/xmpp_settings_api/tsrc/EABI/xmppsettings_apiU.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imsrv_plat/xmpp_settings_api/tsrc/EABI/xmppsettings_apiU.def Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,3 @@ +EXPORTS + _Z9LibEntryLR13CTestModuleIf @ 1 NONAME + diff -r 7ae31d8de4bc -r 1fa9b890f29c imsrv_plat/xmpp_settings_api/tsrc/group/Bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/imsrv_plat/xmpp_settings_api/tsrc/group/Bld.inf Fri Apr 09 20:37:41 2010 +0530 @@ -0,0 +1,54 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +PRJ_PLATFORMS +// specify the platforms your component needs to be built for here +// defaults to WINS MARM so you can ignore this if you just build these + + DEFAULT + +PRJ_TESTEXPORTS +// NOTE: If using ARS requirements all export operations should be done under this. +// 'abld test export' + +PRJ_EXPORTS +// Specify the source file followed by its destination here +// copy will be used to copy the source file to its destination +// If there's no destination then the source file will be copied +// +// Example: +/* + +*/ +../init/TestFramework.ini /epoc32/winscw/c/TestFramework/TestFramework.ini +../conf/xmppsettings_api.cfg /epoc32/winscw/c/TestFramework/xmppsettings_api.cfg +PRJ_TESTMMPFILES + + xmppsettings_api.mmp + + +// Specify the .mmp files required for building the important component +// releasables. +// +// Specify "tidy" if the component you need to build doesn't need to be +// released. Specify "ignore" if the MMP file exists but should be +// ignored. +// Example: +// + + +// End of File diff -r 7ae31d8de4bc -r 1fa9b890f29c imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt --- a/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt Fri Apr 09 20:09:00 2010 +0530 +++ b/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt Fri Apr 09 20:37:41 2010 +0530 @@ -2,9 +2,9 @@ # Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" +# under the terms of the License "Symbian Foundation License v1.0" # which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". # # Initial Contributors: # Nokia Corporation - initial contribution.