# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286970871 -10800 # Node ID 338724211739034b569db69e042af3dbc65388ce # Parent 482d5cf4c4b4814efedfa601d2d97db514c9c9d2 Revision: 201039 Kit: 201041 diff -r 482d5cf4c4b4 -r 338724211739 brandingserver/tools/sis/import_data/install.txt --- a/brandingserver/tools/sis/import_data/install.txt Tue Sep 14 21:56:37 2010 +0300 +++ b/brandingserver/tools/sis/import_data/install.txt Wed Oct 13 14:54:31 2010 +0300 @@ -1,16 +0,0 @@ -# -# 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: install.txt -# -# diff -r 482d5cf4c4b4 -r 338724211739 imservices/instantmessagingcache/tsrc/group/bld.inf --- a/imservices/instantmessagingcache/tsrc/group/bld.inf Tue Sep 14 21:56:37 2010 +0300 +++ b/imservices/instantmessagingcache/tsrc/group/bld.inf Wed Oct 13 14:54:31 2010 +0300 @@ -22,11 +22,11 @@ // defaults to WINS MARM so you can ignore this if you just build these DEFAULT -PRJ_EXPORTS +PRJ_TESTEXPORTS // NOTE: If using ARS requirements all export operations should be done under this. // 'abld test export' -PRJ_TESTEXPORTS +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 diff -r 482d5cf4c4b4 -r 338724211739 imservices/instantmessagingcache/tsrc/src/imcache_testBlocks.cpp --- a/imservices/instantmessagingcache/tsrc/src/imcache_testBlocks.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/imservices/instantmessagingcache/tsrc/src/imcache_testBlocks.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -273,7 +273,6 @@ { CIMCacheFactory* instance = CIMCacheFactory::InstanceL(); TInt error = KErrNotFound; - iMessageFetch = 0; MIMCacheUpdater* updater = instance->CreateUpdaterL(1, _L("testlm123@gmail.com") ,ETrue); // tow message appended hence counter will be two. updater->AppendReceiveMessageL( _L("testui123@gmail.com"),_L("hello this is test first message appended") ) ; @@ -281,10 +280,10 @@ updater->RegisterObserverL(*this); - /* if( !iWait.IsStarted() ) + if( !iWait.IsStarted() ) { iWait.Start(); - }*/ + } updater->StartNewConversationL( _L("testui123@gmail.com") ) ; @@ -416,22 +415,11 @@ TInt Cimcache_test::ConversationUnExistTestL(CStifItemParser& /*aItem*/) { CIMCacheFactory* instance = CIMCacheFactory::InstanceL(); - MIMCacheUpdater* updater = instance->CreateUpdaterL(1, _L("testlm123@gmail.com"), ETrue ); - updater->RegisterObserverL(*this); - - updater->StartNewConversationL( _L("testui123@gmail.com") ) ; - - if( !iWait.IsStarted() ) - { - iWait.Start(); - } - - updater->CloseAllConversationL(); - + MIMCacheAccessor* accessor = instance->CreateAccessorL(1, _L("testlm123@gmail.com") ); // not yest conversation open so must be EFalse here TBool ret = accessor->IsConversationExistL(_L("testui123@gmail.com") ); - updater->UnRegisterObserver(*this); + CIMCacheFactory::Release(); if(!ret) @@ -629,7 +617,7 @@ case EIMCacheNewMessage : { iMessageFetch++; - if( iWait.IsStarted() /*&& iMessageFetch == 2 */) + if( iWait.IsStarted() && iMessageFetch == 2 ) { iWait.AsyncStop(); } diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/bld.inf --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/bld.inf Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/bld.inf Wed Oct 13 14:54:31 2010 +0300 @@ -54,8 +54,6 @@ ../src/t_presenceall/t_presenceall.mmp // Export the .iby for module release tests -PRJ_TESTEXPORTS +PRJ_EXPORTS ximpfwmrt.iby /epoc32/rom/include/ximpfwmrt.iby -#ifdef WINSCW_UDEB -GNUMAKEFILE test_mover.make -#endif + diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/ximpfw_release_tests.pkg --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/ximpfw_release_tests.pkg Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/ximpfw_release_tests.pkg Wed Oct 13 14:54:31 2010 +0300 @@ -38,7 +38,7 @@ ;EUnit test dlls -"\EPOC32\RELEASE\ARMV5\UREL\t_presenceall.dll" - "!:\sys\bin\t_presenceall.dll" +;"\EPOC32\RELEASE\ARMV5\UREL\t_presenceall.dll" - "!:\sys\bin\t_presenceall.dll" "\EPOC32\RELEASE\ARMV5\UREL\t_rootservices.dll" - "!:\sys\bin\t_rootservices.dll" "\EPOC32\RELEASE\ARMV5\UREL\t_sessionmng.dll" - "!:\sys\bin\t_sessionmng.dll" "\EPOC32\RELEASE\ARMV5\UREL\t_presencepublishing.dll" - "!:\sys\bin\t_presencepublishing.dll" diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/ximpfwmrt.iby --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/ximpfwmrt.iby Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group/ximpfwmrt.iby Wed Oct 13 14:54:31 2010 +0300 @@ -38,7 +38,7 @@ file=ABI_DIR\BUILD_DIR\t_presenceauthorization.dll SHARED_LIB_DIR\t_presenceauthorization.dll file=ABI_DIR\BUILD_DIR\t_presenceblocking.dll SHARED_LIB_DIR\t_presenceblocking.dll file=ABI_DIR\BUILD_DIR\t_utils.dll SHARED_LIB_DIR\t_utils.dll -file=ABI_DIR\BUILD_DIR\t_presencegrantrequestmngt.dll SHARED_LIB_DIR\t_presencegrantrequestmngt.dll +file=ABI_DIR\BUILD_DIR\t_presencecache.dll SHARED_LIB_DIR\t_presencecache.dll //ProcessMaster file=ABI_DIR\BUILD_DIR\prfwtestprocessmaster.exe SHARED_LIB_DIR\prfwtestprocessmaster.exe diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/Nokia_RnDCert_02.der Binary file imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/Nokia_RnDCert_02.der has changed diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/Nokia_RnDCert_02.key --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/Nokia_RnDCert_02.key Tue Sep 14 21:56:37 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQC/TDP7KKIaf5+uW4OD2iVZuUMC2a+SeQTjf6srlKcOm+CpPNXn -uLNm/8fdEnyOIuRXPRKmqhs1n0JkxEGHynELWMTuKXbQx9SRAGUXzyneGn+IJNnO -vOKHWgKCouX2hfI8rtkdqJpqmO460gGsMgw+lsbeyWyW9lnfLxq+ZC7sqQIDAQAB -AoGBALmUWZE8GBaQ3P4u9WUCSd3DJkkrmXIFSULSZeH/chlwCwDjbbhArHothVzo -REE3hEFFlERvHbplZ+mNouzy7boduvgUzbksGrbGMLJ2qO1GzWWVwV+GzOWKd3ss -/98Gwoy5R8pjnkqUE2wP1iJFw0FjvUTKcYv/z6t3LLJ0CsoBAkEA+c7ixvsviQ3J -s0INytCKU2bf8fqFQJi1VI82ukxNsujGTQ9upVSjuvqPvWyDvvTdrUBHqO+3qPut -sEh01Q8aiQJBAMQKDJPVRu4ud3mwUfEavzL5EjqwG1k9VCNGYsT4FwtrHcxu1oP/ -pk6M3rIZukqomoEEnHWPMwhrK3fhBqi0OSECQQDr40VXege4FnH5OI2Hj4afHMyp -VdQQXGMWFyopnzXblFz0lXb43cTCIiorR9XcMqNFHybLypkWE5o+lRzlt55pAkBQ -P/zeF5Sts//cpL0mgdh7OVKpC6ZmZaCnwAx2rUhhuDu+kDDoYCLoTOps5fNI1LRK -1GRoC3LMo3Jr5IYhUYWBAkBpCpN6k4JU/mszq98EojHerQNxk8sPqvQKUzTutohT -1gLX9yepGayB/TtT2EEJDkWOlnTy/dvN6W3vzbJYz97x ------END RSA PRIVATE KEY----- diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/ximpfw_release_tests.pkg --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/ximpfw_release_tests.pkg Tue Sep 14 21:56:37 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -; -; 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: XIMP Framewor Test code Package File -; -;Header -#{"XIMPFW ReleaseTests"}, (0x10282DE4), 1, 0, 0 - -;Language -&EN - -;Localised VendorID -%{"Nokia"} - -;VendorID -:"Nokia" - - -;Supports Series 60 v 0.9 -(0x101F6F88), 0, 0, 0, -{"Series60ProductID"} - - -;Needed test protocols and test helpers -"\EPOC32\RELEASE\ARMV5\UREL\pr_prfwtestprotocol.dll" - "!:\sys\bin\pr_prfwtestprotocol.dll" -"\EPOC32\DATA\Z\Resource\Plugins\pr_prfwtestprotocol.RSC"-"!:\resource\plugins\pr_prfwtestprotocol.rsc" -"\EPOC32\RELEASE\ARMV5\UREL\prfwtestcaseutils.dll" - "!:\sys\bin\prfwtestcaseutils.dll" - - -;EUnit test dlls -;"\EPOC32\RELEASE\ARMV5\UREL\t_presenceall.dll" - "!:\sys\bin\t_presenceall.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_rootservices.dll" - "!:\sys\bin\t_rootservices.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_sessionmng.dll" - "!:\sys\bin\t_sessionmng.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presencepublishing.dll" - "!:\sys\bin\t_presencepublishing.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presencewatching.dll" - "!:\sys\bin\t_presencewatching.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presencegrouplistmngt.dll" - "!:\sys\bin\t_presencegrouplistmngt.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presencegroupmembermngt.dll" - "!:\sys\bin\t_presencegroupmembermngt.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presencewatcherlistmngt.dll" - "!:\sys\bin\t_presencewatcherlistmngt.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presencegrantrequestmngt.dll" - "!:\sys\bin\t_presencegrantrequestmngt.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presenceauthorization.dll" - "!:\sys\bin\t_presenceauthorization.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presenceblocking.dll" - "!:\sys\bin\t_presenceblocking.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_utils.dll" - "!:\sys\bin\t_utils.dll" - -;ProcessMaster -"\EPOC32\RELEASE\ARMV5\UREL\prfwtestprocessmaster.exe" - "!:\sys\bin\prfwtestprocessmaster.exe" - diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/ximpfw_release_tests.sis Binary file imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/ximpfw_release_tests.sis has changed diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/ximpfw_release_tests.sisx Binary file imsrv_plat/ximp_core_feature_plugin_api/tsrc/sis/ximpfw_release_tests.sisx has changed diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #include "eunittools.h" - -#include -#include - - +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.h Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,12 +18,7 @@ #ifndef T_PRESENCEALL_H #define T_PRESENCEALL_H - -// EXTERNAL INCLUDES -#include -#include - - +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall/t_presenceall.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,12 +18,8 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_presenceall.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS - +CAPABILITY ALL -TCB SOURCEPATH . SOURCE t_presenceall.cpp @@ -37,17 +33,6 @@ USERINCLUDE ../../../../../ximpfw/presence/srcpresencedatamodel/presenceinfo USERINCLUDE ../../../../../ximpfw/core/srcutils -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif LIBRARY ecom.lib LIBRARY bafl.lib LIBRARY ximpdatamodel.lib @@ -55,8 +40,6 @@ LIBRARY estor.lib LIBRARY ximputils.lib LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #include "eunittools.h" - -#include -#include - +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.h Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #ifndef T_PRESENCEAUTHORIZATION_H #define T_PRESENCEAUTHORIZATION_H - -// EXTERNAL INCLUDES -#include -#include - +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,13 +18,9 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_presenceauthorization.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS - +CAPABILITY ALL -TCB SOURCEPATH . SOURCE t_presenceauthorization.cpp @@ -39,17 +35,6 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -66,8 +51,7 @@ LIBRARY estor.lib LIBRARY ximputils.lib LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib + // end of file diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #include "eunittools.h" -//#include -#include -#include - +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.h Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,12 +18,7 @@ #ifndef T_PRESENCEBLOCKING_H #define T_PRESENCEBLOCKING_H - -//#include -// EXTERNAL INCLUDES -#include -#include - +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking/t_presenceblocking.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,12 +18,8 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_presenceblocking.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS - +CAPABILITY ALL -TCB -DRM SOURCEPATH . SOURCE t_presenceblocking.cpp @@ -38,17 +34,6 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -65,8 +50,6 @@ LIBRARY ximputils.lib LIBRARY estor.lib LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,9 +18,7 @@ #include "eunittools.h" -#include -#include - +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #ifndef T_PRESENCEGRANTREQUESTMANAGEMENT_H #define T_PRESENCEGRANTREQUESTMANAGEMENT_H - -// EXTERNAL INCLUDES -#include -#include - +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,12 +18,8 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_presencegrantrequestmngt.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS - +CAPABILITY ALL -TCB SOURCEPATH . SOURCE t_presencegrantrequestmngt.cpp @@ -38,17 +34,6 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -65,8 +50,6 @@ LIBRARY ximputils.lib LIBRARY estor.lib LIBRARY EUnit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #include "eunittools.h" - - -#include -#include - +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #ifndef T_PRESENCEGROUPLISTMANAGEMENT_H #define T_PRESENCEGROUPLISTMANAGEMENT_H - -// EXTERNAL INCLUDES -#include -#include - +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,12 +18,8 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_presencegrouplistmngt.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS - +CAPABILITY ALL -TCB SOURCEPATH . SOURCE t_presencegrouplistmngt.cpp @@ -37,18 +33,6 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif - SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -66,8 +50,6 @@ LIBRARY ximputils.lib LIBRARY estor.lib LIBRARY EUnit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #include "eunittools.h" - -#include -#include - +#include #include #include #include diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,12 +18,7 @@ #ifndef T_PRESENCEGROUPMEMBERMANAGEMENT_H #define T_PRESENCEGROUPMEMBERMANAGEMENT_H - - -// EXTERNAL INCLUDES -#include -#include - +#include #include #include #include "prfwteststatuseventlistener.h" diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,13 +18,8 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include - TARGET t_presencegroupmembermngt.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS - +CAPABILITY ALL -TCB SOURCEPATH . SOURCE t_presencegroupmembermngt.cpp @@ -39,18 +34,6 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif - SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -67,8 +50,6 @@ LIBRARY ximputils.lib LIBRARY estor.lib LIBRARY EUnit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,9 +18,7 @@ #include "eunittools.h" -#include -#include - +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.h Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #ifndef T_PRESENCEPUBLISHING_H #define T_PRESENCEPUBLISHING_H - -// EXTERNAL INCLUDES -#include -#include - +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing/t_presencepublishing.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,13 +18,8 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include - TARGET t_presencepublishing.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS - +CAPABILITY ALL -TCB SOURCEPATH . SOURCE t_presencepublishing.cpp @@ -39,17 +34,6 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -63,11 +47,7 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib -LIBRARY estor.lib -LIBRARY ximputils.lib LIBRARY EUnit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #include "eunittools.h" -#include -#include - - +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #ifndef T_PRESENCEWATCHERLISTMANAGEMENT_H #define T_PRESENCEWATCHERLISTMANAGEMENT_H - -// EXTERNAL INCLUDES -#include -#include - +#include #include #include #include "presencetypehelpers.h" diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,12 +18,8 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_presencewatcherlistmngt.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS - +CAPABILITY ALL -TCB SOURCEPATH . SOURCE t_presencewatcherlistmngt.cpp @@ -37,17 +33,6 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -61,12 +46,9 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib -LIBRARY euser.lib LIBRARY ximputils.lib -LIBRARY eunit.lib -LIBRARY eunitutil.lib LIBRARY estor.lib - +LIBRARY EUnit.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,9 +18,7 @@ #include "eunittools.h" - -#include -#include +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.h Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #ifndef T_PRESENCEWATCHING_H #define T_PRESENCEWATCHING_H - -// EXTERNAL INCLUDES -#include -#include +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching/t_presencewatching.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,8 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_presencewatching.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS +CAPABILITY ALL -TCB -DRM SOURCEPATH . SOURCE t_presencewatching.cpp @@ -39,17 +36,6 @@ USERINCLUDE ../../tsrcprotocols // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -67,8 +53,6 @@ LIBRARY presencedatamodel.lib LIBRARY ximputils.lib LIBRARY EUnit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,14 +18,10 @@ #include "t_rootservices.h" #include "eunittools.h" - +#include #include #include - -#include -#include - //XIMP headers #include #include diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.h Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #ifndef T_ROOTSERVICES_H__ #define T_ROOTSERVICES_H__ - -// EXTERNAL INCLUDES -#include -#include +#include #include class MXIMPProtocolInfo; diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices/t_rootservices.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,8 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_rootservices.dll -CAPABILITY EUNIT_CAPS - +CAPABILITY ALL -TCB SOURCEPATH . SOURCE t_rootservices.cpp @@ -37,26 +34,10 @@ USERINCLUDE ../../tsrcprotocols -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif LIBRARY ecom.lib LIBRARY bafl.lib -LIBRARY ximpdatamodel.lib -LIBRARY presencedatamodel.lib -LIBRARY estor.lib -LIBRARY ximputils.lib LIBRARY EUnit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -15,7 +15,7 @@ * */ - +#include #include #include #include @@ -43,8 +43,6 @@ -#include -#include diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.h Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #ifndef T_SESSIONMNG_H__ #define T_SESSIONMNG_H__ - -// EXTERNAL INCLUDES -#include -#include +#include #include #include "prfwteststatuseventlistener.h" diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng/t_sessionmng.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,8 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_sessionmng.dll -CAPABILITY EUNIT_CAPS - +CAPABILITY ALL -TCB SOURCEPATH . SOURCE t_sessionmng.cpp @@ -36,26 +33,12 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils USERINCLUDE ../../tsrcprotocols -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif LIBRARY ecom.lib LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib -LIBRARY estor.lib -LIBRARY ximputils.lib LIBRARY EUnit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -16,21 +16,16 @@ */ - +#include #include #include #include #include #include -#include "eunittools.h" - - -#include -#include #include "t_utils.h" - +#include "eunittools.h" #include #include diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.h Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #ifndef T_UTILS_H__ #define T_UTILS_H__ - -// EXTERNAL INCLUDES -#include -#include +#include #include #include "prfwteststatuseventlistener.h" diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils/t_utils.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -16,17 +16,13 @@ */ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" -#include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_utils.dll -CAPABILITY EUNIT_CAPS - +CAPABILITY ALL -TCB SOURCEPATH . SOURCE t_utils.cpp - +#include "../../tsrcutils/processmaster/pm.h" USERINCLUDE ../../../../../ximpfw/core/srcdatamodel USERINCLUDE ../../../../../ximpfw/presence/srcpresencedatamodel @@ -38,17 +34,6 @@ USERINCLUDE ../../../../../ximpfw/core/srcutils // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -62,12 +47,8 @@ LIBRARY ecom.lib LIBRARY bafl.lib LIBRARY ximpdatamodel.lib -LIBRARY presencedatamodel.lib -LIBRARY estor.lib LIBRARY ximputils.lib LIBRARY EUnit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -17,14 +17,12 @@ #include #include "../prfwtestprotocols_resource.hrh" -#include TARGET pr_prfwtestprotocol.dll TARGETTYPE PLUGIN UID XIMP_DLL_UID_ECOM_PLUGIN PRFW_DLL_UID_PR_PRFWTESTPROTOCOL VENDORID VID_DEFAULT -//CAPABILITY ALL -TCB -CAPABILITY EUNIT_CAPS +CAPABILITY ALL -TCB -DRM //ECOM RESOURCE @@ -60,17 +58,7 @@ SYSTEMINCLUDE ../../../../../ximpfw/inc/presence/presenceprotocolplugin SYSTEMINCLUDE ../../../../../ximpfw/inc/presence/presenceprotocolpluginhost -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif MW_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/ecom diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/eunitcommon/eunittools.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/eunitcommon/eunittools.h Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/eunitcommon/eunittools.h Wed Oct 13 14:54:31 2010 +0300 @@ -19,16 +19,11 @@ #define EUNITTOOLS_H #include - -#include -#include - - -#include -#include - - -#include "cglobalwaitingnote.h" +#include +#include +#include +#include +//#include "cglobalwaitingnote.h" @@ -150,7 +145,7 @@ msg.Append( _L("Entering to test case. Test process:") ); msg.Append( processImage ); - CGlobalWaitingNote::ShowMsgL( msg, 15000000, 15 ); //15 seconds, 1 second steps + // CGlobalWaitingNote::ShowMsgL( msg, 15000000, 15 ); //15 seconds, 1 second steps EUNIT_ENABLE_ANY_DECORATOR; } diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -17,28 +17,17 @@ // To get the MW_LAYER_SYSTEMINCLUDE-definition #include -#include + TARGET prfwtestprocessmaster.exe TARGETTYPE exe UID 0x0 0x10282DDE VENDORID VID_DEFAULT -CAPABILITY CAP_SERVER ProtServ PowerMgmt AllFiles ReadDeviceData EUNIT_CAPS +CAPABILITY CAP_SERVER ProtServ PowerMgmt AllFiles ReadDeviceData TARGETPATH /system/libs SOURCEPATH . SOURCE prfwtestprocessmaster.cpp -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif MW_LAYER_SYSTEMINCLUDE USERINCLUDE ../testcaseutils diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -15,18 +15,14 @@ * */ -#include -#include - -#include "prfwtestdlluids.hrh" +#include +#include "prfwtestdlluids.hrh" TARGET prfwtestcaseutils.dll TARGETTYPE dll UID PRFWTEST_DLL_UID_STATIC_INTERFACE PRFWTEST_DLL_UID_COMMON -//CAPABILITY ALL -TCB -DRM -CAPABILITY EUNIT_CAPS - +CAPABILITY ALL -TCB VENDORID VID_DEFAULT @@ -64,17 +60,6 @@ // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif SYSTEMINCLUDE ../../../../../ximpfw/inc/core/base SYSTEMINCLUDE ../../../../../ximpfw/inc/core/datamodel SYSTEMINCLUDE ../../../../../ximpfw/inc/core/protocolplugin @@ -84,7 +69,7 @@ SYSTEMINCLUDE ../../../../../ximpfw/inc/presence/presenceprotocolplugin SYSTEMINCLUDE ../../../../../ximpfw/inc/presence/presenceprotocolpluginhost -SYSTEMINCLUDE /epoc32/include/platform/digia/eunit +SYSTEMINCLUDE /epoc32/include/digia/eunit MW_LAYER_SYSTEMINCLUDE @@ -99,8 +84,6 @@ LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib LIBRARY ximputils.lib -LIBRARY aknnotify.lib -LIBRARY eiksrv.lib EXPORTUNFROZEN diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -65,13 +65,13 @@ { // check if we've already defined the keys. if we redefine and set // defaults, the test logic breaks. - /*TInt pubSubDefined = GetValueFor( EXIMPTestMetaPubSubDefined ); + TInt pubSubDefined = GetValueFor( EXIMPTestMetaPubSubDefined ); if ( pubSubDefined ) { // all done return; } -*/ + TInt r = 0; // special behavioral keys diff -r 482d5cf4c4b4 -r 338724211739 imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h Tue Sep 14 21:56:37 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h Wed Oct 13 14:54:31 2010 +0300 @@ -21,9 +21,7 @@ // INCLUDES #include -//#include -#include -#include +#include #include "prfwtestprocessmaster.h" #include "userafter.h" #include "prfwtestfiletool.h" diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/group/bld.inf --- a/ximpfw/tsrc/group/bld.inf Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/group/bld.inf Wed Oct 13 14:54:31 2010 +0300 @@ -54,10 +54,6 @@ ../src/t_presenceall/t_presenceall.mmp // Export the .iby for module release tests - -PRJ_TESTEXPORTS +PRJ_EXPORTS ximpfwmrt.iby /epoc32/rom/include/ximpfwmrt.iby -#ifdef WINSCW_UDEB -GNUMAKEFILE test_mover.make -#endif diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/group/test_mover.make --- a/ximpfw/tsrc/group/test_mover.make Tue Sep 14 21:56:37 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -FINAL : - echo Copying test DLL to z\sys\bin - copy %epocroot%epoc32\release\winscw\udeb\pr_prfwtestprotocol.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\prfwtestcaseutils.lib %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\prfwtestcaseutils.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\t_presenceall.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\t_utils.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\t_presenceauthorization.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\t_presencegrantrequestmngt.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\t_presencewatcherlistmngt.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\t_presencegroupmembermngt.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\t_presencegrouplistmngt.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\t_presencewatching.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\t_presencepublishing.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\t_sessionmng.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\t_rootservices.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\t_presenceblocking.dll %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - copy %epocroot%epoc32\release\winscw\udeb\prfwtestprocessmaster.exe %epocroot%epoc32\release\winscw\UDEB\z\sys\bin /y - -MAKMAKE FREEZE LIB CLEANLIB RESOURCE RELEASABLES CLEAN BLD SAVESPACE : \ No newline at end of file diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/group/ximpfwmrt.iby --- a/ximpfw/tsrc/group/ximpfwmrt.iby Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/group/ximpfwmrt.iby Wed Oct 13 14:54:31 2010 +0300 @@ -38,7 +38,7 @@ file=ABI_DIR\BUILD_DIR\t_presenceauthorization.dll SHARED_LIB_DIR\t_presenceauthorization.dll file=ABI_DIR\BUILD_DIR\t_presenceblocking.dll SHARED_LIB_DIR\t_presenceblocking.dll file=ABI_DIR\BUILD_DIR\t_utils.dll SHARED_LIB_DIR\t_utils.dll -file=ABI_DIR\BUILD_DIR\t_presencegrantrequestmngt.dll SHARED_LIB_DIR\t_presencegrantrequestmngt.dll +file=ABI_DIR\BUILD_DIR\t_presencecache.dll SHARED_LIB_DIR\t_presencecache.dll //ProcessMaster file=ABI_DIR\BUILD_DIR\prfwtestprocessmaster.exe SHARED_LIB_DIR\prfwtestprocessmaster.exe diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/sis/ximpfw_release_tests.pkg --- a/ximpfw/tsrc/sis/ximpfw_release_tests.pkg Tue Sep 14 21:56:37 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -; -; 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: XIMP Framewor Test code Package File -; -;Header -#{"XIMPFW ReleaseTests"}, (0x10282DE4), 1, 0, 0 - -;Language -&EN - -;Localised VendorID -%{"Nokia"} - -;VendorID -:"Nokia" - - -;Supports Series 60 v 0.9 -(0x101F6F88), 0, 0, 0, -{"Series60ProductID"} - - -;Needed test protocols and test helpers -"\EPOC32\RELEASE\ARMV5\UREL\pr_prfwtestprotocol.dll" - "!:\sys\bin\pr_prfwtestprotocol.dll" -"\EPOC32\DATA\Z\Resource\Plugins\pr_prfwtestprotocol.RSC"-"!:\resource\plugins\pr_prfwtestprotocol.rsc" -"\EPOC32\RELEASE\ARMV5\UREL\prfwtestcaseutils.dll" - "!:\sys\bin\prfwtestcaseutils.dll" - - -;EUnit test dlls -"\EPOC32\RELEASE\ARMV5\UREL\t_presenceall.dll" - "!:\sys\bin\t_presenceall.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_rootservices.dll" - "!:\sys\bin\t_rootservices.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_sessionmng.dll" - "!:\sys\bin\t_sessionmng.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presencepublishing.dll" - "!:\sys\bin\t_presencepublishing.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presencewatching.dll" - "!:\sys\bin\t_presencewatching.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presencegrouplistmngt.dll" - "!:\sys\bin\t_presencegrouplistmngt.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presencegroupmembermngt.dll" - "!:\sys\bin\t_presencegroupmembermngt.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presencewatcherlistmngt.dll" - "!:\sys\bin\t_presencewatcherlistmngt.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presencegrantrequestmngt.dll" - "!:\sys\bin\t_presencegrantrequestmngt.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presenceauthorization.dll" - "!:\sys\bin\t_presenceauthorization.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_presenceblocking.dll" - "!:\sys\bin\t_presenceblocking.dll" -"\EPOC32\RELEASE\ARMV5\UREL\t_utils.dll" - "!:\sys\bin\t_utils.dll" - -;ProcessMaster -"\EPOC32\RELEASE\ARMV5\UREL\prfwtestprocessmaster.exe" - "!:\sys\bin\prfwtestprocessmaster.exe" - diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presenceall/t_presenceall.cpp --- a/ximpfw/tsrc/src/t_presenceall/t_presenceall.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceall/t_presenceall.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,9 +18,7 @@ #include "eunittools.h" - -#include -#include +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presenceall/t_presenceall.h --- a/ximpfw/tsrc/src/t_presenceall/t_presenceall.h Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceall/t_presenceall.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #ifndef T_PRESENCEALL_H #define T_PRESENCEALL_H - -// EXTERNAL INCLUDES -#include -#include +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presenceall/t_presenceall.mmp --- a/ximpfw/tsrc/src/t_presenceall/t_presenceall.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceall/t_presenceall.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_presenceall.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presenceall.cpp @@ -37,28 +33,13 @@ USERINCLUDE ../../../presence/srcpresencedatamodel/presenceinfo USERINCLUDE ../../../core/srcutils - -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif - LIBRARY ecom.lib LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib LIBRARY estor.lib LIBRARY ximputils.lib -LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib + // end of file diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp --- a/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #include "eunittools.h" - - -#include -#include - +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.h --- a/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.h Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #ifndef T_PRESENCEAUTHORIZATION_H #define T_PRESENCEAUTHORIZATION_H - -// EXTERNAL INCLUDES -#include -#include - +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp --- a/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,12 +18,8 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_presenceauthorization.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presenceauthorization.cpp @@ -39,19 +35,6 @@ USERINCLUDE ../../../core/srcutils // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif - - SYSTEMINCLUDE ../../../inc/core/base SYSTEMINCLUDE ../../../inc/core/datamodel SYSTEMINCLUDE ../../../inc/core/protocolplugin @@ -67,9 +50,8 @@ LIBRARY presencedatamodel.lib LIBRARY estor.lib LIBRARY ximputils.lib -LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib + + // end of file diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.cpp --- a/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,9 +18,7 @@ #include "eunittools.h" - -#include -#include +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.h --- a/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.h Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #ifndef T_PRESENCEBLOCKING_H #define T_PRESENCEBLOCKING_H - -// EXTERNAL INCLUDES -#include -#include +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.mmp --- a/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_presenceblocking.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presenceblocking.cpp @@ -38,19 +34,6 @@ USERINCLUDE ../../../core/srcutils // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif - - SYSTEMINCLUDE ../../../inc/core/base SYSTEMINCLUDE ../../../inc/core/datamodel SYSTEMINCLUDE ../../../inc/core/protocolplugin @@ -64,11 +47,8 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib +LIBRARY ximputils.lib LIBRARY estor.lib -LIBRARY ximputils.lib -LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp --- a/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #include "eunittools.h" - -#include -#include - +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h --- a/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #ifndef T_PRESENCEGRANTREQUESTMANAGEMENT_H #define T_PRESENCEGRANTREQUESTMANAGEMENT_H - -// EXTERNAL INCLUDES -#include -#include - +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp --- a/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_presencegrantrequestmngt.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presencegrantrequestmngt.cpp @@ -38,19 +34,6 @@ USERINCLUDE ../../../core/srcutils // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif - - SYSTEMINCLUDE ../../../inc/core/base SYSTEMINCLUDE ../../../inc/core/datamodel SYSTEMINCLUDE ../../../inc/core/protocolplugin @@ -64,11 +47,8 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib +LIBRARY ximputils.lib LIBRARY estor.lib -LIBRARY ximputils.lib -LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp --- a/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #include "eunittools.h" - - -#include -#include - +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h --- a/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #ifndef T_PRESENCEGROUPLISTMANAGEMENT_H #define T_PRESENCEGROUPLISTMANAGEMENT_H - -// EXTERNAL INCLUDES -#include -#include - +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp --- a/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_presencegrouplistmngt.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presencegrouplistmngt.cpp @@ -37,20 +33,6 @@ USERINCLUDE ../../../core/srcutils // TODO remove unnecessary - -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif - - SYSTEMINCLUDE ../../../inc/core/base SYSTEMINCLUDE ../../../inc/core/datamodel SYSTEMINCLUDE ../../../inc/core/protocolplugin @@ -65,11 +47,8 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib +LIBRARY ximputils.lib LIBRARY estor.lib -LIBRARY ximputils.lib -LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp --- a/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #include "eunittools.h" - -#include -#include - +#include #include #include #include diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h --- a/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,12 +18,7 @@ #ifndef T_PRESENCEGROUPMEMBERMANAGEMENT_H #define T_PRESENCEGROUPMEMBERMANAGEMENT_H - - -// EXTERNAL INCLUDES -#include -#include - +#include #include #include #include "prfwteststatuseventlistener.h" diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp --- a/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,12 +18,7 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include - TARGET t_presencegroupmembermngt.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presencegroupmembermngt.cpp @@ -39,18 +34,6 @@ USERINCLUDE ../../../core/srcutils // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif - SYSTEMINCLUDE ../../../inc/core/base SYSTEMINCLUDE ../../../inc/core/datamodel SYSTEMINCLUDE ../../../inc/core/protocolplugin @@ -64,11 +47,8 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib +LIBRARY ximputils.lib LIBRARY estor.lib -LIBRARY ximputils.lib -LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.cpp --- a/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,9 +18,7 @@ #include "eunittools.h" -#include -#include - +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.h --- a/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.h Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #ifndef T_PRESENCEPUBLISHING_H #define T_PRESENCEPUBLISHING_H - -// EXTERNAL INCLUDES -#include -#include - +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.mmp --- a/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,12 +18,7 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include - TARGET t_presencepublishing.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presencepublishing.cpp @@ -39,19 +34,6 @@ USERINCLUDE ../../../core/srcutils // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif - - SYSTEMINCLUDE ../../../inc/core/base SYSTEMINCLUDE ../../../inc/core/datamodel SYSTEMINCLUDE ../../../inc/core/protocolplugin @@ -65,11 +47,6 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib -LIBRARY estor.lib -LIBRARY ximputils.lib -LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp --- a/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #include "eunittools.h" -#include -#include - - +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h --- a/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #ifndef T_PRESENCEWATCHERLISTMANAGEMENT_H #define T_PRESENCEWATCHERLISTMANAGEMENT_H - -// EXTERNAL INCLUDES -#include -#include - +#include #include #include #include "presencetypehelpers.h" diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp --- a/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_presencewatcherlistmngt.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presencewatcherlistmngt.cpp @@ -37,19 +33,6 @@ USERINCLUDE ../../../core/srcutils // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif - - SYSTEMINCLUDE ../../../inc/core/base SYSTEMINCLUDE ../../../inc/core/datamodel SYSTEMINCLUDE ../../../inc/core/protocolplugin @@ -63,10 +46,7 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib -LIBRARY euser.lib LIBRARY ximputils.lib -LIBRARY eunit.lib -LIBRARY eunitutil.lib LIBRARY estor.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencewatching/t_presencewatching.cpp --- a/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #include "eunittools.h" -#include -#include - - +#include #include #include diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencewatching/t_presencewatching.h --- a/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.h Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #ifndef T_PRESENCEWATCHING_H #define T_PRESENCEWATCHING_H - -// EXTERNAL INCLUDES -#include -#include - +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_presencewatching/t_presencewatching.mmp --- a/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,7 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_presencewatching.dll -//CAPABILITY ALL - TCB - DRM -CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presencewatching.cpp @@ -40,20 +36,6 @@ USERINCLUDE ../../tsrcprotocols // TODO remove unnecessary - -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif - - SYSTEMINCLUDE ../../../inc/core/base SYSTEMINCLUDE ../../../inc/core/datamodel SYSTEMINCLUDE ../../../inc/core/protocolplugin @@ -70,9 +52,7 @@ LIBRARY estor.lib LIBRARY presencedatamodel.lib LIBRARY ximputils.lib -LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib + // end of file diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_rootservices/t_rootservices.cpp --- a/ximpfw/tsrc/src/t_rootservices/t_rootservices.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_rootservices/t_rootservices.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -18,11 +18,9 @@ #include "t_rootservices.h" #include "eunittools.h" - +#include #include #include -#include -#include //XIMP headers #include diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_rootservices/t_rootservices.h --- a/ximpfw/tsrc/src/t_rootservices/t_rootservices.h Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_rootservices/t_rootservices.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,12 +18,7 @@ #ifndef T_ROOTSERVICES_H__ #define T_ROOTSERVICES_H__ - - -// EXTERNAL INCLUDES -#include -#include - +#include #include class MXIMPProtocolInfo; diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_rootservices/t_rootservices.mmp --- a/ximpfw/tsrc/src/t_rootservices/t_rootservices.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_rootservices/t_rootservices.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_rootservices.dll -CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_rootservices.cpp @@ -37,27 +34,9 @@ USERINCLUDE ../../tsrcprotocols -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif LIBRARY ecom.lib LIBRARY bafl.lib -LIBRARY ximpdatamodel.lib -LIBRARY presencedatamodel.lib -LIBRARY estor.lib -LIBRARY ximputils.lib -LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_sessionmng/t_sessionmng.cpp --- a/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -15,7 +15,7 @@ * */ -//#include +#include #include #include #include @@ -44,9 +44,6 @@ -#include -#include - diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_sessionmng/t_sessionmng.h --- a/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.h Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,13 +18,7 @@ #ifndef T_SESSIONMNG_H__ #define T_SESSIONMNG_H__ - - - -// EXTERNAL INCLUDES -#include -#include - +#include #include #include "prfwteststatuseventlistener.h" diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_sessionmng/t_sessionmng.mmp --- a/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -18,10 +18,7 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_sessionmng.dll -CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_sessionmng.cpp @@ -36,27 +33,11 @@ USERINCLUDE ../../../core/srcutils USERINCLUDE ../../tsrcprotocols -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif LIBRARY ecom.lib LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib -LIBRARY estor.lib -LIBRARY ximputils.lib -LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_utils/t_utils.cpp --- a/ximpfw/tsrc/src/t_utils/t_utils.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_utils/t_utils.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -16,21 +16,16 @@ */ +#include #include #include #include #include #include -#include "eunittools.h" - - -#include -#include - #include "t_utils.h" - +#include "eunittools.h" #include #include diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_utils/t_utils.h --- a/ximpfw/tsrc/src/t_utils/t_utils.h Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_utils/t_utils.h Wed Oct 13 14:54:31 2010 +0300 @@ -18,12 +18,7 @@ #ifndef T_UTILS_H__ #define T_UTILS_H__ - -// EXTERNAL INCLUDES -#include -#include - - +#include #include #include "prfwteststatuseventlistener.h" diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/src/t_utils/t_utils.mmp --- a/ximpfw/tsrc/src/t_utils/t_utils.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/src/t_utils/t_utils.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -16,17 +16,13 @@ */ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" -#include "../../tsrcutils/processmaster/pm.h" -#include -#include TARGET t_utils.dll -CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_utils.cpp - +#include "../../tsrcutils/processmaster/pm.h" USERINCLUDE ../../../core/srcdatamodel USERINCLUDE ../../../presence/srcpresencedatamodel @@ -38,19 +34,6 @@ USERINCLUDE ../../../core/srcutils // TODO remove unnecessary - -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif - SYSTEMINCLUDE ../../../inc/core/base SYSTEMINCLUDE ../../../inc/core/datamodel SYSTEMINCLUDE ../../../inc/core/protocolplugin @@ -64,12 +47,7 @@ LIBRARY ecom.lib LIBRARY bafl.lib LIBRARY ximpdatamodel.lib -LIBRARY presencedatamodel.lib -LIBRARY estor.lib LIBRARY ximputils.lib -LIBRARY eunit.lib -LIBRARY eunitutil.lib -LIBRARY euser.lib // end of file diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp --- a/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -17,14 +17,12 @@ #include #include "../prfwtestprotocols_resource.hrh" -#include TARGET pr_prfwtestprotocol.dll TARGETTYPE PLUGIN UID XIMP_DLL_UID_ECOM_PLUGIN PRFW_DLL_UID_PR_PRFWTESTPROTOCOL VENDORID VID_DEFAULT -//CAPABILITY ALL -TCB -CAPABILITY EUNIT_CAPS +CAPABILITY ALL -TCB //ECOM RESOURCE @@ -60,17 +58,7 @@ SYSTEMINCLUDE ../../../inc/presence/presenceprotocolplugin SYSTEMINCLUDE ../../../inc/presence/presenceprotocolpluginhost -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif MW_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/ecom diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/tsrcutils/eunitcommon/eunittools.h --- a/ximpfw/tsrc/tsrcutils/eunitcommon/eunittools.h Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/tsrcutils/eunitcommon/eunittools.h Wed Oct 13 14:54:31 2010 +0300 @@ -19,14 +19,10 @@ #define EUNITTOOLS_H #include - -#include -#include - -#include -#include - - +#include +#include +#include +#include #include "cglobalwaitingnote.h" diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp --- a/ximpfw/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -17,28 +17,17 @@ // To get the MW_LAYER_SYSTEMINCLUDE-definition #include -#include + TARGET prfwtestprocessmaster.exe TARGETTYPE exe UID 0x0 0x10282DDE VENDORID VID_DEFAULT -CAPABILITY CAP_SERVER ProtServ PowerMgmt AllFiles ReadDeviceData EUNIT_CAPS +CAPABILITY CAP_SERVER ProtServ PowerMgmt AllFiles ReadDeviceData TARGETPATH /system/libs SOURCEPATH . SOURCE prfwtestprocessmaster.cpp -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif MW_LAYER_SYSTEMINCLUDE USERINCLUDE ../testcaseutils diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp --- a/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp Wed Oct 13 14:54:31 2010 +0300 @@ -15,17 +15,14 @@ * */ -#include -#include - -#include "prfwtestdlluids.hrh" +#include +#include "prfwtestdlluids.hrh" TARGET prfwtestcaseutils.dll TARGETTYPE dll UID PRFWTEST_DLL_UID_STATIC_INTERFACE PRFWTEST_DLL_UID_COMMON -//CAPABILITY ALL -TCB -DRM -CAPABILITY EUNIT_CAPS +CAPABILITY ALL -TCB VENDORID VID_DEFAULT @@ -63,17 +60,6 @@ // TODO remove unnecessary -#if defined ( OS_LAYER_SYSTEMINCLUDE ) -OS_LAYER_SYSTEMINCLUDE -#else -SYSTEMINCLUDE /epoc32/include -#endif - - #if defined ( APP_LAYER_SYSTEMINCLUDE ) - APP_LAYER_SYSTEMINCLUDE - #else - SYSTEMINCLUDE \epoc32\include - #endif SYSTEMINCLUDE ../../../inc/core/base SYSTEMINCLUDE ../../../inc/core/datamodel SYSTEMINCLUDE ../../../inc/core/protocolplugin @@ -83,7 +69,7 @@ SYSTEMINCLUDE ../../../inc/presence/presenceprotocolplugin SYSTEMINCLUDE ../../../inc/presence/presenceprotocolpluginhost -SYSTEMINCLUDE /epoc32/include/platform/digia/eunit +SYSTEMINCLUDE /epoc32/include/digia/eunit MW_LAYER_SYSTEMINCLUDE @@ -98,8 +84,6 @@ LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib LIBRARY ximputils.lib -LIBRARY aknnotify.lib -LIBRARY eiksrv.lib EXPORTUNFROZEN diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp --- a/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp Wed Oct 13 14:54:31 2010 +0300 @@ -65,13 +65,13 @@ { // check if we've already defined the keys. if we redefine and set // defaults, the test logic breaks. - /*TInt pubSubDefined = GetValueFor( EXIMPTestMetaPubSubDefined ); + TInt pubSubDefined = GetValueFor( EXIMPTestMetaPubSubDefined ); if ( pubSubDefined ) { // all done return; } -*/ + TInt r = 0; // special behavioral keys diff -r 482d5cf4c4b4 -r 338724211739 ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h --- a/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h Tue Sep 14 21:56:37 2010 +0300 +++ b/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h Wed Oct 13 14:54:31 2010 +0300 @@ -21,9 +21,7 @@ // INCLUDES #include - -#include -#include +#include #include "prfwtestprocessmaster.h" #include "userafter.h" #include "prfwtestfiletool.h"