# HG changeset patch # User Pat Downey # Date 1283340465 -3600 # Node ID 113b91e0a2ada772777d5ce8bd14436c8a830e7e # Parent cfd5c2994f109039a4f5c84005c560af19d652cb Revert incorrect RCL_3 drop: Revision: 201033 Kit: 201035 diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/bsclientdefs.h --- a/brandingserver/bsclient/bsclientdefs.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/bsclientdefs.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: CBSClientdefs.h +* Description:CBSClientdefs.h * */ - #ifndef __BRANDINGDEFS_H__ #define __BRANDINGDEFS_H__ #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/bselementfactory.cpp --- a/brandingserver/bsclient/bselementfactory.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/bselementfactory.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,15 +11,14 @@ * * Contributors: * -* Description: bselementfactory.cpp +* Description: bselementfactory.cpp * */ - // INCLUDE FILES -#include "DebugTrace.h" +#include "debugtrace.h" #include "bselementfactory.h" #include "cbselement.h" diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/bsprocessstarter.cpp --- a/brandingserver/bsclient/bsprocessstarter.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/bsprocessstarter.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: bsprocessstarter.cpp +* Description: bsprocessstarter.cpp * */ - // INCLUDE FILES #include "bsprocessstarter.h" #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/bsprocessstarter.h --- a/brandingserver/bsclient/bsprocessstarter.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/bsprocessstarter.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: bsprocessstarter.h +* Description: bsprocessstarter.h * */ - #ifndef __PROCESSSTARTER_H__ #define __PROCESSSTARTER_H__ diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/cbsaccess.cpp --- a/brandingserver/bsclient/cbsaccess.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/cbsaccess.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: CBSAccess.cpp +* Description: CBSAccess.cpp * */ - // INCLUDE FILES #include @@ -26,7 +25,7 @@ #include "cbsaccess.h" #include "cbsbitmap.h" -#include "DebugTrace.h" +#include "debugtrace.h" #include "mbsaccess.h" #include "mbsupdater.h" #include "cbsiconfileprovider.h" diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/cbsaccess.h --- a/brandingserver/bsclient/cbsaccess.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/cbsaccess.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: cbsaccess.h * -* Description: cbsaccess.h +* Description: cbsaccess.h * */ - #ifndef __CBSACCESS_H__ #define __CBSACCESS_H__ #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/cbsbitmap.cpp --- a/brandingserver/bsclient/cbsbitmap.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/cbsbitmap.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: cbsbitmap.cpp +* Description: cbsbitmap.cpp * */ - // INCLUDE FILES #include "e32base.h" diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/cbsbrandobserver.cpp --- a/brandingserver/bsclient/cbsbrandobserver.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/cbsbrandobserver.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: cbsbrandobserver.cpp +* Description: cbsbrandobserver.cpp * */ - // INCLUDE FILES #include "cbsbrandobserver.h" diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/cbsbrandobserver.h --- a/brandingserver/bsclient/cbsbrandobserver.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/cbsbrandobserver.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: CBSBrandObserver.h +* Description: CBSBrandObserver.h * */ - #ifndef __CBSBRANDOBSERVER_H__ #define __CBSBRANDOBSERVER_H__ #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/cbsclient.cpp --- a/brandingserver/bsclient/cbsclient.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/cbsclient.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: CBSClient.cpp +* Description: CBSClient.cpp * */ - // INCLUDE FILES #include "cbsclient.h" #include "bsclientdefs.h" @@ -28,7 +27,7 @@ #include "cbsbrandobserver.h" #include #include -#include "DebugTrace.h" +#include "debugtrace.h" // ============================================================== // ======================== CLIENT ============================== diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/cbsclient.h --- a/brandingserver/bsclient/cbsclient.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/cbsclient.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: CBSClient.h +* Description: CBSClient.h * */ - #ifndef __CBSCLIENT_H__ #define __CBSCLIENT_H__ #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/cbselement.cpp --- a/brandingserver/bsclient/cbselement.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/cbselement.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: cbselement.cpp +* Description: cbselement.cpp * */ - // INCLUDE FILES #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/cbselement.h --- a/brandingserver/bsclient/cbselement.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/cbselement.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: cbselement.h +* Description: cbselement.h * */ - #ifndef __CBSELEMENT_H__ #define __CBSELEMENT_H__ #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/cbsfactory.cpp --- a/brandingserver/bsclient/cbsfactory.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/cbsfactory.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,11 +11,10 @@ * * Contributors: * -* Description: Factory for creating branding +* Description: Factory for creating branding * */ - // INCLUDE FILES #include "cbsfactory.h" #include "cbsaccess.h" @@ -23,7 +22,7 @@ #include "mbsaccess.h" #include "mbsupdater.h" #include "cbsclient.h" -#include "DebugTrace.h" +#include "debugtrace.h" // ============================ MEMBER FUNCTIONS =============================== diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/cbsiconfileprovider.cpp --- a/brandingserver/bsclient/cbsiconfileprovider.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/cbsiconfileprovider.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Icon file provider. +* Description: Icon file provider. * */ - // INCLUDE FILES #include "cbsiconfileprovider.h" #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/cbsiconfileprovider.h --- a/brandingserver/bsclient/cbsiconfileprovider.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/cbsiconfileprovider.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,13 +11,12 @@ * * Contributors: * -* Description: Icon file provider. +* Description: Icon file provider. * */ - #ifndef CBSICONFILEPROVIDER_H #define CBSICONFILEPROVIDER_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/cbsupdater.cpp --- a/brandingserver/bsclient/cbsupdater.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/cbsupdater.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,18 +11,17 @@ * * 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" diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/cbsupdater.h --- a/brandingserver/bsclient/cbsupdater.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/cbsupdater.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: CBSUpdater.h +* Description: CBSUpdater.h * */ - #ifndef __CBSUPDATER_H__ #define __CBSUPDATER_H__ #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/mbsbrandobserverregistrar.h --- a/brandingserver/bsclient/mbsbrandobserverregistrar.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/mbsbrandobserverregistrar.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,13 +11,12 @@ * * Contributors: * -* Description: MBSBrandObserverRegistrar.h +* Description: MBSBrandObserverRegistrar.h * */ - #ifndef __MBSBRANDOBSERVERREGISTRAR_H #define __MBSBRANDOBSERVERREGISTRAR_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/tbselementiterator.cpp --- a/brandingserver/bsclient/tbselementiterator.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/tbselementiterator.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,13 +11,12 @@ * * Contributors: * -* Description: tbselementiterator.cpp +* Description: tbselementiterator.cpp * */ - // INCLUDE FILES #include "tbselementiterator.h" #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsclient/tbsmdescarrayadapter.cpp --- a/brandingserver/bsclient/tbsmdescarrayadapter.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsclient/tbsmdescarrayadapter.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,11 +11,10 @@ * * Contributors: * -* Description: One value adapter for MDesCArray. +* Description: One value adapter for MDesCArray. * */ - // INCLUDES #include "tbsmdescarrayadapter.h" #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/bsimportconstants.h --- a/brandingserver/bsserver/bsimportconstants.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/bsimportconstants.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: BrandingServer constants. +* Description: BrandingServer constants. * */ - // CONSTANTS // Characters to strip from xml text values diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/bsserverdefs.h --- a/brandingserver/bsserver/bsserverdefs.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/bsserverdefs.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: server defintions. +* Description: server defintions. * */ - #ifndef __BSSERVERDEFS_H__ #define __BSSERVERDEFS_H__ #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbsbackupobserver.cpp --- a/brandingserver/bsserver/cbsbackupobserver.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbsbackupobserver.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Stores element data and writes it to stream +* Description: Stores element data and writes it to stream * */ - #include #include "cbsbackupobserver.h" diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbsbackupobserver.h --- a/brandingserver/bsserver/cbsbackupobserver.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbsbackupobserver.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * 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 diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbsbrandhandler.cpp --- a/brandingserver/bsserver/cbsbrandhandler.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbsbrandhandler.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,17 +11,16 @@ * * 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" @@ -211,6 +210,7 @@ if (iLanguage >= 100) User::LeaveIfError (KErrNotFound); HBufC* fileName = GetTextL( aId ); + CleanupStack :: PushL (fileName); TBuf buffer; // append leading zero only if language code is <10. @@ -240,6 +240,8 @@ TRACE( T_LIT( "CBSBrandHandler::GetFileL found in default brand") ); } + + CleanupStack :: PopAndDestroy (fileName); aFile = file; TRACE( T_LIT( "CBSBrandHandler::GetFileL end") ); diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbsbrandhandler.h --- a/brandingserver/bsserver/cbsbrandhandler.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbsbrandhandler.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: CBSBrandHandler.h +* Description: CBSBrandHandler.h * */ - #ifndef __CBSBRANDHANDLER_H__ #define __CBSBRANDHANDLER_H__ diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbsibywriter.cpp --- a/brandingserver/bsserver/cbsibywriter.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbsibywriter.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Writes IBY files +* Description: Writes IBY files * */ - #include #include #include @@ -24,7 +23,7 @@ #include "cbsibywriter.h" #include "bsimportconstants.h" //#include "importlogwriter.h" -#include "DebugTrace.h" +#include "debugtrace.h" // CONSTANTS _LIT8( KIBYHeader1, "\n#ifndef __BRAND_" ); diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbsibywriter.h --- a/brandingserver/bsserver/cbsibywriter.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbsibywriter.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Writes IBY files +* Description: Writes IBY files * */ - #ifndef CBSIBYWRITER_H #define CBSIBYWRITER_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbsinstallhandler.cpp --- a/brandingserver/bsserver/cbsinstallhandler.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbsinstallhandler.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: CBSInstallhandler.cpp +* Description: CBSInstallhandler.cpp * */ - // INCLUDE FILES #include #include @@ -26,7 +25,7 @@ #include #include "cbsinstallhandler.h" -#include "DebugTrace.h" +#include "debugtrace.h" #include "bsimportconstants.h" #include "cbsstoragemanager.h" @@ -344,7 +343,7 @@ // aaa$bbb -> aaa$bbb.install CDir* dir = NULL; iFs.GetDir( file, KEntryAttNormal, ESortNone, dir ); - if( dir->Count() > 0 ) + if( dir && dir->Count() > 0 ) { // brand is installed delete dir; @@ -363,7 +362,7 @@ // check file with different versions: // aaa$bbb -> aaa$bbb$*.install iFs.GetDir( file, KEntryAttNormal, ESortNone, dir ); - if( dir->Count() > 0 ) + if( dir && dir->Count() > 0 ) { // brand is installed delete dir; diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbsinstallhandler.h --- a/brandingserver/bsserver/cbsinstallhandler.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbsinstallhandler.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: cbsinstallhandler.h +* Description: cbsinstallhandler.h * */ - #ifndef __CBSINSTALLHANDLER_H__ #define __CBSINSTALLHANDLER_H__ diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbsserver.cpp --- a/brandingserver/bsserver/cbsserver.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbsserver.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: cbsserver.cpp +* Description: cbsserver.cpp * */ - // INCLUDE FILES #define __INCLUDE_CAPABILITY_NAMES__ @@ -25,7 +24,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" diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbsserver.h --- a/brandingserver/bsserver/cbsserver.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbsserver.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: CBSSERVER.H +* Description: CBSSERVER.H * */ - #ifndef __CBSSERVER_H__ #define __CBSSERVER_H__ #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbssession.cpp --- a/brandingserver/bsserver/cbssession.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbssession.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,19 +11,18 @@ * * Contributors: * -* Description: CBSSession.cpp +* Description: CBSSession.cpp * */ - // INCLUDE FILES #include #include #include "cbssession.h" #include "cbsserver.h" -#include "DebugTrace.h" +#include "debugtrace.h" #include "cbsbrandhandler.h" #include "cbsstoragemanager.h" #include "cbsstorage.h" @@ -73,6 +72,10 @@ delete iBuffer; delete iBranding; delete iSeveralData; + + delete iApplicationId; + delete iBrandId; + delete iDefaultBrandId; #ifdef __WINSCW__ if( iStorageManager ) @@ -508,7 +511,8 @@ { TRACE( T_LIT("CBSSession::InitUpdateL: Brand discarded!->LeaveWith KErrNotFound") ); ///Server()->DisplaySessionInfoL( this, KErrNotFound ); - User::Leave( KErrNotFound ); + //User::Leave( KErrNotFound ); + iBrandId->Des().Copy( *iDefaultBrandId ); } } diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbssession.h --- a/brandingserver/bsserver/cbssession.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbssession.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: cbssession.h +* Description: cbssession.h * */ - #ifndef __CBSSESSION_H__ #define __CBSSESSION_H__ diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbsstorage.cpp --- a/brandingserver/bsserver/cbsstorage.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbsstorage.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,15 +11,14 @@ * * 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 @@ -332,11 +331,13 @@ // void CBSStorage::GetListOfFilesL( RArray& aFileList ) { + CleanupClosePushL(aFileList); TInt count = iElements.Count(); for( TInt i = 0; i < count; i++ ) { AppendFilesL( iElements[i], aFileList ); } + CleanupStack::Pop(&aFileList); } // --------------------------------------------------------------------------- diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbsstorage.h --- a/brandingserver/bsserver/cbsstorage.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbsstorage.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * 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 diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbsstoragemanager.cpp --- a/brandingserver/bsserver/cbsstoragemanager.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbsstoragemanager.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Stores element data and writes it to stream +* Description: Stores element data and writes it to stream * */ - #include #include #include @@ -35,7 +34,7 @@ #include "cbssession.h" #include "mbsupdater.h" //#include "importlogwriter.h" -#include "DebugTrace.h" +#include "debugtrace.h" // ======== MEMBER FUNCTIONS ======== @@ -267,7 +266,6 @@ langBuf.Length() + KDot().Length() * 3 + KMaxVersionLenght; fileName = HBufC::NewLC( length ); - if(fileName){ TPtr file( fileName->Des() ); // [application_id]\[brand_id]\[def_filename][language_id] @@ -287,9 +285,11 @@ file.Append( KDot() ); file.Append( versionBuffer ); } - - CleanupStack::Pop( fileName ); - } + + if( fileName ) + { + CleanupStack::Pop( fileName ); + } return fileName; } @@ -900,6 +900,9 @@ 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++ ) @@ -937,7 +940,10 @@ } CleanupStack::PopAndDestroy( fullName ); } - CleanupStack::PopAndDestroy( nameWithDrive ); + + CleanupStack :: PopAndDestroy (directories); + CleanupStack :: PopAndDestroy (files); + CleanupStack :: PopAndDestroy (nameWithDrive); } TRACE( T_LIT( "CBSStorageManager::CleanupFileL end") ); } diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/bsserver/cbsstoragemanager.h --- a/brandingserver/bsserver/cbsstoragemanager.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/bsserver/cbsstoragemanager.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Storage handler +* Description: Storage handler * */ - #ifndef CBSSTORAGEMANAGER_H #define CBSSTORAGEMANAGER_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/group/backup_registration.xml --- a/brandingserver/group/backup_registration.xml Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/group/backup_registration.xml Wed Sep 01 12:27:45 2010 +0100 @@ -3,7 +3,7 @@ - + diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/group/bld.inf --- a/brandingserver/group/bld.inf Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/group/bld.inf Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,37 +11,39 @@ * * 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 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) \ No newline at end of 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 diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/group/bsclient.mmp --- a/brandingserver/group/bsclient.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/group/bsclient.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: Branding server client component project descripton file. +* Description: Branding server client component project descripton file. * */ - #include "bsuids.h" #include #include @@ -26,7 +25,7 @@ VENDORID VID_DEFAULT -SOURCEPATH ../BSClient +SOURCEPATH ../bsclient SOURCE cbsclient.cpp SOURCE bsprocessstarter.cpp SOURCE cbsfactory.cpp @@ -39,9 +38,9 @@ SOURCE cbsiconfileprovider.cpp -USERINCLUDE ../Group -USERINCLUDE ../BSServer -USERINCLUDE ../BSClient +USERINCLUDE ../group +USERINCLUDE ../bsserver +USERINCLUDE ../bsclient APP_LAYER_SYSTEMINCLUDE diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/group/bsserver.mmp --- a/brandingserver/group/bsserver.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/group/bsserver.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: Branding server, server comopnent project description file. +* Description: Branding server, server comopnent project description file. * */ - #include "bsuids.h" #include #include @@ -29,7 +28,7 @@ TARGETPATH /system/libs -SOURCEPATH ../BSServer +SOURCEPATH ../bsserver SOURCE cbsserver.cpp SOURCE cbssession.cpp SOURCE cbsbrandhandler.cpp @@ -39,17 +38,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 diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/group/bsuids.h --- a/brandingserver/group/bsuids.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/group/bsuids.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: BRANDINGSERVER UIDs +* Description: BRANDINGSERVER UIDs * */ - #ifndef __BRANDINGUIDS_H #define __BRANDINGUIDS_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/group/debugtrace.h --- a/brandingserver/group/debugtrace.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/group/debugtrace.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: Debug Traces. +* Description: Debug Traces. * */ - #ifndef __DEBUGTRACE_H__ #define __DEBUGTRACE_H__ diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/inc/bselementfactory.h --- a/brandingserver/inc/bselementfactory.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/inc/bselementfactory.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: bselementfactory.h +* Description: bselementfactory.h * */ - #ifndef __BSELEMENTFACTORY_H #define __BSELEMENTFACTORY_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/inc/cbsbitmap.h --- a/brandingserver/inc/cbsbitmap.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/inc/cbsbitmap.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,13 +11,12 @@ * * Contributors: * -* Description: cbsbitmap.h +* Description: cbsbitmap.h * */ - #ifndef __CBSBITMAP_H__ #define __CBSBITMAP_H__ diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/inc/cbsfactory.h --- a/brandingserver/inc/cbsfactory.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/inc/cbsfactory.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,11 +11,10 @@ * * Contributors: * -* Description: cbsfactory.h +* Description: cbsfactory.h * */ - #ifndef __CBSFACTORY_H #define __CBSFACTORY_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/inc/mbsaccess.h --- a/brandingserver/inc/mbsaccess.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/inc/mbsaccess.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,13 +11,12 @@ * * Contributors: * -* Description: MBSAccess +* Description: MBSAccess * */ - #ifndef __MBSACCESS_H #define __MBSACCESS_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/inc/mbsbackupobserver.h --- a/brandingserver/inc/mbsbackupobserver.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/inc/mbsbackupobserver.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Backup and Restore observer interface +* Description: Backup and Restore observer interface * */ - #ifndef __MBSBACKUPOBSERVER_H #define __MBSBACKUPOBSERVER_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/inc/mbsbackuprestorestateobserver.h --- a/brandingserver/inc/mbsbackuprestorestateobserver.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/inc/mbsbackuprestorestateobserver.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,13 +11,12 @@ * * Contributors: * -* Description: MBS Backup restore observer definition. +* Description: MBS Backup restore observer definition. * */ - #ifndef __MBSBACKUPRESTORESTATEOBSERVER_H #define __MBSBACKUPRESTORESTATEOBSERVER_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/inc/mbsbrandchangeobserver.h --- a/brandingserver/inc/mbsbrandchangeobserver.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/inc/mbsbrandchangeobserver.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,13 +11,12 @@ * * Contributors: * -* Description: MBSBrandChangeObserver +* Description: MBSBrandChangeObserver * */ - #ifndef __MBSBRANDCHANGEOBSERVER_H #define __MBSBRANDCHANGEOBSERVER_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/inc/mbselement.h --- a/brandingserver/inc/mbselement.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/inc/mbselement.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: MBSElement.h +* Description: MBSElement.h * */ - #ifndef __MBSELEMENT_H #define __MBSELEMENT_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/inc/mbsupdater.h --- a/brandingserver/inc/mbsupdater.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/inc/mbsupdater.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,13 +11,12 @@ * * Contributors: * -* Description: MBSUpdater +* Description: MBSUpdater * */ - #ifndef __MBSUPDATER_H #define __MBSUPDATER_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/inc/rbsobjowningptrarray.h --- a/brandingserver/inc/rbsobjowningptrarray.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/inc/rbsobjowningptrarray.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,11 +11,10 @@ * * Contributors: * -* Description: RBSOBJOWNINGPTRaRRAY.H +* Description: RBSOBJOWNINGPTRaRRAY.H * */ - #ifndef _RBSOBJOWNINGPTRARRAY_H #define _RBSOBJOWNINGPTRARRAY_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/inc/rbsobjowningptrarray.inl --- a/brandingserver/inc/rbsobjowningptrarray.inl Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/inc/rbsobjowningptrarray.inl Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: rbsobjowningptrarray.inl +* Description: rbsobjowningptrarray.inl * */ - #include // ----------------------------------------------------------------------------- diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/inc/tbselementiterator.h --- a/brandingserver/inc/tbselementiterator.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/inc/tbselementiterator.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,13 +11,12 @@ * * Contributors: * -* Description: tbselementiterator.h +* Description: tbselementiterator.h * */ - #ifndef TBSELEMENTITERATOR_H #define TBSELEMENTITERATOR_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/inc/tbsmdescarrayadapter.h --- a/brandingserver/inc/tbsmdescarrayadapter.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/inc/tbsmdescarrayadapter.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,11 +11,10 @@ * * Contributors: * -* Description: One value adapter for MDesCArray. +* Description: One value adapter for MDesCArray. * */ - #ifndef TBSMDESCARRAYADAPTER_H__ #define TBSMDESCARRAYADAPTER_H__ diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/rom/brandingserver.iby --- a/brandingserver/rom/brandingserver.iby Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/rom/brandingserver.iby Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: Branding Server IBY +* Description: Branding Server IBY * */ - #ifndef __BS_IBY__ #define __BS_IBY__ @@ -32,5 +31,7 @@ // 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 diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/sis/bs.pkg --- a/brandingserver/sis/bs.pkg Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/sis/bs.pkg Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +; 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". ; @@ -11,8 +11,9 @@ ; ; Contributors: ; -; Description: +; Description: ; +;Language &EN ;Header diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/sis/bsstub.pkg --- a/brandingserver/sis/bsstub.pkg Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/sis/bsstub.pkg Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +; 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". ; @@ -11,14 +11,27 @@ ; ; Contributors: ; -; Description: +; 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. ; ;Language &EN ;Header -#{"BS"}, (0x102828DE), 1, 0, 0, TYPE=SA +#{"BS"}, (0x102828DE), 1, 0, 0, TYPE=SA, RU ;Localised VendorID @@ -28,7 +41,7 @@ :"Nokia" ;binaries -""-"!:\sys\bin\bsserver.exe" -""-"!:\sys\bin\bsclient.dll" +""-"z:\sys\bin\bsserver.exe" +""-"z:\sys\bin\bsclient.dll" diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/sis/bsstub.sis Binary file brandingserver/sis/bsstub.sis has changed diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/group/bld.inf --- a/brandingserver/tools/bsimport/group/bld.inf Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/group/bld.inf Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: bld.inf file project inclusions. +* Description: bld.inf file project inclusions. * */ - // BLD.INF PRJ_MMPFILES diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/group/brandimporter_UID_.cpp --- a/brandingserver/tools/bsimport/group/brandimporter_UID_.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/group/brandimporter_UID_.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: UID file +* Description: UID file * */ - // Makmake-generated uid source file #include #pragma data_seg(".SYMBIAN") diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/group/importer.mmp --- a/brandingserver/tools/bsimport/group/importer.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/group/importer.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Project definition file for project bsimport +* Description: Project definition file for project bsimport * */ - #include TARGET bsimport.exe diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/group/installer.mmp --- a/brandingserver/tools/bsimport/group/installer.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/group/installer.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Project definition file for project bsinstall +* Description: Project definition file for project bsinstall * */ - #include TARGET bsinstall.exe diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/inc/cbsimportconstants.h --- a/brandingserver/tools/bsimport/inc/cbsimportconstants.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportconstants.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,10 +11,9 @@ * * Contributors: * -* Description: Constants header file +* Description: Constants header file * */ - // CONSTANTS // default build language diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/inc/cbsimportfilereader.h --- a/brandingserver/tools/bsimport/inc/cbsimportfilereader.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportfilereader.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,80 +11,153 @@ * * 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 + #include + + 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 + diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/inc/cbsimportmanager.h --- a/brandingserver/tools/bsimport/inc/cbsimportmanager.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportmanager.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * 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 diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/inc/cbsimportstorage.h --- a/brandingserver/tools/bsimport/inc/cbsimportstorage.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportstorage.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * 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 diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/inc/cbsimportstoragemanager.h --- a/brandingserver/tools/bsimport/inc/cbsimportstoragemanager.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportstoragemanager.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Storage handler +* Description: Storage handler * */ - #ifndef CBSIMPORTSTORAGEMANAGER_H #define CBSIMPORTSTORAGEMANAGER_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/inc/cbsimportxmlparser-1.h --- a/brandingserver/tools/bsimport/inc/cbsimportxmlparser-1.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportxmlparser-1.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,7 +11,6 @@ * * 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 #include #include #include #include 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 and it's child elements. * * @since S60 v3.2 * @param aElement to parse */ void ParseDocumentBaseL( CMDXMLNode* aElement ); /** * Analyzes a child node of 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 * * @since S60 v3.2 * @param aNode node to check * @return corresponding TXMLBaseTagTypes value (or EBrandUnknown). */ TXMLBaseTagTypes SolveTagTypeL( CMDXMLNode* aNode ); /** * Parses full node. Returns a newly constructed MBSElement * from the content of teh node. * Ownership is transferred! * * @since S60 v3.2 * @param aNode 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 tag. Leaves if parse fails. * Ownership is transferred to caller (NodeTextLC) * * @since S60 3.2 * @param aNode XML node to parse. should be . * @return value from */ HBufC* NodeTextLC( CMDXMLNode* elNode ); TInt NodeIntL ( CMDXMLNode* elNode ); /** * Parse 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& 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 diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/inc/cbsimportxmlparser.h --- a/brandingserver/tools/bsimport/inc/cbsimportxmlparser.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportxmlparser.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,157 +11,307 @@ * * 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 + #include + #include + #include + #include + + 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 and it's child elements. + * + * @since S60 v3.2 + * @param aElement to parse + */ + void ParseDocumentBaseL( CMDXMLNode* aElement ); + + /** + * Analyzes a child node of 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 + * + * @since S60 v3.2 + * @param aNode node to check + * @return corresponding TXMLBaseTagTypes value (or EBrandUnknown). + */ + TXMLBaseTagTypes SolveTagTypeL( CMDXMLNode* aNode ); + + + /** + + * Parses full node. Returns a newly constructed MBSElement + + * from the content of teh node. + + * Ownership is transferred! + + * + + * @since S60 v3.2 + + * @param aNode node + + * @return Concrete element constructed from node. + + */ + + MBSElement* ParseBrandElementL( CMDXMLNode* aNode ); + + + /** - * Parses full node. Returns a newly constructed MBSElement - * from the content of teh node. - * Ownership is transferred! + + * Converts elements type attribute value to TBSElementType + + * (see MBSElement). + * + * @since S60 v3.2 - * @param aNode node - * @return Concrete element constructed from node. + + * @param aType value of type attribute + + * @return corresponding TBrandingElementType value or KErrNotFound. + */ - 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 tag. Leaves if parse fails. + * Ownership is transferred to caller (NodeTextLC) + * + * @since S60 3.2 + * @param aNode XML node to parse. should be . + * @return value from + */ + HBufC* NodeTextLC( CMDXMLNode* elNode ); + TInt NodeIntL ( CMDXMLNode* elNode ); + + /** + * Parse 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& aElementArray ); + void DoParseBitmapL ( CMDXMLNode* aNode, CBSBitmap*& aBitmap ); + + private: // Data + + // Not owned. Storage where to put parsed elements + CBSImportStorageManager* iStorage; + }; + + #endif //CBSIMPORTXMLPARSER_H + diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/inc/importlogwriter.h --- a/brandingserver/tools/bsimport/inc/importlogwriter.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/importlogwriter.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,13 +11,12 @@ * * Contributors: * -* Description: Log writer macros +* Description: Log writer macros * */ - /* * * Description: diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/src/bsbrandremover.cpp --- a/brandingserver/tools/bsimport/src/bsbrandremover.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/src/bsbrandremover.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,11 +11,10 @@ * * Contributors: * -* Description: Removes brands from branding server +* Description: Removes brands from branding server * */ - #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/src/bsbrandremover.h --- a/brandingserver/tools/bsimport/src/bsbrandremover.h Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/src/bsbrandremover.h Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,11 +11,10 @@ * * Contributors: * -* Description: Helper class for removing brands +* Description: Helper class for removing brands * */ - #ifndef BSBRANDREMOVER_H #define BSBRANDREMOVER_H diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/src/cbsimportfilereader.cpp --- a/brandingserver/tools/bsimport/src/cbsimportfilereader.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportfilereader.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,13 +11,12 @@ * * 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 #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/src/cbsimportmanager.cpp --- a/brandingserver/tools/bsimport/src/cbsimportmanager.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportmanager.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,13 +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. * */ - #include #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/src/cbsimportstorage.cpp --- a/brandingserver/tools/bsimport/src/cbsimportstorage.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportstorage.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Stores element data and writes it to stream +* Description: Stores element data and writes it to stream * */ - #include #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/src/cbsimportstoragemanager.cpp --- a/brandingserver/tools/bsimport/src/cbsimportstoragemanager.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportstoragemanager.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Stores element data and writes it to stream +* Description: Stores element data and writes it to stream * */ - #include #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp --- a/brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Parses XML content and stores data to storage +* Description: Parses XML content and stores data to storage * */ - #include #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/src/importer.cpp --- a/brandingserver/tools/bsimport/src/importer.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/src/importer.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Global methods for brandimporter +* Description: Global methods for brandimporter * */ - #include #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/bsimport/src/installer.cpp --- a/brandingserver/tools/bsimport/src/installer.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/bsimport/src/installer.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +* 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". * @@ -11,12 +11,11 @@ * * Contributors: * -* Description: Global methods for brandinstaller +* Description: Global methods for brandinstaller * */ - #include #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/makefile/import.mk --- a/brandingserver/tools/makefile/import.mk Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/makefile/import.mk Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +# 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". # @@ -11,7 +11,7 @@ # # Contributors: # -# Description: make file +# Description: make file # diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/sis/brand-example.pkg --- a/brandingserver/tools/sis/brand-example.pkg Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/sis/brand-example.pkg Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +; 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". ; @@ -11,7 +11,7 @@ ; ; Contributors: ; -; Description: Example PKG file for branding installer +; Description: Example PKG file for branding installer ; ; -------- general -------- diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/sis/import_data/install.txt --- a/brandingserver/tools/sis/import_data/install.txt Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/sis/import_data/install.txt Wed Sep 01 12:27:45 2010 +0100 @@ -0,0 +1,16 @@ +# +# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: install.txt +# +# diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/sis/make-example.cmd --- a/brandingserver/tools/sis/make-example.cmd Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/sis/make-example.cmd Wed Sep 01 12:27:45 2010 +0100 @@ -1,9 +1,8 @@ -@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 the License "Eclipse Public License v1.0" +rem under the terms of "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 @@ -12,9 +11,8 @@ 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 diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/xml/loc2xml.pl --- a/brandingserver/tools/xml/loc2xml.pl Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/xml/loc2xml.pl Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +# 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". # @@ -11,7 +11,7 @@ # # Contributors: # -# Description: Converts loc file into branding xml file +# Description: Converts loc file into branding xml file # #------------------------------------------------------------------------------ diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/xml/mbg2xml.pl --- a/brandingserver/tools/xml/mbg2xml.pl Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/xml/mbg2xml.pl Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +# 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". # @@ -11,7 +11,7 @@ # # Contributors: # -# Description: Converts mbg file into branding xml file +# Description: Converts mbg file into branding xml file # # SETUP diff -r cfd5c2994f10 -r 113b91e0a2ad brandingserver/tools/xml/xml2h.pl --- a/brandingserver/tools/xml/xml2h.pl Tue Aug 31 15:31:29 2010 +0300 +++ b/brandingserver/tools/xml/xml2h.pl Wed Sep 01 12:27:45 2010 +0100 @@ -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 the License "Eclipse Public License v1.0" +# 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". # @@ -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 # #------------------------------------------------------------------------------ diff -r cfd5c2994f10 -r 113b91e0a2ad group/bld.inf --- a/group/bld.inf Tue Aug 31 15:31:29 2010 +0300 +++ b/group/bld.inf Wed Sep 01 12:27:45 2010 +0100 @@ -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 diff -r cfd5c2994f10 -r 113b91e0a2ad imservices/imfeatureplugin/group/bld.inf --- a/imservices/imfeatureplugin/group/bld.inf Tue Aug 31 15:31:29 2010 +0300 +++ b/imservices/imfeatureplugin/group/bld.inf Wed Sep 01 12:27:45 2010 +0100 @@ -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 diff -r cfd5c2994f10 -r 113b91e0a2ad imservices/imfeatureplugin/srcimdatamodel/imconversation/conversationsubscriptionitem.h --- a/imservices/imfeatureplugin/srcimdatamodel/imconversation/conversationsubscriptionitem.h Tue Aug 31 15:31:29 2010 +0300 +++ b/imservices/imfeatureplugin/srcimdatamodel/imconversation/conversationsubscriptionitem.h Wed Sep 01 12:27:45 2010 +0100 @@ -71,7 +71,7 @@ * Ownership is transferred! * @param aList New blocklist. */ - IMPORT_C void SetConversationInfoL(CImConversationInfoImp* aImMessage); + void SetConversationInfoL(CImConversationInfoImp* aImMessage); public: // From MXIMPSubscriptionItem /** diff -r cfd5c2994f10 -r 113b91e0a2ad imservices/instantmessagingcache/group/bld.inf --- a/imservices/instantmessagingcache/group/bld.inf Tue Aug 31 15:31:29 2010 +0300 +++ b/imservices/instantmessagingcache/group/bld.inf Wed Sep 01 12:27:45 2010 +0100 @@ -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" diff -r cfd5c2994f10 -r 113b91e0a2ad imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp --- a/imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -100,8 +100,7 @@ } case EIMOperationCompleted : { - iUpdateHandler.HandleIMCacheEventL( EIMCacheRequestCompleted, NULL ); - break; + iUpdateHandler.HandleIMCacheEventL( EIMCacheRequestCompleted, NULL ); } case EIMOperationChatStarted : { diff -r cfd5c2994f10 -r 113b91e0a2ad imservices/instantmessagingcache/imcacheserver/group/imcacheserver.mmp --- a/imservices/instantmessagingcache/imcacheserver/group/imcacheserver.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/imservices/instantmessagingcache/imcacheserver/group/imcacheserver.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -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 diff -r cfd5c2994f10 -r 113b91e0a2ad imservices/instantmessagingcache/imcacheserver/inc/ccacheserveractivehelper.h --- a/imservices/instantmessagingcache/imcacheserver/inc/ccacheserveractivehelper.h Tue Aug 31 15:31:29 2010 +0300 +++ b/imservices/instantmessagingcache/imcacheserver/inc/ccacheserveractivehelper.h Wed Sep 01 12:27:45 2010 +0100 @@ -102,8 +102,10 @@ * 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 ); + void PublishMessageInfoL(const TDesC& aSenderId,TInt aServiceId, + TBool aCloseConversation = EFalse ); public: diff -r cfd5c2994f10 -r 113b91e0a2ad imservices/instantmessagingcache/imcacheserver/src/ccacheserveractivehelper.cpp --- a/imservices/instantmessagingcache/imcacheserver/src/ccacheserveractivehelper.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/imservices/instantmessagingcache/imcacheserver/src/ccacheserveractivehelper.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -226,19 +226,30 @@ } // 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 ) { - unreadCount = unreadCount + header->UnreadMessageCount(); + if(buddyId->Compare(iHeaderArray[i]->BuddyId()) == 0) + { + currentContactUnReadCount = header->UnreadMessageCount(); + } + if(header->UnreadMessageCount()) + { + id = i; + } + } } - if(!unreadCount) + + if(!currentContactUnReadCount) { - PublishMessageInfoL(*buddyId,sericeId); + PublishMessageInfoL(iHeaderArray[id]->BuddyId(),sericeId); } CleanupStack::PopAndDestroy(buddyId); @@ -430,7 +441,37 @@ { 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; @@ -469,6 +510,10 @@ } 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") ); @@ -550,6 +595,7 @@ { TRACE( T_LIT( "CCacheServerActiveHelper::GetServiceChatHeaderArrayL start") ); + CleanupClosePushL(aServiceHeaderArray); if( -1 == aServiceId ) { @@ -566,6 +612,7 @@ } } } + CleanupStack::Pop(&aServiceHeaderArray); TRACE( T_LIT( "CCacheServerActiveHelper::GetServiceChatHeaderArrayL end") ); } @@ -622,7 +669,8 @@ // name of history data // ----------------------------------------------------------------------------- // -void CCacheServerActiveHelper::PublishMessageInfoL(const TDesC& aSenderId,TInt aServiceId ) +void CCacheServerActiveHelper::PublishMessageInfoL(const TDesC& aSenderId,TInt aServiceId, + TBool aCloseConversation /*= EFalse*/ ) { // set/reset the status pane indicator here // based on the unread count. @@ -652,7 +700,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)); + TRAP_IGNORE(iPluginInfo[index]->Plugin().MessageInfoL(unreadCount,aServiceId,aSenderId,multipleSender,aCloseConversation)); } } // ----------------------------------------------------------------------------- diff -r cfd5c2994f10 -r 113b91e0a2ad imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp --- a/imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -241,7 +241,14 @@ if( iPacketsArray.Count() ) { CIMCacheBufferArray* packet = iPacketsArray[ 0 ] ; - iObserverMessage.Complete( packet->OperationCode() ); + if( packet->OperationCode() == EIMOperationFetchAll ) + { + iObserverMessage.Complete( EIMOperationDataAvailable ); + } + else + { + iObserverMessage.Complete( packet->OperationCode() ); + } iObserverActive = EFalse; } @@ -278,7 +285,14 @@ if( iPacketsArray.Count() ) { CIMCacheBufferArray* packet = iPacketsArray[ 0 ] ; - iObserverMessage.Complete( packet->OperationCode() ); + if( packet->OperationCode() == EIMOperationFetchAll ) + { + iObserverMessage.Complete( EIMOperationUnreadChange ); + } + else + { + iObserverMessage.Complete( packet->OperationCode() ); + } iObserverActive = EFalse; } break; @@ -560,7 +574,7 @@ { // write the message into continuous memory stream if( iAccessorInitialized || - iConvesationInitialized && aMsgHeader->IsChatStarted() ) + iConvesationInitialized /*&& aMsgHeader->IsChatStarted()*/ ) { ExternalizeSingleChatDataL(EIMOperationUnreadMessage, aMsgHeader, aMessage ); if( iObserverActive ) diff -r cfd5c2994f10 -r 113b91e0a2ad imservices/xmppsettingsapi/group/bld.inf --- a/imservices/xmppsettingsapi/group/bld.inf Tue Aug 31 15:31:29 2010 +0300 +++ b/imservices/xmppsettingsapi/group/bld.inf Wed Sep 01 12:27:45 2010 +0100 @@ -24,12 +24,14 @@ DEFAULT PRJ_EXPORTS + +#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/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 diff -r cfd5c2994f10 -r 113b91e0a2ad imservices/xmppsettingsapi/tsrc/conf/xmppsettings_api.cfg --- a/imservices/xmppsettingsapi/tsrc/conf/xmppsettings_api.cfg Tue Aug 31 15:31:29 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -[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] - - diff -r cfd5c2994f10 -r 113b91e0a2ad imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt --- a/imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt Tue Aug 31 15:31:29 2010 +0300 +++ b/imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt Wed Sep 01 12:27:45 2010 +0100 @@ -1,5 +1,6 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +#/*TYPE TESTCLASS*/ +#/* +#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" @@ -11,9 +12,10 @@ # # Contributors: # -# Description: -# +# Description: MMP file for STIF Test Framework's TestScripter +# testclass test module. # +#*/ # Doxyfile 1.4.1 diff -r cfd5c2994f10 -r 113b91e0a2ad imservices/xmppsettingsfetcher/group/bld.inf --- a/imservices/xmppsettingsfetcher/group/bld.inf Tue Aug 31 15:31:29 2010 +0300 +++ b/imservices/xmppsettingsfetcher/group/bld.inf Wed Sep 01 12:27:45 2010 +0100 @@ -22,7 +22,10 @@ DEFAULT PRJ_EXPORTS + +#ifdef FF_MECO_XMPP ../rom/xmppsettingsfetcher.iby CORE_MW_LAYER_IBY_EXPORT_PATH(xmppsettingsfetcher.iby) +#endif PRJ_MMPFILES diff -r cfd5c2994f10 -r 113b91e0a2ad imsrv_plat/im_cache_server_api/inc/cinstantmsgindicator.h --- a/imsrv_plat/im_cache_server_api/inc/cinstantmsgindicator.h Tue Aug 31 15:31:29 2010 +0300 +++ b/imsrv_plat/im_cache_server_api/inc/cinstantmsgindicator.h Wed Sep 01 12:27:45 2010 +0100 @@ -61,8 +61,11 @@ * @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) = 0; + virtual void MessageInfoL(TInt aNewMessages, TInt aSeriveId,const TDesC& aSenderId, + TInt aMultipleSenders,TBool aCloseConversation = EFalse) = 0; private: /** diff -r cfd5c2994f10 -r 113b91e0a2ad imsrv_plat/ximp_core_feature_plugin_api/group/bld.inf --- a/imsrv_plat/ximp_core_feature_plugin_api/group/bld.inf Tue Aug 31 15:31:29 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/group/bld.inf Wed Sep 01 12:27:45 2010 +0100 @@ -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) diff -r cfd5c2994f10 -r 113b91e0a2ad imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwteststatuseventlistener.cpp --- a/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwteststatuseventlistener.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils/testcaseutils/prfwteststatuseventlistener.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -186,6 +186,7 @@ RArray< TXIMPTestStatusEventSnapshot >& aArray, TXIMPTestStatusEventTemplate aTemplate ) { + CleanupClosePushL(aArray); switch( aTemplate ) { // session handling @@ -552,6 +553,7 @@ Panic( EStatusEventListenerUnknownEventTemplate ); } } + CleanupStack::Pop(&aArray); } diff -r cfd5c2994f10 -r 113b91e0a2ad imsrv_plat/ximp_im_data_model_api/inc/imoperationfactoryimp.h --- a/imsrv_plat/ximp_im_data_model_api/inc/imoperationfactoryimp.h Tue Aug 31 15:31:29 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -/* -* 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 -class CXIMPOperationBase; - -#include "ximpoperationfactory.h" - -/** - * Operation factory - * Class is owned by and handled as singleton by CXIMPGlobals. - * - * @lib imoperation.dll - * @since S60 v4.0 - */ -class CImOperationFactory : public CBase, - public MXIMPOperationFactory - { - public: // Construction and desctruction - - IMPORT_C static CImOperationFactory* NewL(); - - ~CImOperationFactory(); - - private: // Construction - - /** - * C++ default constructor. - */ - CImOperationFactory(); - - /** - * Symbian 2nd phase constructor - */ - void ConstructL(); - - - public: // From MXIMPOperationFactory - - /** - * @see MXIMPOperationFactory - */ - CXIMPOperationBase* CreateOperationL( TInt aOperation ); - - private: // Data - - }; - -#endif // IMCOPERATIONFACTORYIMP_H - diff -r cfd5c2994f10 -r 113b91e0a2ad imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt --- a/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt Tue Aug 31 15:31:29 2010 +0300 +++ b/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt Wed Sep 01 12:27:45 2010 +0100 @@ -1,5 +1,7 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). #* All rights reserved. +#/*TYPE TESTCLASS*/ +#/* +#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 @@ -10,9 +12,11 @@ # # Contributors: # -# Description: +# Description: MMP file for STIF Test Framework's TestScripter +# testclass test module. # -# +#*/ + # Doxyfile 1.4.1 #--------------------------------------------------------------------------- diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/core/srcprocessor/ximphostimp.cpp --- a/ximpfw/core/srcprocessor/ximphostimp.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/core/srcprocessor/ximphostimp.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -137,8 +137,7 @@ for ( int i = 0;i < 5;i++ ) { - TInt Ret = iCallBack.Append( new ( ELeave ) CAsyncCallBack( CActive::EPriorityHigh ) ); - UNUSED_FORMAL_PARAM(Ret); + iCallBack.Append( new ( ELeave ) CAsyncCallBack( CActive::EPriorityHigh ) ); } iCallBack[ECompleteRequestCallback]->Set( TCallBack( CompleteRequestCallback, this ) ); diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/core/srcprocessor/ximphostimp.h --- a/ximpfw/core/srcprocessor/ximphostimp.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/core/srcprocessor/ximphostimp.h Wed Sep 01 12:27:45 2010 +0100 @@ -28,7 +28,6 @@ #include "ximprequestidbuilder.h" - class CXIMPOperationBase; class CXIMPEventManager; class MXIMPObjectFactory; @@ -53,8 +52,6 @@ class CProtocolPresenceDataHostImp; class MProtocolDataHost; -#define UNUSED_FORMAL_PARAM(p) (void) p - /** * Presence connection host. diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/core/srcutils/ximpobjecthelpers.cpp --- a/ximpfw/core/srcutils/ximpobjecthelpers.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/core/srcutils/ximpobjecthelpers.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -59,6 +59,7 @@ // EXPORT_C void TXIMPHBuf8Packer::UnPackArrayL( RPointerArray< HBufC8 >& aBufferArray, const TDesC8& aPack ) { + CleanupClosePushL( aBufferArray ); // No reset if ( ! aPack.Length() ) { @@ -83,6 +84,7 @@ aBufferArray.AppendL( theObject ); } CleanupStack::Pop( objCount ); // all the objects - CleanupStack::PopAndDestroy(); // rs + CleanupStack::PopAndDestroy(); // rs + CleanupStack::Pop( &aBufferArray ); } // End of file diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/presence/srcpresencecache/presencecacheserver/presencecacheservicestore.cpp --- a/ximpfw/presence/srcpresencecache/presencecacheserver/presencecacheservicestore.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/presence/srcpresencecache/presencecacheserver/presencecacheservicestore.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -137,10 +137,10 @@ TInt CPresenceCacheServiceStore::AddBlind(CPresenceCacheBuddyStore* aBuddyStore) { TRACE( _L("CPresenceCacheServiceStore::AddBlind - begin") ); - if(aBuddyStore) - TRACE_1( _L("______identity: %S"), &(aBuddyStore->BuddyId()->Identity())); - else - return KErrArgument; + TRACE_1( _L("______identity: %S"), &(aBuddyStore->BuddyId()->Identity())); + + if(!aBuddyStore) + return KErrArgument; iBuddyStoreCollection.Append(aBuddyStore); @@ -163,16 +163,13 @@ (MPresenceBuddyInfo* aBuddyPresInfo) { TRACE( _L("CPresenceCacheServiceStore::AddOrReplacePresence - begin") ); - + TRACE_1( _L("______identity: %S"), &(aBuddyPresInfo->BuddyId()->Identity())); CPresenceCacheBuddyStore* newBuddyStore(NULL); - if(aBuddyPresInfo) - TRACE_1( _L("______identity: %S"), &(aBuddyPresInfo->BuddyId()->Identity())); - else - { - return newBuddyStore; - } + if(!aBuddyPresInfo) + return newBuddyStore; + TBool oldPresExists(EFalse); TInt count = iBuddyStoreCollection.Count(); diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/presence/srcpresencecache/presencecacheserver/presencecachesession.cpp --- a/ximpfw/presence/srcpresencecache/presencecacheserver/presencecachesession.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/presence/srcpresencecache/presencecacheserver/presencecachesession.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -740,11 +740,8 @@ CleanupStack::Pop(serviceStore); } buddyStore = CPresenceCacheBuddyStore::NewLC(serviceStore,identity); - if(buddyStore) - { - err = serviceStore->AddBlind(buddyStore); //ownership transferred - CleanupStack::Pop(buddyStore); - } + err = serviceStore->AddBlind(buddyStore); //ownership transferred + CleanupStack::Pop(buddyStore); CleanupStack::Pop(identity); } else diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/presence/srcpresencedatamodel/presencecache/presencebuddyinfolistimp.cpp --- a/ximpfw/presence/srcpresencedatamodel/presencecache/presencebuddyinfolistimp.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/presence/srcpresencedatamodel/presencecache/presencebuddyinfolistimp.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -141,10 +141,9 @@ MPresenceBuddyInfo* aPresenceBuddyInfo) { TRACE( _L("CPresenceBuddyInfoListImp::AddOrReplace - begin") ); - if(aPresenceBuddyInfo) - TRACE_1( _L("______identity: %S"), &(aPresenceBuddyInfo->BuddyId()->Identity())); - else - return KErrArgument; + TRACE_1( _L("______identity: %S"), &(aPresenceBuddyInfo->BuddyId()->Identity())); + if(!aPresenceBuddyInfo) + return KErrArgument; if ( (ServiceName() != KNullDesC) && (ExtractService( aPresenceBuddyInfo->BuddyId()->Identity()).Compare( ServiceName()) )) diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/group/bld.inf --- a/ximpfw/tsrc/group/bld.inf Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/group/bld.inf Wed Sep 01 12:27:45 2010 +0100 @@ -54,6 +54,7 @@ ../src/t_presenceall/t_presenceall.mmp // Export the .iby for module release tests -PRJ_EXPORTS + +PRJ_TESTEXPORTS ximpfwmrt.iby /epoc32/rom/include/ximpfwmrt.iby diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presenceall/t_presenceall.cpp --- a/ximpfw/tsrc/src/t_presenceall/t_presenceall.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceall/t_presenceall.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,9 @@ #include "eunittools.h" -#include + +#include +#include #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presenceall/t_presenceall.h --- a/ximpfw/tsrc/src/t_presenceall/t_presenceall.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceall/t_presenceall.h Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,10 @@ #ifndef T_PRESENCEALL_H #define T_PRESENCEALL_H -#include + +// EXTERNAL INCLUDES +#include +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presenceall/t_presenceall.mmp --- a/ximpfw/tsrc/src/t_presenceall/t_presenceall.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceall/t_presenceall.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,11 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_presenceall.dll +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presenceall.cpp @@ -33,13 +37,28 @@ USERINCLUDE ../../../presence/srcpresencedatamodel/presenceinfo USERINCLUDE ../../../core/srcutils + +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif + LIBRARY ecom.lib LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib LIBRARY estor.lib LIBRARY ximputils.lib - +LIBRARY eunit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp --- a/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,11 @@ #include "eunittools.h" -#include + + +#include +#include + #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.h --- a/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.h Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,11 @@ #ifndef T_PRESENCEAUTHORIZATION_H #define T_PRESENCEAUTHORIZATION_H -#include + +// EXTERNAL INCLUDES +#include +#include + #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp --- a/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -18,8 +18,12 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_presenceauthorization.dll +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presenceauthorization.cpp @@ -35,6 +39,19 @@ 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 @@ -50,8 +67,9 @@ LIBRARY presencedatamodel.lib LIBRARY estor.lib LIBRARY ximputils.lib - - +LIBRARY eunit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.cpp --- a/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,9 @@ #include "eunittools.h" -#include + +#include +#include #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.h --- a/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.h Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,10 @@ #ifndef T_PRESENCEBLOCKING_H #define T_PRESENCEBLOCKING_H -#include + +// EXTERNAL INCLUDES +#include +#include #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.mmp --- a/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,11 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_presenceblocking.dll +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presenceblocking.cpp @@ -34,6 +38,19 @@ 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 @@ -47,8 +64,11 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib +LIBRARY estor.lib LIBRARY ximputils.lib -LIBRARY estor.lib +LIBRARY eunit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp --- a/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,10 @@ #include "eunittools.h" -#include + +#include +#include + #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h --- a/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,11 @@ #ifndef T_PRESENCEGRANTREQUESTMANAGEMENT_H #define T_PRESENCEGRANTREQUESTMANAGEMENT_H -#include + +// EXTERNAL INCLUDES +#include +#include + #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp --- a/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,11 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_presencegrantrequestmngt.dll +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presencegrantrequestmngt.cpp @@ -34,6 +38,19 @@ 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 @@ -47,8 +64,11 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib +LIBRARY estor.lib LIBRARY ximputils.lib -LIBRARY estor.lib +LIBRARY eunit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp --- a/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,11 @@ #include "eunittools.h" -#include + + +#include +#include + #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h --- a/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,11 @@ #ifndef T_PRESENCEGROUPLISTMANAGEMENT_H #define T_PRESENCEGROUPLISTMANAGEMENT_H -#include + +// EXTERNAL INCLUDES +#include +#include + #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp --- a/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,11 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_presencegrouplistmngt.dll +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presencegrouplistmngt.cpp @@ -33,6 +37,20 @@ 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 @@ -47,8 +65,11 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib +LIBRARY estor.lib LIBRARY ximputils.lib -LIBRARY estor.lib +LIBRARY eunit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp --- a/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,10 @@ #include "eunittools.h" -#include + +#include +#include + #include #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h --- a/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,12 @@ #ifndef T_PRESENCEGROUPMEMBERMANAGEMENT_H #define T_PRESENCEGROUPMEMBERMANAGEMENT_H -#include + + +// EXTERNAL INCLUDES +#include +#include + #include #include #include "prfwteststatuseventlistener.h" diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp --- a/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,12 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include + TARGET t_presencegroupmembermngt.dll +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presencegroupmembermngt.cpp @@ -34,6 +39,18 @@ 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 @@ -47,8 +64,11 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib +LIBRARY estor.lib LIBRARY ximputils.lib -LIBRARY estor.lib +LIBRARY eunit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.cpp --- a/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,9 @@ #include "eunittools.h" -#include +#include +#include + #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.h --- a/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.h Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,11 @@ #ifndef T_PRESENCEPUBLISHING_H #define T_PRESENCEPUBLISHING_H -#include + +// EXTERNAL INCLUDES +#include +#include + #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.mmp --- a/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,12 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include + TARGET t_presencepublishing.dll +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presencepublishing.cpp @@ -34,6 +39,19 @@ 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 @@ -47,6 +65,11 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib +LIBRARY estor.lib +LIBRARY ximputils.lib +LIBRARY eunit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp --- a/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,10 @@ #include "eunittools.h" -#include +#include +#include + + #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h --- a/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,11 @@ #ifndef T_PRESENCEWATCHERLISTMANAGEMENT_H #define T_PRESENCEWATCHERLISTMANAGEMENT_H -#include + +// EXTERNAL INCLUDES +#include +#include + #include #include #include "presencetypehelpers.h" diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp --- a/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,11 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_presencewatcherlistmngt.dll +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presencewatcherlistmngt.cpp @@ -33,6 +37,19 @@ 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 @@ -46,7 +63,10 @@ LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib +LIBRARY euser.lib LIBRARY ximputils.lib +LIBRARY eunit.lib +LIBRARY eunitutil.lib LIBRARY estor.lib // end of file diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencewatching/t_presencewatching.cpp --- a/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,10 @@ #include "eunittools.h" -#include +#include +#include + + #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencewatching/t_presencewatching.h --- a/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.h Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,11 @@ #ifndef T_PRESENCEWATCHING_H #define T_PRESENCEWATCHING_H -#include + +// EXTERNAL INCLUDES +#include +#include + #include #include "prfwteststatuseventlistener.h" #include "prfwtestmessaging.h" diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_presencewatching/t_presencewatching.mmp --- a/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,11 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_presencewatching.dll +//CAPABILITY ALL - TCB - DRM +CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_presencewatching.cpp @@ -36,6 +40,20 @@ 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 @@ -52,7 +70,9 @@ LIBRARY estor.lib LIBRARY presencedatamodel.lib LIBRARY ximputils.lib - +LIBRARY eunit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_rootservices/t_rootservices.cpp --- a/ximpfw/tsrc/src/t_rootservices/t_rootservices.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_rootservices/t_rootservices.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -18,9 +18,11 @@ #include "t_rootservices.h" #include "eunittools.h" -#include + #include #include +#include +#include //XIMP headers #include diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_rootservices/t_rootservices.h --- a/ximpfw/tsrc/src/t_rootservices/t_rootservices.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_rootservices/t_rootservices.h Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,12 @@ #ifndef T_ROOTSERVICES_H__ #define T_ROOTSERVICES_H__ -#include + + +// EXTERNAL INCLUDES +#include +#include + #include class MXIMPProtocolInfo; diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_rootservices/t_rootservices.mmp --- a/ximpfw/tsrc/src/t_rootservices/t_rootservices.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_rootservices/t_rootservices.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,10 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_rootservices.dll +CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_rootservices.cpp @@ -34,9 +37,27 @@ USERINCLUDE ../../tsrcprotocols +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif LIBRARY ecom.lib LIBRARY bafl.lib +LIBRARY ximpdatamodel.lib +LIBRARY presencedatamodel.lib +LIBRARY estor.lib +LIBRARY ximputils.lib +LIBRARY eunit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_sessionmng/t_sessionmng.cpp --- a/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -15,7 +15,7 @@ * */ -#include +//#include #include #include #include @@ -44,6 +44,9 @@ +#include +#include + diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_sessionmng/t_sessionmng.h --- a/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.h Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,13 @@ #ifndef T_SESSIONMNG_H__ #define T_SESSIONMNG_H__ -#include + + + +// EXTERNAL INCLUDES +#include +#include + #include #include "prfwteststatuseventlistener.h" diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_sessionmng/t_sessionmng.mmp --- a/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,10 @@ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" #include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_sessionmng.dll +CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_sessionmng.cpp @@ -33,11 +36,27 @@ USERINCLUDE ../../../core/srcutils USERINCLUDE ../../tsrcprotocols +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif LIBRARY ecom.lib LIBRARY bafl.lib LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib +LIBRARY estor.lib +LIBRARY ximputils.lib +LIBRARY eunit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_utils/t_utils.cpp --- a/ximpfw/tsrc/src/t_utils/t_utils.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_utils/t_utils.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -16,16 +16,21 @@ */ -#include #include #include #include #include #include +#include "eunittools.h" + + +#include +#include + #include "t_utils.h" -#include "eunittools.h" + #include #include diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_utils/t_utils.h --- a/ximpfw/tsrc/src/t_utils/t_utils.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_utils/t_utils.h Wed Sep 01 12:27:45 2010 +0100 @@ -18,7 +18,12 @@ #ifndef T_UTILS_H__ #define T_UTILS_H__ -#include + +// EXTERNAL INCLUDES +#include +#include + + #include #include "prfwteststatuseventlistener.h" diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/src/t_utils/t_utils.mmp --- a/ximpfw/tsrc/src/t_utils/t_utils.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/src/t_utils/t_utils.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -16,13 +16,17 @@ */ #include "../../tsrcutils/eunitcommon/eunittstdllbase.hrh" +#include "../../tsrcutils/processmaster/pm.h" +#include +#include TARGET t_utils.dll +CAPABILITY EUNIT_CAPS SOURCEPATH . SOURCE t_utils.cpp -#include "../../tsrcutils/processmaster/pm.h" + USERINCLUDE ../../../core/srcdatamodel USERINCLUDE ../../../presence/srcpresencedatamodel @@ -34,6 +38,19 @@ 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 @@ -47,7 +64,12 @@ LIBRARY ecom.lib LIBRARY bafl.lib LIBRARY ximpdatamodel.lib +LIBRARY presencedatamodel.lib +LIBRARY estor.lib LIBRARY ximputils.lib +LIBRARY eunit.lib +LIBRARY eunitutil.lib +LIBRARY euser.lib // end of file diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp --- a/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -17,12 +17,14 @@ #include #include "../prfwtestprotocols_resource.hrh" +#include TARGET pr_prfwtestprotocol.dll TARGETTYPE PLUGIN UID XIMP_DLL_UID_ECOM_PLUGIN PRFW_DLL_UID_PR_PRFWTESTPROTOCOL VENDORID VID_DEFAULT -CAPABILITY ALL -TCB +//CAPABILITY ALL -TCB +CAPABILITY EUNIT_CAPS //ECOM RESOURCE @@ -58,7 +60,17 @@ SYSTEMINCLUDE ../../../inc/presence/presenceprotocolplugin SYSTEMINCLUDE ../../../inc/presence/presenceprotocolpluginhost +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif MW_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/ecom diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/tsrcutils/eunitcommon/eunittools.h --- a/ximpfw/tsrc/tsrcutils/eunitcommon/eunittools.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/tsrcutils/eunitcommon/eunittools.h Wed Sep 01 12:27:45 2010 +0100 @@ -19,10 +19,14 @@ #define EUNITTOOLS_H #include -#include -#include -#include -#include + +#include +#include + +#include +#include + + #include "cglobalwaitingnote.h" diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp --- a/ximpfw/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -17,17 +17,28 @@ // To get the MW_LAYER_SYSTEMINCLUDE-definition #include - +#include TARGET prfwtestprocessmaster.exe TARGETTYPE exe UID 0x0 0x10282DDE VENDORID VID_DEFAULT -CAPABILITY CAP_SERVER ProtServ PowerMgmt AllFiles ReadDeviceData +CAPABILITY CAP_SERVER ProtServ PowerMgmt AllFiles ReadDeviceData EUNIT_CAPS TARGETPATH /system/libs SOURCEPATH . SOURCE prfwtestprocessmaster.cpp +#if defined ( OS_LAYER_SYSTEMINCLUDE ) +OS_LAYER_SYSTEMINCLUDE +#else +SYSTEMINCLUDE /epoc32/include +#endif + + #if defined ( APP_LAYER_SYSTEMINCLUDE ) + APP_LAYER_SYSTEMINCLUDE + #else + SYSTEMINCLUDE \epoc32\include + #endif MW_LAYER_SYSTEMINCLUDE USERINCLUDE ../testcaseutils diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp --- a/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp Wed Sep 01 12:27:45 2010 +0100 @@ -15,14 +15,17 @@ * */ -#include -#include "prfwtestdlluids.hrh" +#include +#include + +#include "prfwtestdlluids.hrh" TARGET prfwtestcaseutils.dll TARGETTYPE dll UID PRFWTEST_DLL_UID_STATIC_INTERFACE PRFWTEST_DLL_UID_COMMON -CAPABILITY ALL -TCB +//CAPABILITY ALL -TCB -DRM +CAPABILITY EUNIT_CAPS VENDORID VID_DEFAULT @@ -60,6 +63,17 @@ // 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 @@ -69,7 +83,7 @@ SYSTEMINCLUDE ../../../inc/presence/presenceprotocolplugin SYSTEMINCLUDE ../../../inc/presence/presenceprotocolpluginhost -SYSTEMINCLUDE /epoc32/include/digia/eunit +SYSTEMINCLUDE /epoc32/include/platform/digia/eunit MW_LAYER_SYSTEMINCLUDE @@ -84,6 +98,8 @@ LIBRARY ximpdatamodel.lib LIBRARY presencedatamodel.lib LIBRARY ximputils.lib +LIBRARY aknnotify.lib +LIBRARY eiksrv.lib EXPORTUNFROZEN diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp --- a/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -65,13 +65,13 @@ { // check if we've already defined the keys. if we redefine and set // defaults, the test logic breaks. - TInt pubSubDefined = GetValueFor( EXIMPTestMetaPubSubDefined ); + /*TInt pubSubDefined = GetValueFor( EXIMPTestMetaPubSubDefined ); if ( pubSubDefined ) { // all done return; } - +*/ TInt r = 0; // special behavioral keys diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h --- a/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h Wed Sep 01 12:27:45 2010 +0100 @@ -21,7 +21,9 @@ // INCLUDES #include -#include + +#include +#include #include "prfwtestprocessmaster.h" #include "userafter.h" #include "prfwtestfiletool.h" diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/tsrc/tsrcutils/testcaseutils/prfwteststatuseventlistener.cpp --- a/ximpfw/tsrc/tsrcutils/testcaseutils/prfwteststatuseventlistener.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/tsrc/tsrcutils/testcaseutils/prfwteststatuseventlistener.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -186,6 +186,7 @@ RArray< TXIMPTestStatusEventSnapshot >& aArray, TXIMPTestStatusEventTemplate aTemplate ) { + CleanupClosePushL(aArray); switch( aTemplate ) { // session handling @@ -552,6 +553,7 @@ Panic( EStatusEventListenerUnknownEventTemplate ); } } + CleanupStack::Pop(&aArray); }