Revision: 201033 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Tue, 31 Aug 2010 15:31:29 +0300
branchRCL_3
changeset 42 cfd5c2994f10
parent 41 eedf17a17c27
child 43 113b91e0a2ad
Revision: 201033 Kit: 201035
brandingserver/bsclient/bsclientdefs.h
brandingserver/bsclient/bselementfactory.cpp
brandingserver/bsclient/bsprocessstarter.cpp
brandingserver/bsclient/bsprocessstarter.h
brandingserver/bsclient/cbsaccess.cpp
brandingserver/bsclient/cbsaccess.h
brandingserver/bsclient/cbsbitmap.cpp
brandingserver/bsclient/cbsbrandobserver.cpp
brandingserver/bsclient/cbsbrandobserver.h
brandingserver/bsclient/cbsclient.cpp
brandingserver/bsclient/cbsclient.h
brandingserver/bsclient/cbselement.cpp
brandingserver/bsclient/cbselement.h
brandingserver/bsclient/cbsfactory.cpp
brandingserver/bsclient/cbsiconfileprovider.cpp
brandingserver/bsclient/cbsiconfileprovider.h
brandingserver/bsclient/cbsupdater.cpp
brandingserver/bsclient/cbsupdater.h
brandingserver/bsclient/mbsbrandobserverregistrar.h
brandingserver/bsclient/tbselementiterator.cpp
brandingserver/bsclient/tbsmdescarrayadapter.cpp
brandingserver/bsserver/bsimportconstants.h
brandingserver/bsserver/bsserverdefs.h
brandingserver/bsserver/cbsbackupobserver.cpp
brandingserver/bsserver/cbsbackupobserver.h
brandingserver/bsserver/cbsbrandhandler.cpp
brandingserver/bsserver/cbsbrandhandler.h
brandingserver/bsserver/cbsibywriter.cpp
brandingserver/bsserver/cbsibywriter.h
brandingserver/bsserver/cbsinstallhandler.cpp
brandingserver/bsserver/cbsinstallhandler.h
brandingserver/bsserver/cbsserver.cpp
brandingserver/bsserver/cbsserver.h
brandingserver/bsserver/cbssession.cpp
brandingserver/bsserver/cbssession.h
brandingserver/bsserver/cbsstorage.cpp
brandingserver/bsserver/cbsstorage.h
brandingserver/bsserver/cbsstoragemanager.cpp
brandingserver/bsserver/cbsstoragemanager.h
brandingserver/group/backup_registration.xml
brandingserver/group/bld.inf
brandingserver/group/bsclient.mmp
brandingserver/group/bsserver.mmp
brandingserver/group/bsuids.h
brandingserver/group/debugtrace.h
brandingserver/inc/bselementfactory.h
brandingserver/inc/cbsbitmap.h
brandingserver/inc/cbsfactory.h
brandingserver/inc/mbsaccess.h
brandingserver/inc/mbsbackupobserver.h
brandingserver/inc/mbsbackuprestorestateobserver.h
brandingserver/inc/mbsbrandchangeobserver.h
brandingserver/inc/mbselement.h
brandingserver/inc/mbsupdater.h
brandingserver/inc/rbsobjowningptrarray.h
brandingserver/inc/rbsobjowningptrarray.inl
brandingserver/inc/tbselementiterator.h
brandingserver/inc/tbsmdescarrayadapter.h
brandingserver/rom/brandingserver.iby
brandingserver/sis/bs.pkg
brandingserver/sis/bsstub.pkg
brandingserver/sis/bsstub.sis
brandingserver/tools/bsimport/group/bld.inf
brandingserver/tools/bsimport/group/brandimporter_UID_.cpp
brandingserver/tools/bsimport/group/importer.mmp
brandingserver/tools/bsimport/group/installer.mmp
brandingserver/tools/bsimport/inc/cbsimportconstants.h
brandingserver/tools/bsimport/inc/cbsimportfilereader.h
brandingserver/tools/bsimport/inc/cbsimportmanager.h
brandingserver/tools/bsimport/inc/cbsimportstorage.h
brandingserver/tools/bsimport/inc/cbsimportstoragemanager.h
brandingserver/tools/bsimport/inc/cbsimportxmlparser-1.h
brandingserver/tools/bsimport/inc/cbsimportxmlparser.h
brandingserver/tools/bsimport/inc/importlogwriter.h
brandingserver/tools/bsimport/src/bsbrandremover.cpp
brandingserver/tools/bsimport/src/bsbrandremover.h
brandingserver/tools/bsimport/src/cbsimportfilereader.cpp
brandingserver/tools/bsimport/src/cbsimportmanager.cpp
brandingserver/tools/bsimport/src/cbsimportstorage.cpp
brandingserver/tools/bsimport/src/cbsimportstoragemanager.cpp
brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp
brandingserver/tools/bsimport/src/importer.cpp
brandingserver/tools/bsimport/src/installer.cpp
brandingserver/tools/makefile/import.mk
brandingserver/tools/sis/brand-example.pkg
brandingserver/tools/sis/import_data/install.txt
brandingserver/tools/sis/make-example.cmd
brandingserver/tools/xml/loc2xml.pl
brandingserver/tools/xml/mbg2xml.pl
brandingserver/tools/xml/xml2h.pl
group/bld.inf
imservices/imfeatureplugin/group/bld.inf
imservices/imfeatureplugin/srcimdatamodel/imconversation/conversationsubscriptionitem.h
imservices/instantmessagingcache/group/bld.inf
imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp
imservices/instantmessagingcache/imcacheserver/group/imcacheserver.mmp
imservices/instantmessagingcache/imcacheserver/inc/ccacheserveractivehelper.h
imservices/instantmessagingcache/imcacheserver/src/ccacheserveractivehelper.cpp
imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp
imservices/xmppsettingsapi/group/bld.inf
imservices/xmppsettingsapi/tsrc/conf/xmppsettings_api.cfg
imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt
imservices/xmppsettingsfetcher/group/bld.inf
imsrv_plat/im_cache_server_api/inc/cinstantmsgindicator.h
imsrv_plat/ximp_core_feature_plugin_api/group/bld.inf
imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwteststatuseventlistener.cpp
imsrv_plat/ximp_im_data_model_api/inc/imoperationfactoryimp.h
imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt
ximpfw/core/srcprocessor/ximphostimp.cpp
ximpfw/core/srcprocessor/ximphostimp.h
ximpfw/core/srcutils/ximpobjecthelpers.cpp
ximpfw/presence/srcpresencecache/presencecacheserver/presencecacheservicestore.cpp
ximpfw/presence/srcpresencecache/presencecacheserver/presencecachesession.cpp
ximpfw/presence/srcpresencedatamodel/presencecache/presencebuddyinfolistimp.cpp
ximpfw/tsrc/group/bld.inf
ximpfw/tsrc/src/t_presenceall/t_presenceall.cpp
ximpfw/tsrc/src/t_presenceall/t_presenceall.h
ximpfw/tsrc/src/t_presenceall/t_presenceall.mmp
ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp
ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.h
ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp
ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.cpp
ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.h
ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.mmp
ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp
ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h
ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp
ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp
ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h
ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp
ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp
ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h
ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp
ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.cpp
ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.h
ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.mmp
ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp
ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h
ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp
ximpfw/tsrc/src/t_presencewatching/t_presencewatching.cpp
ximpfw/tsrc/src/t_presencewatching/t_presencewatching.h
ximpfw/tsrc/src/t_presencewatching/t_presencewatching.mmp
ximpfw/tsrc/src/t_rootservices/t_rootservices.cpp
ximpfw/tsrc/src/t_rootservices/t_rootservices.h
ximpfw/tsrc/src/t_rootservices/t_rootservices.mmp
ximpfw/tsrc/src/t_sessionmng/t_sessionmng.cpp
ximpfw/tsrc/src/t_sessionmng/t_sessionmng.h
ximpfw/tsrc/src/t_sessionmng/t_sessionmng.mmp
ximpfw/tsrc/src/t_utils/t_utils.cpp
ximpfw/tsrc/src/t_utils/t_utils.h
ximpfw/tsrc/src/t_utils/t_utils.mmp
ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp
ximpfw/tsrc/tsrcutils/eunitcommon/eunittools.h
ximpfw/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp
ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp
ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp
ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h
ximpfw/tsrc/tsrcutils/testcaseutils/prfwteststatuseventlistener.cpp
--- a/brandingserver/bsclient/bsclientdefs.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/bsclientdefs.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description:CBSClientdefs.h
+* Description: CBSClientdefs.h
 *
 */
+
 #ifndef __BRANDINGDEFS_H__
 #define __BRANDINGDEFS_H__
 #include <e32std.h>
--- a/brandingserver/bsclient/bselementfactory.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/bselementfactory.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,14 +11,15 @@
 *
 * Contributors:
 *
-* Description: bselementfactory.cpp
+* Description:  bselementfactory.cpp
 *
 */
 
 
+
 //  INCLUDE FILES
 
-#include "debugtrace.h"
+#include "DebugTrace.h"
 #include "bselementfactory.h"
 #include "cbselement.h"
 
--- a/brandingserver/bsclient/bsprocessstarter.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/bsprocessstarter.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: bsprocessstarter.cpp
+* Description:  bsprocessstarter.cpp
 *
 */
+
 //  INCLUDE FILES
 #include "bsprocessstarter.h"
 #include <e32std.h>
--- a/brandingserver/bsclient/bsprocessstarter.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/bsprocessstarter.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: bsprocessstarter.h
+* Description:  bsprocessstarter.h
 *
 */
+
 #ifndef __PROCESSSTARTER_H__
 #define __PROCESSSTARTER_H__
 
--- a/brandingserver/bsclient/cbsaccess.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/cbsaccess.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: CBSAccess.cpp
+* Description:  CBSAccess.cpp
 *
 */
 
 
+
 //  INCLUDE FILES
 
 #include <e32base.h>
@@ -25,7 +26,7 @@
 
 #include "cbsaccess.h"
 #include "cbsbitmap.h"
-#include "debugtrace.h"
+#include "DebugTrace.h"
 #include "mbsaccess.h"
 #include "mbsupdater.h"
 #include "cbsiconfileprovider.h"
--- a/brandingserver/bsclient/cbsaccess.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/cbsaccess.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors: cbsaccess.h
 *
-* Description: cbsaccess.h
+* Description:  cbsaccess.h
 *
 */
 
 
+
 #ifndef __CBSACCESS_H__
 #define __CBSACCESS_H__
 #include <e32std.h>
--- a/brandingserver/bsclient/cbsbitmap.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/cbsbitmap.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: cbsbitmap.cpp
+* Description:  cbsbitmap.cpp
 *
 */
 
 
+
 //  INCLUDE FILES
 
 #include "e32base.h"
--- a/brandingserver/bsclient/cbsbrandobserver.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/cbsbrandobserver.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: cbsbrandobserver.cpp
+* Description:  cbsbrandobserver.cpp
 *
 */
+
 //  INCLUDE FILES
 
 #include "cbsbrandobserver.h"
--- a/brandingserver/bsclient/cbsbrandobserver.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/cbsbrandobserver.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: CBSBrandObserver.h
+* Description:  CBSBrandObserver.h
 *
 */
 
 
+
 #ifndef __CBSBRANDOBSERVER_H__
 #define __CBSBRANDOBSERVER_H__
 #include <e32std.h>
--- a/brandingserver/bsclient/cbsclient.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/cbsclient.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: CBSClient.cpp
+* Description:  CBSClient.cpp
 *
 */
 
 
+
 //  INCLUDE FILES
 #include "cbsclient.h"
 #include "bsclientdefs.h"
@@ -27,7 +28,7 @@
 #include "cbsbrandobserver.h"
 #include <e32base.h>
 #include <s32mem.h>
-#include "debugtrace.h"
+#include "DebugTrace.h"
 
 // ==============================================================
 // ======================== CLIENT ==============================
--- a/brandingserver/bsclient/cbsclient.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/cbsclient.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: CBSClient.h
+* Description:  CBSClient.h
 *
 */
 
 
+
 #ifndef __CBSCLIENT_H__
 #define __CBSCLIENT_H__
 #include <e32std.h>
--- a/brandingserver/bsclient/cbselement.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/cbselement.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: cbselement.cpp
+* Description:  cbselement.cpp
 *
 */
+
 //  INCLUDE FILES
 
 #include <utf.h>
--- a/brandingserver/bsclient/cbselement.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/cbselement.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: cbselement.h
+* Description:  cbselement.h
 *
 */
 
 
+
 #ifndef __CBSELEMENT_H__
 #define __CBSELEMENT_H__
 #include <e32std.h>
--- a/brandingserver/bsclient/cbsfactory.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/cbsfactory.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,10 +11,11 @@
 *
 * Contributors:
 *
-* Description:  Factory for creating branding
+* Description:   Factory for creating branding
 *
 */
 
+
 // INCLUDE FILES
 #include    "cbsfactory.h"
 #include	"cbsaccess.h"
@@ -22,7 +23,7 @@
 #include	"mbsaccess.h"
 #include	"mbsupdater.h"
 #include	"cbsclient.h"
-#include    "debugtrace.h"
+#include    "DebugTrace.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
 
--- a/brandingserver/bsclient/cbsiconfileprovider.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/cbsiconfileprovider.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Icon file provider.
+* Description:   Icon file provider.
  *
 */
 
 
+
 // INCLUDE FILES
 #include    "cbsiconfileprovider.h"
 #include	<aknappui.h>
--- a/brandingserver/bsclient/cbsiconfileprovider.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/cbsiconfileprovider.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description:  Icon file provider.
+* Description:   Icon file provider.
  *
 */
 
 
 
+
 #ifndef CBSICONFILEPROVIDER_H
 #define CBSICONFILEPROVIDER_H
 
--- a/brandingserver/bsclient/cbsupdater.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/cbsupdater.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,17 +11,18 @@
 *
 * Contributors:
 *
-* Description: CBSUpdater.cpp
+* Description:  CBSUpdater.cpp
 *
 */
 
 
+
 //  INCLUDE FILES
 
 #include "e32base.h"
 
 #include "cbsupdater.h"
-#include "debugtrace.h"
+#include "DebugTrace.h"
 #include "mbsaccess.h"
 #include "bselementfactory.h"
 #include "mbselement.h"
--- a/brandingserver/bsclient/cbsupdater.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/cbsupdater.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: CBSUpdater.h
+* Description:  CBSUpdater.h
 *
 */
 
 
+
 #ifndef __CBSUPDATER_H__
 #define __CBSUPDATER_H__
 #include <e32std.h>
--- a/brandingserver/bsclient/mbsbrandobserverregistrar.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/mbsbrandobserverregistrar.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description: MBSBrandObserverRegistrar.h
+* Description:  MBSBrandObserverRegistrar.h
 *
 */
 
 
 
+
 #ifndef __MBSBRANDOBSERVERREGISTRAR_H
 #define __MBSBRANDOBSERVERREGISTRAR_H
 
--- a/brandingserver/bsclient/tbselementiterator.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/tbselementiterator.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description: tbselementiterator.cpp
+* Description:  tbselementiterator.cpp
 *
 */
 
 
 
+
 // INCLUDE FILES
 #include    "tbselementiterator.h"
 #include    <E32STD.H>
--- a/brandingserver/bsclient/tbsmdescarrayadapter.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsclient/tbsmdescarrayadapter.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,10 +11,11 @@
 *
 * Contributors:
 *
-* Description:  One value adapter for MDesCArray.
+* Description:   One value adapter for MDesCArray.
 *
 */
 
+
 //  INCLUDES
 #include "tbsmdescarrayadapter.h"
 #include <e32std.h>
--- a/brandingserver/bsserver/bsimportconstants.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/bsimportconstants.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description:  BrandingServer constants.
+* Description:   BrandingServer constants.
 *
 */
+
 // CONSTANTS
 
 // Characters to strip from xml text values
--- a/brandingserver/bsserver/bsserverdefs.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/bsserverdefs.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: server defintions.
+* Description:  server defintions.
 *
 */
+
 #ifndef __BSSERVERDEFS_H__
 #define __BSSERVERDEFS_H__
 #include <e32std.h>
--- a/brandingserver/bsserver/cbsbackupobserver.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsbackupobserver.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Stores element data and writes it to stream
+* Description:   Stores element data and writes it to stream
 *
 */
 
 
+
 #include <connect/sbdefs.h>
 
 #include "cbsbackupobserver.h"
--- a/brandingserver/bsserver/cbsbackupobserver.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsbackupobserver.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Gets and notifies backup and Restore events from system
+* Description:   Gets and notifies backup and Restore events from system
 *
 */
 
 
+
 #ifndef CBSBACKUPOBSERVER_H
 #define CBSBACKUPOBSERVER_H
 
--- a/brandingserver/bsserver/cbsbrandhandler.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsbrandhandler.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,16 +11,17 @@
 *
 * Contributors:
 *
-* Description: CBSBrandHandler.cpp
+* Description:  CBSBrandHandler.cpp
 *
 */
 
 
+
 //  INCLUDE FILES
 
 #include "cbsbrandhandler.h"
 #include "bselementfactory.h"
-#include "debugtrace.h"
+#include "DebugTrace.h"
 #include "cbsstoragemanager.h"
 #include "cbsbitmap.h"
 #include "bsimportconstants.h"
@@ -210,7 +211,6 @@
 	if (iLanguage >= 100)
 		User::LeaveIfError (KErrNotFound);
 	HBufC* fileName = GetTextL( aId );
-	CleanupStack :: PushL (fileName);
 
     TBuf<KLangBufLength> buffer;
 // append leading zero only if language code is <10.
@@ -240,8 +240,6 @@
 		TRACE( T_LIT( "CBSBrandHandler::GetFileL found in default brand") );
 	    
 	    }
-	
-	CleanupStack :: PopAndDestroy (fileName);
 
 	aFile = file;
     TRACE( T_LIT( "CBSBrandHandler::GetFileL end") );
--- a/brandingserver/bsserver/cbsbrandhandler.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsbrandhandler.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: CBSBrandHandler.h
+* Description:  CBSBrandHandler.h
 *
 */
 
 
+
 #ifndef __CBSBRANDHANDLER_H__
 #define __CBSBRANDHANDLER_H__
 
--- a/brandingserver/bsserver/cbsibywriter.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsibywriter.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Writes IBY files
+* Description:   Writes IBY files
 *
 */
 
 
+
 #include <f32file.h>
 #include <bautils.h>
 #include <utf.h>
@@ -23,7 +24,7 @@
 #include "cbsibywriter.h"
 #include "bsimportconstants.h"
 //#include "importlogwriter.h"
-#include "debugtrace.h"
+#include "DebugTrace.h"
 
 // CONSTANTS
 _LIT8( KIBYHeader1,           "\n#ifndef __BRAND_" );
--- a/brandingserver/bsserver/cbsibywriter.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsibywriter.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Writes IBY files
+* Description:   Writes IBY files
 *
 */
 
 
+
 #ifndef CBSIBYWRITER_H
 #define CBSIBYWRITER_H
 
--- a/brandingserver/bsserver/cbsinstallhandler.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsinstallhandler.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: CBSInstallhandler.cpp
+* Description:  CBSInstallhandler.cpp
 *
 */
 
 
+
 //  INCLUDE FILES
 #include <apgcli.h>
 #include <apacmdln.h>
@@ -25,7 +26,7 @@
 #include <e32property.h>
 
 #include "cbsinstallhandler.h"
-#include "debugtrace.h"
+#include "DebugTrace.h"
 #include "bsimportconstants.h"
 #include "cbsstoragemanager.h"
 
@@ -343,7 +344,7 @@
     // aaa$bbb -> aaa$bbb.install
     CDir* dir = NULL;
     iFs.GetDir( file, KEntryAttNormal, ESortNone, dir );
-    if( dir && dir->Count() > 0 )
+    if( dir->Count() > 0 )
         {
         // brand is installed
         delete dir;
@@ -362,7 +363,7 @@
     // check file with different versions:
     // aaa$bbb -> aaa$bbb$*.install
     iFs.GetDir( file, KEntryAttNormal, ESortNone, dir );
-    if( dir && dir->Count() > 0 )
+    if( dir->Count() > 0 )
         {
         // brand is installed
         delete dir;
--- a/brandingserver/bsserver/cbsinstallhandler.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsinstallhandler.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: cbsinstallhandler.h
+* Description:  cbsinstallhandler.h
 *
 */
 
 
+
 #ifndef __CBSINSTALLHANDLER_H__
 #define __CBSINSTALLHANDLER_H__
 
--- a/brandingserver/bsserver/cbsserver.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsserver.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: cbsserver.cpp
+* Description:  cbsserver.cpp
 *
 */
 
 
+
 //  INCLUDE FILES
 
 #define __INCLUDE_CAPABILITY_NAMES__
@@ -24,7 +25,7 @@
 #include "cbsserver.h"
 #include "cbssession.h"
 #include "bsserverdefs.h"
-#include "debugtrace.h"
+#include "DebugTrace.h"
 #include "cbsstoragemanager.h"
 #include "cbsinstallhandler.h"
 #include "cbsbackupobserver.h"
--- a/brandingserver/bsserver/cbsserver.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsserver.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: CBSSERVER.H
+* Description:  CBSSERVER.H
 *
 */
 
 
+
 #ifndef __CBSSERVER_H__
 #define __CBSSERVER_H__
 #include <e32base.h>
--- a/brandingserver/bsserver/cbssession.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbssession.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,18 +11,19 @@
 *
 * Contributors:
 *
-* Description: CBSSession.cpp
+* Description:  CBSSession.cpp
 *
 */
 
 
+
 //  INCLUDE FILES
 #include <e32base.h>
 #include <apgcli.h>
 
 #include "cbssession.h"
 #include "cbsserver.h"
-#include "debugtrace.h"
+#include "DebugTrace.h"
 #include "cbsbrandhandler.h"
 #include "cbsstoragemanager.h"
 #include "cbsstorage.h"
@@ -72,10 +73,6 @@
 	delete iBuffer;
 	delete iBranding;
 	delete iSeveralData;
-
-	delete iApplicationId;
-	delete iBrandId;
-	delete iDefaultBrandId;
 	
 #ifdef __WINSCW__
 	if( iStorageManager )
@@ -511,8 +508,7 @@
 		{
 			TRACE( T_LIT("CBSSession::InitUpdateL: Brand discarded!->LeaveWith KErrNotFound") );
 			///Server()->DisplaySessionInfoL( this, KErrNotFound );
-			//User::Leave( KErrNotFound );	
-			iBrandId->Des().Copy( *iDefaultBrandId );
+			User::Leave( KErrNotFound );	
 		}
 	}
 
--- a/brandingserver/bsserver/cbssession.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbssession.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: cbssession.h
+* Description:  cbssession.h
 *
 */
 
 
+
 #ifndef __CBSSESSION_H__
 #define __CBSSESSION_H__
 
--- a/brandingserver/bsserver/cbsstorage.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsstorage.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,14 +11,15 @@
 *
 * Contributors:
 *
-* Description:  Stores element data and writes it to stream
+* Description:   Stores element data and writes it to stream
 *
 */
 
 
+
 #include "cbsstorage.h"
 #include "bsimportconstants.h"
-#include "debugtrace.h"
+#include "DebugTrace.h"
 
 
 #include <s32strm.h>
@@ -331,13 +332,11 @@
 //
 void CBSStorage::GetListOfFilesL( RArray<TPtrC>& aFileList )
     {
-    CleanupClosePushL(aFileList);
     TInt count = iElements.Count();
     for( TInt i = 0; i < count; i++ )
         {
         AppendFilesL( iElements[i], aFileList );
         }
-    CleanupStack::Pop(&aFileList);
     }
 
 // ---------------------------------------------------------------------------
--- a/brandingserver/bsserver/cbsstorage.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsstorage.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Stores element data and writes it to stream
+* Description:   Stores element data and writes it to stream
 *
 */
 
 
+
 #ifndef CBSSTORAGE_H
 #define CBSSTORAGE_H
 
--- a/brandingserver/bsserver/cbsstoragemanager.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsstoragemanager.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Stores element data and writes it to stream
+* Description:   Stores element data and writes it to stream
 *
 */
 
 
+
 #include <s32strm.h>
 #include <s32file.h>
 #include <f32file.h>
@@ -34,7 +35,7 @@
 #include "cbssession.h"
 #include "mbsupdater.h"
 //#include "importlogwriter.h"
-#include "debugtrace.h"
+#include "DebugTrace.h"
 
 
 // ======== MEMBER FUNCTIONS ========
@@ -266,6 +267,7 @@
                   langBuf.Length() + KDot().Length() * 3 + KMaxVersionLenght;
 	fileName = HBufC::NewLC( length );
     
+    if(fileName){
     TPtr file( fileName->Des() );
 
     // [application_id]\[brand_id]\[def_filename][language_id]
@@ -285,11 +287,9 @@
 	    file.Append( KDot() );
     	file.Append( versionBuffer );
     	}
-
-    if( fileName )
-    	{
-    	CleanupStack::Pop( fileName );
-    	}
+    	
+    	CleanupStack::Pop( fileName );      
+    }
     return fileName;
     }
 
@@ -900,9 +900,6 @@
 		CDir* directories = NULL;
 		
 		User::LeaveIfError( iFs.GetDir( driveAndPath, KEntryAttNormal, ESortByName, files, directories ) );
-
-		CleanupStack :: PushL (files);
-		CleanupStack :: PushL (directories);
 		
 		TInt count = files->Count();
 		for( TInt i = 0; i < count; i++ )
@@ -940,10 +937,7 @@
 				}
 			CleanupStack::PopAndDestroy( fullName );
 			}
-		
-		CleanupStack :: PopAndDestroy (directories);
-		CleanupStack :: PopAndDestroy (files);
-		CleanupStack :: PopAndDestroy (nameWithDrive);
+		CleanupStack::PopAndDestroy( nameWithDrive );
 		}
 	TRACE( T_LIT( "CBSStorageManager::CleanupFileL end") );
 	}
--- a/brandingserver/bsserver/cbsstoragemanager.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsstoragemanager.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Storage handler
+* Description:   Storage handler
 *
 */
 
 
+
 #ifndef CBSSTORAGEMANAGER_H
 #define CBSSTORAGEMANAGER_H
 
--- a/brandingserver/group/backup_registration.xml	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/group/backup_registration.xml	Tue Aug 31 15:31:29 2010 +0300
@@ -3,7 +3,7 @@
 <!-- Backup registration file for Branding Server -->
 
 <backup_registration version="1.0">
-	<passive_backup delete_before_restore="no">
+	<passive_backup delete_before_restore="yes">
 		<include_directory name="\"/>		
 	</passive_backup>
 	<proxy_data_manager SID="0x10202BE9"/>
--- a/brandingserver/group/bld.inf	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/group/bld.inf	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,39 +11,37 @@
 *
 * Contributors:
 *
-* Description: branding server BLD.INF which builds, tools and also server and client.
+* Description:  branding server BLD.INF which builds, tools and also server and client.
 *
 */
+
 #include <platform_paths.hrh>
 
 PRJ_PLATFORMS
 DEFAULT
 
 PRJ_MMPFILES
-bsclient.mmp
-bsserver.mmp
+BSClient.mmp
+BSServer.mmp
 ../tools/bsimport/group/importer.mmp
 ../tools/bsimport/group/installer.mmp
 
 PRJ_EXPORTS
 // Headers exported to source tree
-../inc/cbsfactory.h          		MW_LAYER_PLATFORM_EXPORT_PATH(cbsfactory.h)
-../inc/mbsaccess.h          		MW_LAYER_PLATFORM_EXPORT_PATH(mbsaccess.h)
-../inc/mbsupdater.h          		MW_LAYER_PLATFORM_EXPORT_PATH(mbsupdater.h)
-../inc/mbselement.h          		MW_LAYER_PLATFORM_EXPORT_PATH(mbselement.h)
-../inc/cbsbitmap.h          		MW_LAYER_PLATFORM_EXPORT_PATH(cbsbitmap.h)
-../inc/bselementfactory.h          	MW_LAYER_PLATFORM_EXPORT_PATH(bselementfactory.h)
-../inc/tbselementiterator.h    		MW_LAYER_PLATFORM_EXPORT_PATH(tbselementiterator.h)
-../inc/rbsobjowningptrarray.h  		MW_LAYER_PLATFORM_EXPORT_PATH(rbsobjowningptrarray.h)
-../inc/rbsobjowningptrarray.inl		MW_LAYER_PLATFORM_EXPORT_PATH(rbsobjowningptrarray.inl)
-../inc/mbsbrandchangeobserver.h		MW_LAYER_PLATFORM_EXPORT_PATH(mbsbrandchangeobserver.h)
-../inc/mbsbackuprestorestateobserver.h	MW_LAYER_PLATFORM_EXPORT_PATH(mbsbackuprestorestateobserver.h)
+../Inc/cbsfactory.h          		MW_LAYER_PLATFORM_EXPORT_PATH(cbsfactory.h)
+../Inc/mbsaccess.h          		MW_LAYER_PLATFORM_EXPORT_PATH(mbsaccess.h)
+../Inc/mbsupdater.h          		MW_LAYER_PLATFORM_EXPORT_PATH(mbsupdater.h)
+../Inc/mbselement.h          		MW_LAYER_PLATFORM_EXPORT_PATH(mbselement.h)
+../Inc/cbsbitmap.h          		MW_LAYER_PLATFORM_EXPORT_PATH(cbsbitmap.h)
+../Inc/bselementfactory.h          	MW_LAYER_PLATFORM_EXPORT_PATH(bselementfactory.h)
+../Inc/tbselementiterator.h    		MW_LAYER_PLATFORM_EXPORT_PATH(tbselementiterator.h)
+../Inc/rbsobjowningptrarray.h  		MW_LAYER_PLATFORM_EXPORT_PATH(rbsobjowningptrarray.h)
+../Inc/rbsobjowningptrarray.inl		MW_LAYER_PLATFORM_EXPORT_PATH(rbsobjowningptrarray.inl)
+../Inc/mbsbrandchangeobserver.h		MW_LAYER_PLATFORM_EXPORT_PATH(mbsbrandchangeobserver.h)
+../Inc/mbsbackuprestorestateobserver.h	MW_LAYER_PLATFORM_EXPORT_PATH(mbsbackuprestorestateobserver.h)
 
-../group/backup_registration.xml 	z:/private/102828dd/backup_registration.xml
+../Group/backup_registration.xml 	z:/private/102828dd/backup_registration.xml
 
 // Exporting iby file
 
-../rom/brandingserver.iby           CORE_MW_LAYER_IBY_EXPORT_PATH(brandingserver.iby)
-
-// Exporting stubsis file
-../sis/bsstub.sis           /epoc32/data/Z/System/Install/bsstub.sis
+../ROM/brandingserver.iby           CORE_MW_LAYER_IBY_EXPORT_PATH(brandingserver.iby)
\ No newline at end of file
--- a/brandingserver/group/bsclient.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/group/bsclient.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: Branding server client component project descripton file.
+* Description:  Branding server client component project descripton file.
 *
 */
+
 #include            "bsuids.h"
 #include <platform_paths.hrh>
 #include <data_caging_paths_strings.hrh>
@@ -25,7 +26,7 @@
 VENDORID            VID_DEFAULT
 
 
-SOURCEPATH          ../bsclient
+SOURCEPATH          ../BSClient
 SOURCE              cbsclient.cpp
 SOURCE              bsprocessstarter.cpp
 SOURCE		    cbsfactory.cpp
@@ -38,9 +39,9 @@
 SOURCE			cbsiconfileprovider.cpp
 
 
-USERINCLUDE         ../group
-USERINCLUDE         ../bsserver
-USERINCLUDE         ../bsclient
+USERINCLUDE         ../Group
+USERINCLUDE         ../BSServer
+USERINCLUDE         ../BSClient
 
 APP_LAYER_SYSTEMINCLUDE
 
--- a/brandingserver/group/bsserver.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/group/bsserver.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: Branding server, server comopnent project description file.
+* Description:  Branding server, server comopnent project description file.
 *
 */
+
 #include        "bsuids.h"
 #include <platform_paths.hrh>
 #include <data_caging_paths_strings.hrh>
@@ -28,7 +29,7 @@
 TARGETPATH      /system/libs
 
 
-SOURCEPATH  ../bsserver
+SOURCEPATH  ../BSServer
 SOURCE      cbsserver.cpp
 SOURCE      cbssession.cpp
 SOURCE	    cbsbrandhandler.cpp
@@ -38,17 +39,17 @@
 SOURCE      cbsinstallhandler.cpp
 SOURCE      cbsbackupobserver.cpp
 
-SOURCEPATH	../bsclient
+SOURCEPATH	../BSClient
 SOURCE		cbselement.cpp
 SOURCE		cbsbitmap.cpp
 SOURCE		bselementfactory.cpp
 
 
 
-USERINCLUDE     ../group
-USERINCLUDE     ../bsserver
-USERINCLUDE     ../bsclient
-USERINCLUDE     ../inc
+USERINCLUDE     ../Group
+USERINCLUDE     ../BSServer
+USERINCLUDE     ../BSClient
+USERINCLUDE     ../Inc
 
 APP_LAYER_SYSTEMINCLUDE
 
--- a/brandingserver/group/bsuids.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/group/bsuids.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: BRANDINGSERVER UIDs
+* Description:  BRANDINGSERVER UIDs
 *
 */
+
 #ifndef     __BRANDINGUIDS_H
 #define     __BRANDINGUIDS_H
 
--- a/brandingserver/group/debugtrace.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/group/debugtrace.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: Debug Traces.
+* Description:  Debug Traces.
 *
 */
+
 #ifndef __DEBUGTRACE_H__
 #define __DEBUGTRACE_H__
 
--- a/brandingserver/inc/bselementfactory.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/inc/bselementfactory.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: bselementfactory.h 
+* Description:  bselementfactory.h 
 *
 */
 
 
+
 #ifndef __BSELEMENTFACTORY_H
 #define __BSELEMENTFACTORY_H
 
--- a/brandingserver/inc/cbsbitmap.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/inc/cbsbitmap.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description: cbsbitmap.h
+* Description:  cbsbitmap.h
 *
 */
 
 
 
+
 #ifndef __CBSBITMAP_H__
 #define __CBSBITMAP_H__
 
--- a/brandingserver/inc/cbsfactory.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/inc/cbsfactory.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,10 +11,11 @@
 *
 * Contributors:
 *
-* Description: cbsfactory.h
+* Description:  cbsfactory.h
 *
 */
 
+
 #ifndef __CBSFACTORY_H
 #define __CBSFACTORY_H
 
--- a/brandingserver/inc/mbsaccess.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/inc/mbsaccess.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description: MBSAccess
+* Description:  MBSAccess
 *
 */
 
 
 
+
 #ifndef __MBSACCESS_H
 #define __MBSACCESS_H
 
--- a/brandingserver/inc/mbsbackupobserver.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/inc/mbsbackupobserver.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Backup and Restore observer interface
+* Description:   Backup and Restore observer interface
 *
 */
 
 
+
 #ifndef __MBSBACKUPOBSERVER_H
 #define __MBSBACKUPOBSERVER_H
 
--- a/brandingserver/inc/mbsbackuprestorestateobserver.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/inc/mbsbackuprestorestateobserver.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description: MBS Backup restore observer definition.
+* Description:  MBS Backup restore observer definition.
 *
 */
 
 
 
+
 #ifndef __MBSBACKUPRESTORESTATEOBSERVER_H
 #define __MBSBACKUPRESTORESTATEOBSERVER_H
 
--- a/brandingserver/inc/mbsbrandchangeobserver.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/inc/mbsbrandchangeobserver.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description: MBSBrandChangeObserver 
+* Description:  MBSBrandChangeObserver 
 *
 */
 
 
 
+
 #ifndef __MBSBRANDCHANGEOBSERVER_H
 #define __MBSBRANDCHANGEOBSERVER_H
 
--- a/brandingserver/inc/mbselement.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/inc/mbselement.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: MBSElement.h
+* Description:  MBSElement.h
 *
 */
 
 
+
 #ifndef __MBSELEMENT_H
 #define __MBSELEMENT_H
 
--- a/brandingserver/inc/mbsupdater.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/inc/mbsupdater.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description: MBSUpdater
+* Description:  MBSUpdater
  *
 */
 
 
 
+
  #ifndef __MBSUPDATER_H
  #define __MBSUPDATER_H
 
--- a/brandingserver/inc/rbsobjowningptrarray.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/inc/rbsobjowningptrarray.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,10 +11,11 @@
 *
 * Contributors:
 *
-* Description: RBSOBJOWNINGPTRaRRAY.H
+* Description:  RBSOBJOWNINGPTRaRRAY.H
 *
 */
 
+
 #ifndef _RBSOBJOWNINGPTRARRAY_H
 #define _RBSOBJOWNINGPTRARRAY_H
 
--- a/brandingserver/inc/rbsobjowningptrarray.inl	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/inc/rbsobjowningptrarray.inl	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: rbsobjowningptrarray.inl
+* Description:  rbsobjowningptrarray.inl
 *
 */
 
 
+
 #include <e32base.h>
 
 // -----------------------------------------------------------------------------
--- a/brandingserver/inc/tbselementiterator.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/inc/tbselementiterator.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description: tbselementiterator.h
+* Description:  tbselementiterator.h
 *
 */
 
 
 
+
 #ifndef TBSELEMENTITERATOR_H
 #define TBSELEMENTITERATOR_H
 
--- a/brandingserver/inc/tbsmdescarrayadapter.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/inc/tbsmdescarrayadapter.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,10 +11,11 @@
 *
 * Contributors:
 *
-* Description:  One value adapter for MDesCArray.
+* Description:   One value adapter for MDesCArray.
 *
 */
 
+
 #ifndef TBSMDESCARRAYADAPTER_H__
 #define TBSMDESCARRAYADAPTER_H__
 
--- a/brandingserver/rom/brandingserver.iby	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/rom/brandingserver.iby	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: Branding Server IBY
+* Description:  Branding Server IBY
 *
 */
+
 #ifndef __BS_IBY__
 #define __BS_IBY__
 
@@ -31,7 +32,5 @@
 // backup registration file
 data=ZPRIVATE\102828dd\backup_registration.xml	private\102828dd\backup_registration.xml
 
-// stubsis file
-data=DATAZ_/system/install/bsstub.sis    system/install/bsstub.sis
 
 #endif // __BS_IBY__
\ No newline at end of file
--- a/brandingserver/sis/bs.pkg	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/sis/bs.pkg	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 ; 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 "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,9 +11,8 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:  
 ;
-;Language
 &EN
 
 ;Header
--- a/brandingserver/sis/bsstub.pkg	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/sis/bsstub.pkg	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 ; 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 "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,27 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
-;
-;
-; Package file for presencefw SIS stub in ROM
-; and a ximp framework upgrade SIS.
-; Including the stub in ROM enables components
-; defined in stub to be updated by SIS installer.
-; When adding or removing components from presencefw
-; please update this pkg file and create an updated
-; stub to group directory.
-;
-; To create SIS stub: makesis -s ximpfw_upgrade.pkg ximpfwstub.sis
-; Copy ximpfwstub.sis to z:\system\install\ximpfwstub.sis
-; or use abld export to export it automatically.
+; Description:  
 ;
 
 ;Language
 &EN
 
 ;Header
-#{"BS"}, (0x102828DE), 1, 0, 0, TYPE=SA, RU
+#{"BS"}, (0x102828DE), 1, 0, 0, TYPE=SA
 
 
 ;Localised VendorID
@@ -41,7 +28,7 @@
 :"Nokia"
 
 ;binaries
-""-"z:\sys\bin\bsserver.exe"
-""-"z:\sys\bin\bsclient.dll"
+""-"!:\sys\bin\bsserver.exe"
+""-"!:\sys\bin\bsclient.dll"
 
 
Binary file brandingserver/sis/bsstub.sis has changed
--- a/brandingserver/tools/bsimport/group/bld.inf	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/group/bld.inf	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: bld.inf file project inclusions.
+* Description:  bld.inf file project inclusions.
 *
 */
+
 // BLD.INF
 
 PRJ_MMPFILES
--- a/brandingserver/tools/bsimport/group/brandimporter_UID_.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/group/brandimporter_UID_.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: UID file
+* Description:  UID file
 *
 */
+
 // Makmake-generated uid source file
 #include <e32cmn.h>
 #pragma data_seg(".SYMBIAN")
--- a/brandingserver/tools/bsimport/group/importer.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/group/importer.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Project definition file for project bsimport
+* Description:   Project definition file for project bsimport
 *
 */
 
 
+
 #include <platform_paths.hrh>
 
 TARGET          bsimport.exe
--- a/brandingserver/tools/bsimport/group/installer.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/group/installer.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Project definition file for project bsinstall
+* Description:   Project definition file for project bsinstall
 *
 */
 
 
+
 #include <platform_paths.hrh>
 
 TARGET          bsinstall.exe
--- a/brandingserver/tools/bsimport/inc/cbsimportconstants.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/inc/cbsimportconstants.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: Constants header file
+* Description:  Constants header file
 *
 */
+
 // CONSTANTS
 
 // default build language
--- a/brandingserver/tools/bsimport/inc/cbsimportfilereader.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/inc/cbsimportfilereader.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,153 +11,80 @@
 *
 * Contributors:
 *
-* Description:  Import reader opens and reads the XML file to CMDXMLDocument 
-
+* Description:   Import reader opens and reads the XML file to CMDXMLDocument 
 *                object
-
 *
 */
 
 
 #ifndef CBSIMPORTFILEREADER_H
-
 #define CBSIMPORTFILEREADER_H
 
-
-
 #include <e32base.h>
-
 #include <gmxmlparser.h>
 
-
-
 class CMDXMLDocument;
-
 class CActiveScheduler;
 
-
-
 /**
-
  *  Import reader opens and reads the XML file to CMDXMLDocument object
-
  *
-
  *  @lib brandimporter.exe
-
  *  @since S60 v3.2
-
  */
-
 class CBSImportFileReader : public CBase,
-
                             public MMDXMLParserObserver
-
     {
-
 public:
 
-
-
     static CBSImportFileReader* NewL( TBool aUseScheduler );
-
     
-
     static CBSImportFileReader* NewLC( TBool aUseScheduler );
-
     
-
     ~CBSImportFileReader();
 
-
-
     /**
-
      * Reads XML file to CMDXMLDocument object
-
      *
-
      * @since S60 v3.2
-
      * @param aFs file system handle
-
      * @param aFileName XML file to read
-
      */
-
     CMDXMLDocument* ReadXMLFileL( RFs& aFs, const TDesC& aFileName );
-
     
-
 private:
 
-
-
     void ConstructL();
 
-
-
     CBSImportFileReader( TBool aUseScheduler );
 
-
-
 // from base class MMDXMLParserObserver
 
-
-
     /**
-
      * From MMDXMLParserObserver.
-
      * Writes text to log
-
      *
-
      * @since S60 v3.2
-
      * @param aText text to write
-
      */
-
     void ParseFileCompleteL();
-
             
-
 private: // Data
-
     
-
     // Own. XML parser
-
     CMDXMLParser* iParser;
-
     
-
     // Own. XML document from parser
-
     CMDXMLDocument* iDocument;
 
-
-
     // Own. ActiveScheduler
-
     CActiveScheduler* iScheduler;
 
-
-
     // Own. Scheduler waiter. Used when we can't use scheduler directly.    
-
     CActiveSchedulerWait* iWaiter;
-
     
-
     // Wheter we use CActiveScheduler or CActiveSchedulerWait
-
     TBool iUseScheduler;
-
     };
 
-
-
 #endif //CBSIMPORTFILEREADER_H
-
--- a/brandingserver/tools/bsimport/inc/cbsimportmanager.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/inc/cbsimportmanager.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Import manager handles the reading, parsing and writing of
+* Description:   Import manager handles the reading, parsing and writing of
 *                Brand data.
 *
 */
 
+
 #ifndef CBSIMPORTMANAGER_H
 #define CBSIMPORTMANAGER_H
 
--- a/brandingserver/tools/bsimport/inc/cbsimportstorage.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/inc/cbsimportstorage.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Stores element data and writes it to stream
+* Description:   Stores element data and writes it to stream
 *
 */
 
 
+
 #ifndef CBSIMPORTSTORAGE_H
 #define CBSIMPORTSTORAGE_H
 
--- a/brandingserver/tools/bsimport/inc/cbsimportstoragemanager.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/inc/cbsimportstoragemanager.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Storage handler
+* Description:   Storage handler
 *
 */
 
 
+
 #ifndef CBSIMPORTSTORAGEMANAGER_H
 #define CBSIMPORTSTORAGEMANAGER_H
 
--- a/brandingserver/tools/bsimport/inc/cbsimportxmlparser-1.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/inc/cbsimportxmlparser-1.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,6 +11,7 @@
 *
 * Contributors:
 *
-* Description:  Parses XML content and stores data to storage*
+* Description:   Parses XML content and stores data to storage*
 */
+
 #ifndef CBSIMPORTXMLPARSER_H#define CBSIMPORTXMLPARSER_H// INCLUDE FILES#include <e32base.h>#include <f32file.h>#include <GMXMLDocument.h>#include <rbsobjowningptrarray.h>#include <mbselement.h>class CMDXMLNode;class CBSImportStorageManager;// CLASS DEFINITIONclass CBSImportXMLParser : public CBase    {private: // Definitions    struct TImportBitmap        {        TInt iBitmapId;        TInt iBitmapMaskId;        TInt iSkinId;        TInt iSkinMaskId;        };    enum TXMLBaseTagTypes        {        EBrandUnknown,        EBrandAppID,        EBrandID,        EBrandLanguage,        EBrandVersion,        EBrandElement        };        public:    static CBSImportXMLParser* NewL( CBSImportStorageManager* aStorage );        static CBSImportXMLParser* NewLC( CBSImportStorageManager* aStorage );    ~CBSImportXMLParser();    /**     * Parse XML document and store data to storage     *     * @since S60 3.2     * @param aDocument XML document to parse     * @return none     */    void ParseDocumentL( CMDXMLDocument& aDocument );private:    CBSImportXMLParser( CBSImportStorageManager* aStorage );        void ConstructL();        /**     * Parses full the base element <branding> and it's child elements.     *     * @since S60 v3.2     * @param aElement to parse     */    void ParseDocumentBaseL( CMDXMLNode* aElement );        /**     * Analyzes a child node of <branding> and stores the value to storage.     * Ignores undetected XML nodes.     *     * @since S60 v3.2     * @param aElement to parse     */    void AnalyzeNodeL( CMDXMLNode* aNode );        /**     * Converts a given node to TXMLBaseTagTypes. This can handle all     * child nodes of <branding>     *     * @since S60 v3.2     * @param aNode node to check     * @return corresponding TXMLBaseTagTypes value (or EBrandUnknown).     */    TXMLBaseTagTypes SolveTagTypeL( CMDXMLNode* aNode );    /**     * Parses full <element> node. Returns a newly constructed MBSElement     * from the content of teh node.      * Ownership is transferred!     *     * @since S60 v3.2     * @param aNode <element> node     * @return Concrete element constructed from node.      */    MBSElement* ParseBrandElementL( CMDXMLNode* aNode );        /**     * Converts elements type attribute value to TBSElementType      * (see MBSElement).     *     * @since S60 v3.2     * @param aType value of type attribute     * @return corresponding TBrandingElementType value or KErrNotFound.     */    TInt SolveElementType( const TDesC& aType );    /**     * Search a child node with name inside another node. Returns the first match     *     * @since S60 v3.2     * @param aNode parent node to search      * @param aTagName Child nodes name     * @return found node or NULL if not found;     */    CMDXMLNode* SearchChild( CMDXMLNode* aNode, const TDesC& aChildName );    /**     * Parse value from <element_value> tag. Leaves if parse fails.     * Ownership is transferred to caller (NodeTextLC)     *     * @since S60 3.2     * @param aNode XML node to parse. should be <element_value>.     * @return value from <element_value>     */    HBufC* NodeTextLC( CMDXMLNode* elNode );    TInt   NodeIntL  ( CMDXMLNode* elNode );        /**     * Parse <element> tag for given value type. Leaves if parsing fails.     *     * @since S60 3.2     * @param aNode XML node to parse     * @param aValue Parsed value     * @return none     */    void DoParseIntegerL( CMDXMLNode* aNode, TInt& aValue );    void DoParseTextL   ( CMDXMLNode* aNode, HBufC*& aText );    void DoParseFileL   ( CMDXMLNode* aNode, HBufC*& aText );    void DoParseListL   ( CMDXMLNode* aNode, RBSObjOwningPtrArray<MBSElement>& aElementArray );    void DoParseBitmapL ( CMDXMLNode* aNode, CBSBitmap*& aBitmap );    private: // Data        // Not owned. Storage where to put parsed elements    CBSImportStorageManager* iStorage;    };#endif //CBSIMPORTXMLPARSER_H
\ No newline at end of file
--- a/brandingserver/tools/bsimport/inc/cbsimportxmlparser.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/inc/cbsimportxmlparser.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,307 +11,157 @@
 *
 * Contributors:
 *
-* Description:  Parses XML content and stores data to storage
-
+* Description:   Parses XML content and stores data to storage
 *
 */
 
 
 #ifndef CBSIMPORTXMLPARSER_H
-
 #define CBSIMPORTXMLPARSER_H
 
-
-
 // INCLUDE FILES
-
 #include <e32base.h>
-
 #include <f32file.h>
-
 #include <gmxmldocument.h>
-
 #include <rbsobjowningptrarray.h>
-
 #include <mbselement.h>
 
-
-
 class CMDXMLNode;
-
 class CBSImportStorageManager;
 
-
-
 // CLASS DEFINITION
-
 class CBSImportXMLParser : public CBase
-
     {
-
 private: // Definitions
 
-
-
     struct TImportBitmap
-
         {
-
         TInt iBitmapId;
-
         TInt iBitmapMaskId;
-
         TInt iSkinId;
-
         TInt iSkinMaskId;
-
         };
 
-
-
     enum TXMLBaseTagTypes
-
         {
-
         EBrandUnknown,
-
         EBrandAppID,
-
         EBrandID,
-
         EBrandLanguage,
-
         EBrandVersion,
-
         EBrandElement
-
         };
-
         
-
 public:
 
-
-
     static CBSImportXMLParser* NewL( CBSImportStorageManager* aStorage );
-
     
-
     static CBSImportXMLParser* NewLC( CBSImportStorageManager* aStorage );
 
-
-
     ~CBSImportXMLParser();
 
-
-
     /**
-
      * Parse XML document and store data to storage
-
      *
-
      * @since S60 3.2
-
      * @param aDocument XML document to parse
-
      * @return none
-
      */
-
     void ParseDocumentL( CMDXMLDocument& aDocument );
 
-
-
 private:
 
-
-
     CBSImportXMLParser( CBSImportStorageManager* aStorage );
-
     
-
     void ConstructL();
-
     
-
     /**
-
      * Parses full the base element <branding> and it's child elements.
-
      *
-
      * @since S60 v3.2
-
      * @param aElement to parse
-
      */
-
     void ParseDocumentBaseL( CMDXMLNode* aElement );
-
-    
-
-    /**
-
-     * Analyzes a child node of <branding> and stores the value to storage.
-
-     * Ignores undetected XML nodes.
-
-     *
-
-     * @since S60 v3.2
-
-     * @param aElement to parse
-
-     */
-
-    void AnalyzeNodeL( CMDXMLNode* aNode );
-
     
-
     /**
-
-     * Converts a given node to TXMLBaseTagTypes. This can handle all
-
-     * child nodes of <branding>
-
+     * Analyzes a child node of <branding> and stores the value to storage.
+     * Ignores undetected XML nodes.
      *
-
      * @since S60 v3.2
-
+     * @param aElement to parse
+     */
+    void AnalyzeNodeL( CMDXMLNode* aNode );
+    
+    /**
+     * Converts a given node to TXMLBaseTagTypes. This can handle all
+     * child nodes of <branding>
+     *
+     * @since S60 v3.2
      * @param aNode node to check
-
      * @return corresponding TXMLBaseTagTypes value (or EBrandUnknown).
-
      */
-
     TXMLBaseTagTypes SolveTagTypeL( CMDXMLNode* aNode );
 
-
-
-    /**
-
-     * Parses full <element> node. Returns a newly constructed MBSElement
-
-     * from the content of teh node. 
-
-     * Ownership is transferred!
-
-     *
-
-     * @since S60 v3.2
-
-     * @param aNode <element> node
-
-     * @return Concrete element constructed from node. 
-
-     */
-
-    MBSElement* ParseBrandElementL( CMDXMLNode* aNode );
-
-    
-
     /**
-
-     * Converts elements type attribute value to TBSElementType 
-
-     * (see MBSElement).
-
+     * Parses full <element> node. Returns a newly constructed MBSElement
+     * from the content of teh node. 
+     * Ownership is transferred!
      *
-
      * @since S60 v3.2
-
+     * @param aNode <element> node
+     * @return Concrete element constructed from node. 
+     */
+    MBSElement* ParseBrandElementL( CMDXMLNode* aNode );
+    
+    /**
+     * Converts elements type attribute value to TBSElementType 
+     * (see MBSElement).
+     *
+     * @since S60 v3.2
      * @param aType value of type attribute
-
      * @return corresponding TBrandingElementType value or KErrNotFound.
-
      */
-
     TInt SolveElementType( const TDesC& aType );
 
-
-
     /**
-
      * Search a child node with name inside another node. Returns the first match
-
      *
-
      * @since S60 v3.2
-
      * @param aNode parent node to search 
-
      * @param aTagName Child nodes name
-
      * @return found node or NULL if not found;
-
      */
-
     CMDXMLNode* SearchChild( CMDXMLNode* aNode, const TDesC& aChildName );
 
-
-
     /**
-
      * Parse value from <element_value> tag. Leaves if parse fails.
-
      * Ownership is transferred to caller (NodeTextLC)
-
      *
-
      * @since S60 3.2
-
      * @param aNode XML node to parse. should be <element_value>.
-
      * @return value from <element_value>
-
      */
-
     HBufC* NodeTextLC( CMDXMLNode* elNode );
-
     TInt   NodeIntL  ( CMDXMLNode* elNode );
-
     
-
     /**
-
      * Parse <element> tag for given value type. Leaves if parsing fails.
-
      *
-
      * @since S60 3.2
-
      * @param aNode XML node to parse
-
      * @param aValue Parsed value
-
      * @return none
-
      */
-
     void DoParseIntegerL( CMDXMLNode* aNode, TInt& aValue );
-
     void DoParseTextL   ( CMDXMLNode* aNode, HBufC*& aText );
-
     void DoParseFileL   ( CMDXMLNode* aNode, HBufC*& aText );
-
     void DoParseListL   ( CMDXMLNode* aNode, RBSObjOwningPtrArray<MBSElement>& aElementArray );
-
     void DoParseBitmapL ( CMDXMLNode* aNode, CBSBitmap*& aBitmap );
-
     
-
 private: // Data
-
     
-
     // Not owned. Storage where to put parsed elements
-
     CBSImportStorageManager* iStorage;
-
     };
 
-
-
 #endif //CBSIMPORTXMLPARSER_H
-
--- a/brandingserver/tools/bsimport/inc/importlogwriter.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/inc/importlogwriter.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description:  Log writer macros
+* Description:   Log writer macros
 *
 */
 
 
 
+
 /*
 *
 *  Description:
--- a/brandingserver/tools/bsimport/src/bsbrandremover.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/src/bsbrandremover.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,10 +11,11 @@
 *
 * Contributors:
 *
-* Description:  Removes brands from branding server
+* Description:   Removes brands from branding server
 *
 */
 
+
 #include <utf.h>
 
 #include <cbsfactory.h>
--- a/brandingserver/tools/bsimport/src/bsbrandremover.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/src/bsbrandremover.h	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,10 +11,11 @@
 *
 * Contributors:
 *
-* Description:  Helper class for removing brands
+* Description:   Helper class for removing brands
 *
 */
 
+
 #ifndef BSBRANDREMOVER_H
 #define BSBRANDREMOVER_H
 
--- a/brandingserver/tools/bsimport/src/cbsimportfilereader.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/src/cbsimportfilereader.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description:  Import reader opens and reads the XML file to CMDXMLDocument 
+* Description:   Import reader opens and reads the XML file to CMDXMLDocument 
 *                object
 *
 */
 
 
+
 #include <f32file.h>
 #include <gmxmldocument.h>
 
--- a/brandingserver/tools/bsimport/src/cbsimportmanager.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/src/cbsimportmanager.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description:  Import manager handles the reading, parsing and writing of
+* Description:   Import manager handles the reading, parsing and writing of
 *                Brand data.
 *
 */
 
 
+
 #include <s32file.h>
 #include <cbsfactory.h>
 #include <mbsupdater.h>
--- a/brandingserver/tools/bsimport/src/cbsimportstorage.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/src/cbsimportstorage.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Stores element data and writes it to stream
+* Description:   Stores element data and writes it to stream
 *
 */
 
 
+
 #include <s32strm.h>
 #include <utf.h>
 #include <cbsfactory.h>
--- a/brandingserver/tools/bsimport/src/cbsimportstoragemanager.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/src/cbsimportstoragemanager.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Stores element data and writes it to stream
+* Description:   Stores element data and writes it to stream
 *
 */
 
 
+
 #include <s32strm.h>
 #include <s32file.h>
 #include <f32file.h>
--- a/brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Parses XML content and stores data to storage
+* Description:   Parses XML content and stores data to storage
 *
 */
 
 
+
 #include <e32cons.h>
 #include <gmxmlelement.h>
 #include <gmxmltext.h>
--- a/brandingserver/tools/bsimport/src/importer.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/src/importer.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Global methods for brandimporter
+* Description:   Global methods for brandimporter
 *
 */
 
 
+
 #include <e32base.h>
 #include <e32cons.h>
 #include <bacline.h>
--- a/brandingserver/tools/bsimport/src/installer.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/bsimport/src/installer.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 * Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description:  Global methods for brandinstaller
+* Description:   Global methods for brandinstaller
 *
 */
 
 
+
 #include <e32base.h>
 #include <eikenv.h>
 #include <f32file.h>
--- a/brandingserver/tools/makefile/import.mk	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/makefile/import.mk	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 # Copyright (c) 2006 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 "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
@@ -11,7 +11,7 @@
 #
 # Contributors:
 #
-# Description: make file
+# Description:  make file
 #
 
 
--- a/brandingserver/tools/sis/brand-example.pkg	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/sis/brand-example.pkg	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 ; Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description:  Example PKG file for branding installer
+; Description:   Example PKG file for branding installer
 ;
 
 ; -------- general --------
--- a/brandingserver/tools/sis/import_data/install.txt	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/sis/import_data/install.txt	Tue Aug 31 15:31:29 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
-#
-#
--- a/brandingserver/tools/sis/make-example.cmd	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/sis/make-example.cmd	Tue Aug 31 15:31:29 2010 +0300
@@ -1,8 +1,9 @@
+@echo off
 rem
 rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 rem All rights reserved.
 rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
+rem under the terms of the License "Eclipse Public License v1.0"
 rem which accompanies this distribution, and is available
 rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 rem
@@ -11,8 +12,9 @@
 rem
 rem Contributors:
 rem
-rem Description: Example to make the brand sis file
+rem Description:  Example to make the brand sis file
 rem
+@echo on
 
 @echo off
 call t:\epoc32\tools\makesis brand-example.pkg
--- a/brandingserver/tools/xml/loc2xml.pl	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/xml/loc2xml.pl	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 # Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
@@ -11,7 +11,7 @@
 #
 # Contributors:
 #
-# Description:  Converts loc file into branding xml file
+# Description:   Converts loc file into branding xml file
 #
 
 #------------------------------------------------------------------------------
--- a/brandingserver/tools/xml/mbg2xml.pl	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/xml/mbg2xml.pl	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 # Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
@@ -11,7 +11,7 @@
 #
 # Contributors:
 #
-# Description:  Converts mbg file into branding xml file
+# Description:   Converts mbg file into branding xml file
 #
 
 # SETUP
--- a/brandingserver/tools/xml/xml2h.pl	Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/tools/xml/xml2h.pl	Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
 # Copyright (c) 2006-2006 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 "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
@@ -11,7 +11,7 @@
 #
 # Contributors:
 #
-# Description:  Writes a header file based on brand xml file
+# Description:   Writes a header file based on brand xml file
 #
 
 #------------------------------------------------------------------------------
--- a/group/bld.inf	Thu Aug 19 10:14:19 2010 +0300
+++ b/group/bld.inf	Tue Aug 31 15:31:29 2010 +0300
@@ -27,7 +27,7 @@
 #include "../imsrv_plat/group/bld.inf"
 #include "../ximpfw/group/bld.inf"
 #include "../imservices/group/bld.inf"
-#include "../brandingserver/group/bld.inf"
+#include "../brandingserver/Group/bld.inf"
 
 PRJ_TESTMMPFILES
 
--- a/imservices/imfeatureplugin/group/bld.inf	Thu Aug 19 10:14:19 2010 +0300
+++ b/imservices/imfeatureplugin/group/bld.inf	Tue Aug 31 15:31:29 2010 +0300
@@ -24,7 +24,7 @@
 PRJ_EXPORTS
 ../rom/imfeatureplugin.iby						 CORE_MW_LAYER_IBY_EXPORT_PATH(imfeatureplugin.iby)
 // ROM SIS stubs
-../sis/imfeaturepluginstub.sis	             /epoc32/data/Z/System/Install/imfeaturepluginstub.sis
+../sis/imfeaturepluginstub.sis	             /epoc32/data/z/system/install/imfeaturepluginstub.sis
 
 PRJ_MMPFILES
 ../srcimdatamodel/group/imdatamodel.mmp
--- a/imservices/imfeatureplugin/srcimdatamodel/imconversation/conversationsubscriptionitem.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/imservices/imfeatureplugin/srcimdatamodel/imconversation/conversationsubscriptionitem.h	Tue Aug 31 15:31:29 2010 +0300
@@ -71,7 +71,7 @@
      * Ownership is transferred!
      * @param aList New blocklist.
      */
-    void  SetConversationInfoL(CImConversationInfoImp* aImMessage);
+    IMPORT_C void  SetConversationInfoL(CImConversationInfoImp* aImMessage);
 public: // From MXIMPSubscriptionItem
 
     /**
--- a/imservices/instantmessagingcache/group/bld.inf	Thu Aug 19 10:14:19 2010 +0300
+++ b/imservices/instantmessagingcache/group/bld.inf	Tue Aug 31 15:31:29 2010 +0300
@@ -24,7 +24,7 @@
 ../rom/instantmessagingcache.iby						 	CORE_MW_LAYER_IBY_EXPORT_PATH(instantmessagingcache.iby)
 
 // ROM SIS stubs
-../sis/imcachestub.sis	             /epoc32/data/Z/System/Install/imcachestub.sis
+../sis/imcachestub.sis	             /epoc32/data/z/system/install/imcachestub.sis
 // module include
 #include "../imcacheserver/group/bld.inf"
 #include "../imcacheclient/group/bld.inf"
--- a/imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -100,7 +100,8 @@
 			}
 	   case EIMOperationCompleted :
 	   		{
-	   		iUpdateHandler.HandleIMCacheEventL( EIMCacheRequestCompleted, NULL );	
+	   		iUpdateHandler.HandleIMCacheEventL( EIMCacheRequestCompleted, NULL );
+			break;	
 	   		}
 	    case EIMOperationChatStarted :
 		    {
--- a/imservices/instantmessagingcache/imcacheserver/group/imcacheserver.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/imservices/instantmessagingcache/imcacheserver/group/imcacheserver.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -50,7 +50,7 @@
 LIBRARY         flogger.lib
 LIBRARY         charconv.lib
 LIBRARY     	commonengine.lib
-LIBRARY         rsfwmountman.lib
+////LIBRARY         rsfwmountman.lib
 LIBRARY 		estor.lib 
 LIBRARY     	ecom.lib 
 
--- a/imservices/instantmessagingcache/imcacheserver/inc/ccacheserveractivehelper.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/imservices/instantmessagingcache/imcacheserver/inc/ccacheserveractivehelper.h	Tue Aug 31 15:31:29 2010 +0300
@@ -102,10 +102,8 @@
           * publishes the message info to the plugins
           * @param aSenderId, buddy id
           * @param aServiceId, service id
-          * @Param aCloseConversation indicates that the event came from closing the ocnversation.
           */
-		 void  PublishMessageInfoL(const TDesC& aSenderId,TInt aServiceId,
-		                            TBool aCloseConversation = EFalse );
+		 void  PublishMessageInfoL(const TDesC& aSenderId,TInt aServiceId );
 
     										
 public:	
--- a/imservices/instantmessagingcache/imcacheserver/src/ccacheserveractivehelper.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/imservices/instantmessagingcache/imcacheserver/src/ccacheserveractivehelper.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -226,30 +226,19 @@
 		}
 	// if there are no unread messages then reset the status pane indicator.
 	TInt unreadCount = 0;
-	TInt currentContactUnReadCount = 0;
     TInt headerCount = iHeaderArray.Count();
-    TInt id = 0;
     for( TInt i=0; i< headerCount; i++ )
         {
         // note in this case reciepient is own user id 
         MIMCacheMessageHeader* header = iHeaderArray[i];
         if( header->ServiceId() == sericeId )   
             {
-			if(buddyId->Compare(iHeaderArray[i]->BuddyId()) == 0)
-				{
-				currentContactUnReadCount = header->UnreadMessageCount();
-				}
-            if(header->UnreadMessageCount()) 
-               	{
-				id = i;
-            	}
-            
+            unreadCount = unreadCount + header->UnreadMessageCount();   
             }
         }
-    
-    if(!currentContactUnReadCount)
+    if(!unreadCount)
         {
-		PublishMessageInfoL(iHeaderArray[id]->BuddyId(),sericeId);
+        PublishMessageInfoL(*buddyId,sericeId);
         }
     
 	CleanupStack::PopAndDestroy(buddyId);
@@ -441,37 +430,7 @@
             {
             iActiveHeader = NULL;
             }
-        // remove the universal indicator notification if there are no more unread messages,
-        // apart form whose conversation is closed. loop through
-        TInt headerCount = iHeaderArray.Count();
-        headerIndex = KErrNotFound;
-        for( TInt i=0; i<  headerCount; i++ )
-            {
-            // note in this case reciepient is own user id 
-            MIMCacheMessageHeader* header = iHeaderArray[i];
-            TRACE(T_LIT( "CCacheServerActiveHelper::PublishMessageInfoL UnreadMessageCount -- %d"), header->UnreadMessageCount());
-            if(  header->ServiceId() == sericeId && header->UnreadMessageCount() )   
-                {
-                // this is required in the following scenario
-                // you receive 10 new messgaes form two parties(5, each)
-                // whne you close the conversation form one, the universal indicator is still 
-                // for the other party's messages, and when clicked on universal indicator it should
-                // open the conversation view wiht the latest user id.
-                headerIndex = i;
-                }
-            }
-        // there are new messages received form only one party.
-        // hence the buddyid is required as conversation view will be openend.
-        if(KErrNone == headerIndex)
-            {
-            PublishMessageInfoL(iHeaderArray[headerIndex]->BuddyId(), sericeId, ETrue);
-            }
-        // new messages are recieved from multiple parties, hence no need of the sender id
-        // as the service tab will be opened.
-        else
-            {
-            PublishMessageInfoL(KNullDesC(), sericeId,ETrue);
-            }
+       
 		PackAndNotifyEventL( EIMOperationChatDeleted, sericeId, msgHeader, NULL ); 
 		 
         delete msgHeader;
@@ -510,10 +469,6 @@
         }
     if( needToNotify )
         {
-        // remove the universal indicator notification if there it was displayed,
-        // as when you logout all the ocnversations are removed.
-        PublishMessageInfoL(KNullDesC(), aServiceId, ETrue);
-        
         PackAndNotifyEventL( EIMOperationAllChatDeleted, aServiceId, NULL, NULL ); 
         }
     TRACE( T_LIT( "CCacheServerActiveHelper::CloseAllConversationL  End") );
@@ -595,7 +550,6 @@
 	{
 	TRACE( T_LIT( "CCacheServerActiveHelper::GetServiceChatHeaderArrayL	start") );		
 	
-	CleanupClosePushL(aServiceHeaderArray);
    
     if( -1 == aServiceId )
         {
@@ -612,7 +566,6 @@
                 }
             }        
         }
-    CleanupStack::Pop(&aServiceHeaderArray);
     TRACE( T_LIT( "CCacheServerActiveHelper::GetServiceChatHeaderArrayL    end") );
 	}
 
@@ -669,8 +622,7 @@
 // name of history data
 // -----------------------------------------------------------------------------
 //
-void  CCacheServerActiveHelper::PublishMessageInfoL(const TDesC& aSenderId,TInt aServiceId, 
-                                                    TBool aCloseConversation /*= EFalse*/ )
+void  CCacheServerActiveHelper::PublishMessageInfoL(const TDesC& aSenderId,TInt aServiceId )
     {
     // set/reset  the status pane indicator here
     // based on the unread count.
@@ -700,7 +652,7 @@
     for ( TInt index = 0; index < count; ++index )
         {
         //trap is required if one plugin leaves then it should continue with other plugins.
-        TRAP_IGNORE(iPluginInfo[index]->Plugin().MessageInfoL(unreadCount,aServiceId,aSenderId,multipleSender,aCloseConversation));
+        TRAP_IGNORE(iPluginInfo[index]->Plugin().MessageInfoL(unreadCount,aServiceId,aSenderId,multipleSender));
         }
     }
  // -----------------------------------------------------------------------------
--- a/imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -241,14 +241,7 @@
 			if( iPacketsArray.Count() )
 				{
 				CIMCacheBufferArray* packet = iPacketsArray[ 0 ] ;
-				if( packet->OperationCode() ==  EIMOperationFetchAll )
-					{
-					iObserverMessage.Complete( EIMOperationDataAvailable );
-					}
-				else
-					{
-					iObserverMessage.Complete( packet->OperationCode() );
-					}
+				iObserverMessage.Complete( packet->OperationCode() );
 				iObserverActive = EFalse;
 				}
 			
@@ -285,14 +278,7 @@
 			 if( iPacketsArray.Count() )
 				{
 				CIMCacheBufferArray* packet = iPacketsArray[ 0 ] ;
-				if( packet->OperationCode() ==  EIMOperationFetchAll )
-					{
-					iObserverMessage.Complete( EIMOperationUnreadChange );
-					}
-				else
-					{
-					iObserverMessage.Complete( packet->OperationCode() );
-					}
+				iObserverMessage.Complete( packet->OperationCode() );
 				iObserverActive = EFalse;
 				}
 	     	break;
@@ -574,7 +560,7 @@
 	{
 	// write the message into continuous memory stream
 	if( iAccessorInitialized  || 
-		iConvesationInitialized /*&& aMsgHeader->IsChatStarted()*/ )
+		iConvesationInitialized && aMsgHeader->IsChatStarted() )
 		{
 		ExternalizeSingleChatDataL(EIMOperationUnreadMessage, aMsgHeader, aMessage );
 		if( iObserverActive )
--- a/imservices/xmppsettingsapi/group/bld.inf	Thu Aug 19 10:14:19 2010 +0300
+++ b/imservices/xmppsettingsapi/group/bld.inf	Tue Aug 31 15:31:29 2010 +0300
@@ -24,14 +24,12 @@
 DEFAULT
 
 PRJ_EXPORTS
+../rom/xmppsettingsapi.iby						 CORE_MW_LAYER_IBY_EXPORT_PATH(xmppsettingsapi.iby)
+1020E334.txt                					 /epoc32/data/z/private/10202be9/1020e334.txt				//temporary
+1020E334.txt                					 /epoc32/release/winscw/udeb/z/private/10202be9/1020e334.txt	//temporary
 
-#ifdef FF_MECO_XMPP
-../rom/xmppsettingsapi.iby						 CORE_MW_LAYER_IBY_EXPORT_PATH(xmppsettingsapi.iby)
-1020E334.txt                					 /epoc32/data/Z/private/10202be9/1020E334.txt				//temporary
-1020E334.txt                					 /epoc32/release/winscw/udeb/Z/private/10202be9/1020E334.txt	//temporary
+1020E334.txt                					 /epoc32/release/winscw/urel/z/private/10202be9/1020e334.txt	//temporary
 
-1020E334.txt                					 /epoc32/release/winscw/urel/Z/private/10202be9/1020E334.txt	//temporary
-#endif
 
 PRJ_MMPFILES
 xmppsettingsapi.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imservices/xmppsettingsapi/tsrc/conf/xmppsettings_api.cfg	Tue Aug 31 15:31:29 2010 +0300
@@ -0,0 +1,64 @@
+[Test]
+title Test_CreateSettingsRecordL
+create xmppsettings_api xmppsettings_apiObj
+xmppsettings_apiObj Test_CreateSettingsRecordL 
+delete xmppsettings_apiObj
+[Endtest] 
+
+[Test]
+title Test_DefaultSettingsRecord
+create xmppsettings_api xmppsettings_apiObj
+xmppsettings_apiObj Test_DefaultSettingsRecord 
+delete xmppsettings_apiObj
+[Endtest] 
+
+[Test]
+title Test_GetSettingsRecordIdArray
+create xmppsettings_api xmppsettings_apiObj
+xmppsettings_apiObj Test_GetSettingsRecordIdArray 
+delete xmppsettings_apiObj
+[Endtest]
+
+[Test]
+title Test_SetParamInt
+create xmppsettings_api xmppsettings_apiObj
+xmppsettings_apiObj Test_SetParamInt 
+delete xmppsettings_apiObj
+[Endtest]
+
+[Test]
+title Test_SetParamLDes
+create xmppsettings_api xmppsettings_apiObj
+xmppsettings_apiObj Test_SetParamLDes 
+delete xmppsettings_apiObj
+[Endtest]
+
+[Test]
+title Test_GetParamInt
+create xmppsettings_api xmppsettings_apiObj
+xmppsettings_apiObj Test_GetParamInt 
+delete xmppsettings_apiObj
+[Endtest]
+
+[Test]
+title Test_GetParamLDes
+create xmppsettings_api xmppsettings_apiObj
+xmppsettings_apiObj Test_GetParamLDes 
+delete xmppsettings_apiObj
+[Endtest]
+
+[Test]
+title Test_RemoveSettingsRecord
+create xmppsettings_api xmppsettings_apiObj
+xmppsettings_apiObj Test_RemoveSettingsRecord 
+delete xmppsettings_apiObj
+[Endtest]
+
+[Test]
+title Test_RemoveParam
+create xmppsettings_api xmppsettings_apiObj
+xmppsettings_apiObj Test_RemoveParam 
+delete xmppsettings_apiObj
+[Endtest]
+
+
--- a/imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt	Thu Aug 19 10:14:19 2010 +0300
+++ b/imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt	Tue Aug 31 15:31:29 2010 +0300
@@ -1,6 +1,5 @@
-#/*TYPE TESTCLASS*/
-#/*
-#Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+#
+# 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"
@@ -12,10 +11,9 @@
 #
 # Contributors:
 # 
-# Description: MMP file for STIF Test Framework's TestScripter 
-# testclass test module.
+# Description:
+#	
 #
-#*/
 
 # Doxyfile 1.4.1
 
--- a/imservices/xmppsettingsfetcher/group/bld.inf	Thu Aug 19 10:14:19 2010 +0300
+++ b/imservices/xmppsettingsfetcher/group/bld.inf	Tue Aug 31 15:31:29 2010 +0300
@@ -22,10 +22,7 @@
 DEFAULT
 
 PRJ_EXPORTS
-
-#ifdef FF_MECO_XMPP
 ../rom/xmppsettingsfetcher.iby						 CORE_MW_LAYER_IBY_EXPORT_PATH(xmppsettingsfetcher.iby)
-#endif
 
 PRJ_MMPFILES
 
--- a/imsrv_plat/im_cache_server_api/inc/cinstantmsgindicator.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/imsrv_plat/im_cache_server_api/inc/cinstantmsgindicator.h	Tue Aug 31 15:31:29 2010 +0300
@@ -61,11 +61,8 @@
           * @param aSeriveId, service id.
           * @param aSenderId, message sender id.
           * @param aMultipleSender, count of number of P-2_p chats.
-          * @param aCloseConversation, indicates that this even came from closing the 
-          * conversation and hence no need to paly the tone if there were already new messages.
           */
- 	   virtual void MessageInfoL(TInt aNewMessages, TInt aSeriveId,const TDesC& aSenderId,
- 	                             TInt aMultipleSenders,TBool aCloseConversation = EFalse) = 0;	
+ 	   virtual void MessageInfoL(TInt aNewMessages, TInt aSeriveId,const TDesC& aSenderId,TInt aMultipleSenders) = 0;	
 		 
      private:
          /**
--- a/imsrv_plat/ximp_core_feature_plugin_api/group/bld.inf	Thu Aug 19 10:14:19 2010 +0300
+++ b/imsrv_plat/ximp_core_feature_plugin_api/group/bld.inf	Tue Aug 31 15:31:29 2010 +0300
@@ -54,4 +54,4 @@
 ../inc/protocoldatahost.inl							MW_LAYER_PLATFORM_EXPORT_PATH(protocoldatahost.inl)
 ../inc/ximpitemparentbase.h							MW_LAYER_PLATFORM_EXPORT_PATH(ximpitemparentbase.h)
 ../inc/ximpsubscriptionitembase.h				MW_LAYER_PLATFORM_EXPORT_PATH(ximpsubscriptionitembase.h)
-../inc/ximpfeaturepluginifids.hrh				MW_LAYER_PLATFORM_EXPORT_PATH(ximpfeaturepluginifids.hrh)
+../inc/ximpfeaturepluginIfids.hrh				MW_LAYER_PLATFORM_EXPORT_PATH(ximpfeaturepluginifids.hrh)
--- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwteststatuseventlistener.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwteststatuseventlistener.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -186,7 +186,6 @@
         RArray< TXIMPTestStatusEventSnapshot >& aArray,
         TXIMPTestStatusEventTemplate aTemplate )
     {
-	CleanupClosePushL(aArray);
     switch( aTemplate )
         {
         // session handling
@@ -553,7 +552,6 @@
             Panic( EStatusEventListenerUnknownEventTemplate );
             }
         }
-		CleanupStack::Pop(&aArray);
     }
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imsrv_plat/ximp_im_data_model_api/inc/imoperationfactoryimp.h	Tue Aug 31 15:31:29 2010 +0300
@@ -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 "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:  Interface for Search info object.
+*
+*/
+
+
+#ifndef IMCOPERATIONFACTORYIMP_H
+#define IMCOPERATIONFACTORYIMP_H
+
+
+#include <e32base.h>
+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
+
--- a/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt	Thu Aug 19 10:14:19 2010 +0300
+++ b/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt	Tue Aug 31 15:31:29 2010 +0300
@@ -1,7 +1,5 @@
-#/*TYPE TESTCLASS*/
-#/*
-#Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-# All rights reserved.
+#
+# 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
@@ -12,11 +10,9 @@
 #
 # Contributors:
 # 
-# Description: MMP file for STIF Test Framework's TestScripter 
-# testclass test module.
+# Description:
 #
-#*/
-
+#
 # Doxyfile 1.4.1
 
 #---------------------------------------------------------------------------
--- a/ximpfw/core/srcprocessor/ximphostimp.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/core/srcprocessor/ximphostimp.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -137,7 +137,8 @@
 
     for ( int i = 0;i < 5;i++ )
         {
-        iCallBack.Append( new ( ELeave ) CAsyncCallBack( CActive::EPriorityHigh ) );
+        TInt Ret = iCallBack.Append( new ( ELeave ) CAsyncCallBack( CActive::EPriorityHigh ) );
+        UNUSED_FORMAL_PARAM(Ret);	
         }
     
     iCallBack[ECompleteRequestCallback]->Set( TCallBack( CompleteRequestCallback, this ) );
--- a/ximpfw/core/srcprocessor/ximphostimp.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/core/srcprocessor/ximphostimp.h	Tue Aug 31 15:31:29 2010 +0300
@@ -28,6 +28,7 @@
 #include "ximprequestidbuilder.h"
 
 
+
 class CXIMPOperationBase;
 class CXIMPEventManager;
 class MXIMPObjectFactory;
@@ -52,6 +53,8 @@
 class CProtocolPresenceDataHostImp;
 class MProtocolDataHost;
 
+#define UNUSED_FORMAL_PARAM(p) (void) p
+
 
 /**
  * Presence connection host.
--- a/ximpfw/core/srcutils/ximpobjecthelpers.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/core/srcutils/ximpobjecthelpers.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -59,7 +59,6 @@
 //
 EXPORT_C void TXIMPHBuf8Packer::UnPackArrayL( RPointerArray< HBufC8 >& aBufferArray, const TDesC8& aPack  )
     {
-	CleanupClosePushL( aBufferArray );
 	// No reset
     if ( ! aPack.Length() )
         {
@@ -84,7 +83,6 @@
         aBufferArray.AppendL( theObject );
 		}
     CleanupStack::Pop( objCount ); // all the objects
-    CleanupStack::PopAndDestroy(); // rs   
-    CleanupStack::Pop( &aBufferArray );
+    CleanupStack::PopAndDestroy(); // rs    
     }
 // End of file
--- a/ximpfw/presence/srcpresencecache/presencecacheserver/presencecacheservicestore.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/presence/srcpresencecache/presencecacheserver/presencecacheservicestore.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -137,10 +137,10 @@
 TInt CPresenceCacheServiceStore::AddBlind(CPresenceCacheBuddyStore* aBuddyStore)
     {
     TRACE( _L("CPresenceCacheServiceStore::AddBlind - begin") );
-    TRACE_1( _L("______identity: %S"), &(aBuddyStore->BuddyId()->Identity()));
-    
-    if(!aBuddyStore)
-        return KErrArgument;
+    if(aBuddyStore)
+      TRACE_1( _L("______identity: %S"), &(aBuddyStore->BuddyId()->Identity()));
+    else
+      return KErrArgument;
     
     iBuddyStoreCollection.Append(aBuddyStore);
     
@@ -163,13 +163,16 @@
                                             (MPresenceBuddyInfo* aBuddyPresInfo)
     {
     TRACE( _L("CPresenceCacheServiceStore::AddOrReplacePresence - begin") );
-    TRACE_1( _L("______identity: %S"), &(aBuddyPresInfo->BuddyId()->Identity()));
+    
     
     
     CPresenceCacheBuddyStore* newBuddyStore(NULL);
-    if(!aBuddyPresInfo)
-        return newBuddyStore;
-    
+    if(aBuddyPresInfo)
+      TRACE_1( _L("______identity: %S"), &(aBuddyPresInfo->BuddyId()->Identity()));
+    else
+    	{
+            return newBuddyStore;
+        }
     TBool oldPresExists(EFalse);
     
     TInt count = iBuddyStoreCollection.Count();
--- a/ximpfw/presence/srcpresencecache/presencecacheserver/presencecachesession.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/presence/srcpresencecache/presencecacheserver/presencecachesession.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -740,8 +740,11 @@
             CleanupStack::Pop(serviceStore);  
             }
         buddyStore = CPresenceCacheBuddyStore::NewLC(serviceStore,identity);
-        err = serviceStore->AddBlind(buddyStore); //ownership transferred
-        CleanupStack::Pop(buddyStore);
+        if(buddyStore)
+        	{
+        	err = serviceStore->AddBlind(buddyStore); //ownership transferred
+        	CleanupStack::Pop(buddyStore);
+        	}
         CleanupStack::Pop(identity);
         } 
     else
--- a/ximpfw/presence/srcpresencedatamodel/presencecache/presencebuddyinfolistimp.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/presence/srcpresencedatamodel/presencecache/presencebuddyinfolistimp.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -141,9 +141,10 @@
     MPresenceBuddyInfo* aPresenceBuddyInfo)
     {
     TRACE( _L("CPresenceBuddyInfoListImp::AddOrReplace - begin") );
-    TRACE_1( _L("______identity: %S"), &(aPresenceBuddyInfo->BuddyId()->Identity()));        
-    if(!aPresenceBuddyInfo)
-        return KErrArgument;
+    if(aPresenceBuddyInfo)
+    	TRACE_1( _L("______identity: %S"), &(aPresenceBuddyInfo->BuddyId()->Identity()));        
+    else
+    	return KErrArgument;
     
     if ( (ServiceName() != KNullDesC) && 
         (ExtractService( aPresenceBuddyInfo->BuddyId()->Identity()).Compare( ServiceName()) ))
--- a/ximpfw/tsrc/group/bld.inf	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/group/bld.inf	Tue Aug 31 15:31:29 2010 +0300
@@ -54,7 +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
 
--- a/ximpfw/tsrc/src/t_presenceall/t_presenceall.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceall/t_presenceall.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,9 +18,7 @@
 
 #include "eunittools.h"
 
-
-#include <platform/digia/eunit/eunitmacros.h>
-#include <platform/digia/eunit/teunitassertioninfo.h>
+#include <eunitmacros.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 
--- a/ximpfw/tsrc/src/t_presenceall/t_presenceall.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceall/t_presenceall.h	Tue Aug 31 15:31:29 2010 +0300
@@ -18,10 +18,7 @@
 #ifndef T_PRESENCEALL_H
 #define T_PRESENCEALL_H
 
-
-//  EXTERNAL INCLUDES
-#include <platform/digia/eunit/ceunittestsuiteclass.h>
-#include <platform/digia/eunit/EUnitDecorators.h>
+#include <ceunittestsuiteclass.h>
 #include <ximpbase.h>
 #include "prfwteststatuseventlistener.h"
 #include "prfwtestmessaging.h"
--- a/ximpfw/tsrc/src/t_presenceall/t_presenceall.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceall/t_presenceall.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,7 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
-#include<platform_paths.hrh>
-#include<eunitcaps.h>
 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
 
--- a/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,7 @@
 
 #include "eunittools.h"
 
-
-
-#include <platform/digia/eunit/eunitmacros.h>
-#include <platform/digia/eunit/teunitassertioninfo.h>
-
+#include <eunitmacros.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 
--- a/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.h	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,7 @@
 #ifndef T_PRESENCEAUTHORIZATION_H
 #define T_PRESENCEAUTHORIZATION_H
 
-
-//  EXTERNAL INCLUDES
-#include <platform/digia/eunit/ceunittestsuiteclass.h>
-#include <platform/digia/eunit/EUnitDecorators.h>
-
+#include <ceunittestsuiteclass.h>
 #include <ximpbase.h>
 #include "prfwteststatuseventlistener.h"
 #include "prfwtestmessaging.h"
--- a/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,12 +18,8 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
-#include<platform_paths.hrh>
-#include<eunitcaps.h>
 
 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
 
--- a/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,9 +18,7 @@
 
 #include "eunittools.h"
 
-
-#include <platform/digia/eunit/eunitmacros.h>
-#include <platform/digia/eunit/teunitassertioninfo.h>
+#include <eunitmacros.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 
--- a/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.h	Tue Aug 31 15:31:29 2010 +0300
@@ -18,10 +18,7 @@
 #ifndef T_PRESENCEBLOCKING_H
 #define T_PRESENCEBLOCKING_H
 
-
-//  EXTERNAL INCLUDES
-#include <platform/digia/eunit/ceunittestsuiteclass.h>
-#include <platform/digia/eunit/EUnitDecorators.h>
+#include <ceunittestsuiteclass.h>
 #include <ximpbase.h>
 #include "prfwteststatuseventlistener.h"
 #include "prfwtestmessaging.h"
--- a/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,7 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
-#include<platform_paths.hrh>
-#include<eunitcaps.h>
 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
--- a/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,10 +18,7 @@
 
 #include "eunittools.h"
 
-
-#include <platform/digia/eunit/eunitmacros.h>
-#include <platform/digia/eunit/teunitassertioninfo.h>
-
+#include <eunitmacros.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 
--- a/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,7 @@
 #ifndef T_PRESENCEGRANTREQUESTMANAGEMENT_H
 #define T_PRESENCEGRANTREQUESTMANAGEMENT_H
 
-
-//  EXTERNAL INCLUDES
-#include <platform/digia/eunit/ceunittestsuiteclass.h>
-#include <platform/digia/eunit/EUnitDecorators.h>
-
+#include <ceunittestsuiteclass.h>
 #include <ximpbase.h>
 #include "prfwteststatuseventlistener.h"
 #include "prfwtestmessaging.h"
--- a/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,7 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
-#include<platform_paths.hrh>
-#include<eunitcaps.h>
 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
--- a/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,7 @@
 
 #include "eunittools.h"
 
-
-
-#include <platform/digia/eunit/eunitmacros.h>
-#include <platform/digia/eunit/teunitassertioninfo.h>
-
+#include <eunitmacros.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 
--- a/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,7 @@
 #ifndef T_PRESENCEGROUPLISTMANAGEMENT_H
 #define T_PRESENCEGROUPLISTMANAGEMENT_H
 
-
-//  EXTERNAL INCLUDES
-#include <platform/digia/eunit/ceunittestsuiteclass.h>
-#include <platform/digia/eunit/EUnitDecorators.h>
-
+#include <ceunittestsuiteclass.h>
 #include <ximpbase.h>
 #include "prfwteststatuseventlistener.h"
 #include "prfwtestmessaging.h"
--- a/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,7 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
-#include<platform_paths.hrh>
-#include<eunitcaps.h>
 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
 
--- a/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,10 +18,7 @@
 
 #include "eunittools.h"
 
-
-#include <platform/digia/eunit/eunitmacros.h>
-#include <platform/digia/eunit/teunitassertioninfo.h>
-
+#include <eunitmacros.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 #include <e32std.h>
--- a/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h	Tue Aug 31 15:31:29 2010 +0300
@@ -18,12 +18,7 @@
 #ifndef T_PRESENCEGROUPMEMBERMANAGEMENT_H
 #define T_PRESENCEGROUPMEMBERMANAGEMENT_H
 
-
-
-//  EXTERNAL INCLUDES
-#include <platform/digia/eunit/ceunittestsuiteclass.h>
-#include <platform/digia/eunit/EUnitDecorators.h>
-
+#include <ceunittestsuiteclass.h>
 #include <ximpbase.h>
 #include <presenceinfo.h>
 #include "prfwteststatuseventlistener.h"
--- a/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,12 +18,7 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
-#include<platform_paths.hrh>
-#include<eunitcaps.h>
-
 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
--- a/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,9 +18,7 @@
 
 #include "eunittools.h"
 
-#include <platform/digia/eunit/eunitmacros.h>
-#include <platform/digia/eunit/teunitassertioninfo.h>
-
+#include <eunitmacros.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 
--- a/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.h	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,7 @@
 #ifndef T_PRESENCEPUBLISHING_H
 #define T_PRESENCEPUBLISHING_H
 
-
-//  EXTERNAL INCLUDES
-#include <platform/digia/eunit/ceunittestsuiteclass.h>
-#include <platform/digia/eunit/EUnitDecorators.h>
-
+#include <ceunittestsuiteclass.h>
 #include <ximpbase.h>
 #include "prfwteststatuseventlistener.h"
 #include "prfwtestmessaging.h"
--- a/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,12 +18,7 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
-#include<platform_paths.hrh>
-#include<eunitcaps.h>
-
 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
 
--- a/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,10 +18,7 @@
 
 #include "eunittools.h"
 
-#include <platform/digia/eunit/eunitmacros.h>
-#include <platform/digia/eunit/teunitassertioninfo.h>
-
-
+#include <eunitmacros.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 
--- a/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,7 @@
 #ifndef T_PRESENCEWATCHERLISTMANAGEMENT_H
 #define T_PRESENCEWATCHERLISTMANAGEMENT_H
 
-
-//  EXTERNAL INCLUDES
-#include <platform/digia/eunit/ceunittestsuiteclass.h>
-#include <platform/digia/eunit/EUnitDecorators.h>
-
+#include <ceunittestsuiteclass.h>
 #include <ximpbase.h>
 #include <ximpcontextobserver.h>
 #include "presencetypehelpers.h"
--- a/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,7 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
-#include<platform_paths.hrh>
-#include<eunitcaps.h>
 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
--- a/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,10 +18,7 @@
 
 #include "eunittools.h"
 
-#include <platform/digia/eunit/eunitmacros.h>
-#include <platform/digia/eunit/teunitassertioninfo.h>
-
-
+#include <eunitmacros.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 
--- a/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.h	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,7 @@
 #ifndef T_PRESENCEWATCHING_H
 #define T_PRESENCEWATCHING_H
 
-
-//  EXTERNAL INCLUDES
-#include <platform/digia/eunit/ceunittestsuiteclass.h>
-#include <platform/digia/eunit/EUnitDecorators.h>
-
+#include <ceunittestsuiteclass.h>
 #include <ximpbase.h>
 #include "prfwteststatuseventlistener.h"
 #include "prfwtestmessaging.h"
--- a/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,7 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
-#include<platform_paths.hrh>
-#include<eunitcaps.h>
 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
 
--- a/ximpfw/tsrc/src/t_rootservices/t_rootservices.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_rootservices/t_rootservices.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,11 +18,9 @@
 #include "t_rootservices.h"
 
 #include "eunittools.h"
-
+#include <eunitmacros.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
-#include <platform/digia/eunit/eunitmacros.h>
-#include <platform/digia/eunit/teunitassertioninfo.h>
 
 //XIMP headers
 #include <ximpbase.h>
--- a/ximpfw/tsrc/src/t_rootservices/t_rootservices.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_rootservices/t_rootservices.h	Tue Aug 31 15:31:29 2010 +0300
@@ -18,12 +18,7 @@
 #ifndef T_ROOTSERVICES_H__
 #define T_ROOTSERVICES_H__
 
-
-
-//  EXTERNAL INCLUDES
-#include <platform/digia/eunit/ceunittestsuiteclass.h>
-#include <platform/digia/eunit/EUnitDecorators.h>
-
+#include <ceunittestsuiteclass.h>
 #include <ximpbase.h>
 
 class MXIMPProtocolInfo;
--- a/ximpfw/tsrc/src/t_rootservices/t_rootservices.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_rootservices/t_rootservices.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,10 +18,7 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
-#include<platform_paths.hrh>
-#include<eunitcaps.h>
 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
 
--- a/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 
-//#include <eunitmacros.h>
+#include <eunitmacros.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 #include <e32base.h>
@@ -44,9 +44,6 @@
 
 
 
-#include <platform/digia/eunit/eunitmacros.h>
-#include <platform/digia/eunit/teunitassertioninfo.h>
-
 
 
 
--- a/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.h	Tue Aug 31 15:31:29 2010 +0300
@@ -18,13 +18,7 @@
 #ifndef T_SESSIONMNG_H__
 #define T_SESSIONMNG_H__
 
-
-
-
-//  EXTERNAL INCLUDES
-#include <platform/digia/eunit/ceunittestsuiteclass.h>
-#include <platform/digia/eunit/EUnitDecorators.h>
-
+#include <ceunittestsuiteclass.h>
 #include <ximpbase.h>
 
 #include "prfwteststatuseventlistener.h"
--- a/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -18,10 +18,7 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
-#include<platform_paths.hrh>
-#include<eunitcaps.h>
 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
 
--- a/ximpfw/tsrc/src/t_utils/t_utils.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_utils/t_utils.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -16,21 +16,16 @@
 */
 
 
+#include <eunitmacros.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 #include <e32property.h>
 #include <e32base.h>
 #include <e32std.h>
 
-#include "eunittools.h"
-
-
-#include <platform/digia/eunit/eunitmacros.h>
-#include <platform/digia/eunit/teunitassertioninfo.h>
-
 #include "t_utils.h"
 
-
+#include "eunittools.h"
 
 #include <ximpbase.h>
 #include <presenceinfo.h>
--- a/ximpfw/tsrc/src/t_utils/t_utils.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_utils/t_utils.h	Tue Aug 31 15:31:29 2010 +0300
@@ -18,12 +18,7 @@
 #ifndef T_UTILS_H__
 #define T_UTILS_H__
 
-
-//  EXTERNAL INCLUDES
-#include <platform/digia/eunit/ceunittestsuiteclass.h>
-#include <platform/digia/eunit/EUnitDecorators.h>
-
-
+#include <ceunittestsuiteclass.h>
 #include <ximpbase.h>
 
 #include "prfwteststatuseventlistener.h"
--- a/ximpfw/tsrc/src/t_utils/t_utils.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/src/t_utils/t_utils.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -16,17 +16,13 @@
 */
 
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
-#include            "../../tsrcutils/processmaster/pm.h"
 
-#include<platform_paths.hrh>
-#include<eunitcaps.h>
 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
 
--- a/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -17,14 +17,12 @@
 
 #include <platform_paths.hrh>
 #include "../prfwtestprotocols_resource.hrh"
-#include<eunitcaps.h>
 
 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
--- a/ximpfw/tsrc/tsrcutils/eunitcommon/eunittools.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/tsrcutils/eunitcommon/eunittools.h	Tue Aug 31 15:31:29 2010 +0300
@@ -19,14 +19,10 @@
 #define EUNITTOOLS_H
 
 #include <e32std.h>
-
-#include <platform/digia/eunit/eunitmacros.h>
-#include <platform/digia/eunit/teunitassertioninfo.h>
-
-#include <platform/digia/eunit/ceunittestsuiteclass.h>
-#include <platform/digia/eunit/EUnitDecorators.h>
-
-
+#include <eunitmacros.h>
+#include <ceunittestcasedecorator.h>
+#include <ceunitalloctestcasedecorator.h>
+#include <ceunitemptytestcasedecorator.h>
 #include "cglobalwaitingnote.h"
 
 
--- a/ximpfw/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -17,28 +17,17 @@
 
 // To get the MW_LAYER_SYSTEMINCLUDE-definition
 #include <platform_paths.hrh>
-#include<eunitcaps.h>
+
 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
--- a/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp	Tue Aug 31 15:31:29 2010 +0300
@@ -15,17 +15,14 @@
 *
 */
 
-#include<platform_paths.hrh>
-#include<eunitcaps.h>
-
-#include "prfwtestdlluids.hrh"
+#include <platform_paths.hrh>
+#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
 
--- a/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp	Tue Aug 31 15:31:29 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
--- a/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h	Tue Aug 31 15:31:29 2010 +0300
@@ -21,9 +21,7 @@
 
 // INCLUDES
 #include <e32std.h>
-
-#include <platform/digia/eunit/eunitmacros.h>
-#include <platform/digia/eunit/teunitassertioninfo.h>
+#include <eunitmacros.h>
 #include "prfwtestprocessmaster.h"
 #include "userafter.h"
 #include "prfwtestfiletool.h"
--- a/ximpfw/tsrc/tsrcutils/testcaseutils/prfwteststatuseventlistener.cpp	Thu Aug 19 10:14:19 2010 +0300
+++ b/ximpfw/tsrc/tsrcutils/testcaseutils/prfwteststatuseventlistener.cpp	Tue Aug 31 15:31:29 2010 +0300
@@ -186,7 +186,6 @@
         RArray< TXIMPTestStatusEventSnapshot >& aArray,
         TXIMPTestStatusEventTemplate aTemplate )
     {
-	CleanupClosePushL(aArray); 
     switch( aTemplate )
         {
         // session handling
@@ -553,7 +552,6 @@
             Panic( EStatusEventListenerUnknownEventTemplate );
             }
         }
-		CleanupStack::Pop(&aArray);
     }