--- a/brandingserver/tools/sis/import_data/install.txt	Mon Jun 21 16:01:18 2010 +0300
+++ b/brandingserver/tools/sis/import_data/install.txt	Thu Aug 19 10:14:19 2010 +0300
@@ -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
+#
+#

--- a/ximpfw/tsrc/group/bld.inf	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/group/bld.inf	Thu Aug 19 10:14:19 2010 +0300
@@ -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
 

--- a/ximpfw/tsrc/src/t_presenceall/t_presenceall.cpp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceall/t_presenceall.cpp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,9 @@
 
 #include "eunittools.h"
 
-#include <eunitmacros.h>
+
+#include <platform/digia/eunit/eunitmacros.h>
+#include <platform/digia/eunit/teunitassertioninfo.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 

--- a/ximpfw/tsrc/src/t_presenceall/t_presenceall.h	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceall/t_presenceall.h	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,10 @@
 #ifndef T_PRESENCEALL_H
 #define T_PRESENCEALL_H
 
-#include <ceunittestsuiteclass.h>
+
+//  EXTERNAL INCLUDES
+#include <platform/digia/eunit/ceunittestsuiteclass.h>
+#include <platform/digia/eunit/EUnitDecorators.h>
 #include <ximpbase.h>
 #include "prfwteststatuseventlistener.h"
 #include "prfwtestmessaging.h"

--- a/ximpfw/tsrc/src/t_presenceall/t_presenceall.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceall/t_presenceall.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,11 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
+#include<platform_paths.hrh>
+#include<eunitcaps.h>
 TARGET              t_presenceall.dll
+//CAPABILITY              ALL - TCB - DRM
+CAPABILITY      EUNIT_CAPS
 
 SOURCEPATH          .
 SOURCE              t_presenceall.cpp
@@ -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
 

--- a/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.cpp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,11 @@
 
 #include "eunittools.h"
 
-#include <eunitmacros.h>
+
+
+#include <platform/digia/eunit/eunitmacros.h>
+#include <platform/digia/eunit/teunitassertioninfo.h>
+
 #include <ecom/ecom.h>
 #include <badesca.h>
 

--- a/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.h	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.h	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,11 @@
 #ifndef T_PRESENCEAUTHORIZATION_H
 #define T_PRESENCEAUTHORIZATION_H
 
-#include <ceunittestsuiteclass.h>
+
+//  EXTERNAL INCLUDES
+#include <platform/digia/eunit/ceunittestsuiteclass.h>
+#include <platform/digia/eunit/EUnitDecorators.h>
+
 #include <ximpbase.h>
 #include "prfwteststatuseventlistener.h"
 #include "prfwtestmessaging.h"

--- a/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceauthorization/t_presenceauthorization.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,8 +18,12 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
+#include<platform_paths.hrh>
+#include<eunitcaps.h>
 
 TARGET              t_presenceauthorization.dll
+//CAPABILITY              ALL - TCB - DRM
+CAPABILITY      EUNIT_CAPS
 
 SOURCEPATH          .
 SOURCE              t_presenceauthorization.cpp
@@ -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
 

--- a/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.cpp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.cpp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,9 @@
 
 #include "eunittools.h"
 
-#include <eunitmacros.h>
+
+#include <platform/digia/eunit/eunitmacros.h>
+#include <platform/digia/eunit/teunitassertioninfo.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 

--- a/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.h	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.h	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,10 @@
 #ifndef T_PRESENCEBLOCKING_H
 #define T_PRESENCEBLOCKING_H
 
-#include <ceunittestsuiteclass.h>
+
+//  EXTERNAL INCLUDES
+#include <platform/digia/eunit/ceunittestsuiteclass.h>
+#include <platform/digia/eunit/EUnitDecorators.h>
 #include <ximpbase.h>
 #include "prfwteststatuseventlistener.h"
 #include "prfwtestmessaging.h"

--- a/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presenceblocking/t_presenceblocking.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,11 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
+#include<platform_paths.hrh>
+#include<eunitcaps.h>
 TARGET              t_presenceblocking.dll
+//CAPABILITY              ALL - TCB - DRM
+CAPABILITY      EUNIT_CAPS
 
 SOURCEPATH          .
 SOURCE              t_presenceblocking.cpp
@@ -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

--- a/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.cpp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,10 @@
 
 #include "eunittools.h"
 
-#include <eunitmacros.h>
+
+#include <platform/digia/eunit/eunitmacros.h>
+#include <platform/digia/eunit/teunitassertioninfo.h>
+
 #include <ecom/ecom.h>
 #include <badesca.h>
 

--- a/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.h	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,11 @@
 #ifndef T_PRESENCEGRANTREQUESTMANAGEMENT_H
 #define T_PRESENCEGRANTREQUESTMANAGEMENT_H
 
-#include <ceunittestsuiteclass.h>
+
+//  EXTERNAL INCLUDES
+#include <platform/digia/eunit/ceunittestsuiteclass.h>
+#include <platform/digia/eunit/EUnitDecorators.h>
+
 #include <ximpbase.h>
 #include "prfwteststatuseventlistener.h"
 #include "prfwtestmessaging.h"

--- a/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegrantrequestmngt/t_presencegrantrequestmngt.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,11 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
+#include<platform_paths.hrh>
+#include<eunitcaps.h>
 TARGET              t_presencegrantrequestmngt.dll
+//CAPABILITY              ALL - TCB - DRM
+CAPABILITY      EUNIT_CAPS
 
 SOURCEPATH          .
 SOURCE              t_presencegrantrequestmngt.cpp
@@ -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

--- a/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.cpp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,11 @@
 
 #include "eunittools.h"
 
-#include <eunitmacros.h>
+
+
+#include <platform/digia/eunit/eunitmacros.h>
+#include <platform/digia/eunit/teunitassertioninfo.h>
+
 #include <ecom/ecom.h>
 #include <badesca.h>
 

--- a/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.h	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,11 @@
 #ifndef T_PRESENCEGROUPLISTMANAGEMENT_H
 #define T_PRESENCEGROUPLISTMANAGEMENT_H
 
-#include <ceunittestsuiteclass.h>
+
+//  EXTERNAL INCLUDES
+#include <platform/digia/eunit/ceunittestsuiteclass.h>
+#include <platform/digia/eunit/EUnitDecorators.h>
+
 #include <ximpbase.h>
 #include "prfwteststatuseventlistener.h"
 #include "prfwtestmessaging.h"

--- a/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegrouplistmngt/t_presencegrouplistmngt.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,11 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
+#include<platform_paths.hrh>
+#include<eunitcaps.h>
 TARGET              t_presencegrouplistmngt.dll
+//CAPABILITY              ALL - TCB - DRM
+CAPABILITY      EUNIT_CAPS
 
 SOURCEPATH          .
 SOURCE              t_presencegrouplistmngt.cpp
@@ -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
 

--- a/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.cpp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,10 @@
 
 #include "eunittools.h"
 
-#include <eunitmacros.h>
+
+#include <platform/digia/eunit/eunitmacros.h>
+#include <platform/digia/eunit/teunitassertioninfo.h>
+
 #include <ecom/ecom.h>
 #include <badesca.h>
 #include <e32std.h>

--- a/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.h	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,12 @@
 #ifndef T_PRESENCEGROUPMEMBERMANAGEMENT_H
 #define T_PRESENCEGROUPMEMBERMANAGEMENT_H
 
-#include <ceunittestsuiteclass.h>
+
+
+//  EXTERNAL INCLUDES
+#include <platform/digia/eunit/ceunittestsuiteclass.h>
+#include <platform/digia/eunit/EUnitDecorators.h>
+
 #include <ximpbase.h>
 #include <presenceinfo.h>
 #include "prfwteststatuseventlistener.h"

--- a/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencegroupmembermngt/t_presencegroupmembermngt.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,12 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
+#include<platform_paths.hrh>
+#include<eunitcaps.h>
+
 TARGET              t_presencegroupmembermngt.dll
+//CAPABILITY              ALL - TCB - DRM
+CAPABILITY      EUNIT_CAPS
 
 SOURCEPATH          .
 SOURCE              t_presencegroupmembermngt.cpp
@@ -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

--- a/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.cpp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.cpp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,9 @@
 
 #include "eunittools.h"
 
-#include <eunitmacros.h>
+#include <platform/digia/eunit/eunitmacros.h>
+#include <platform/digia/eunit/teunitassertioninfo.h>
+
 #include <ecom/ecom.h>
 #include <badesca.h>
 

--- a/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.h	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.h	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,11 @@
 #ifndef T_PRESENCEPUBLISHING_H
 #define T_PRESENCEPUBLISHING_H
 
-#include <ceunittestsuiteclass.h>
+
+//  EXTERNAL INCLUDES
+#include <platform/digia/eunit/ceunittestsuiteclass.h>
+#include <platform/digia/eunit/EUnitDecorators.h>
+
 #include <ximpbase.h>
 #include "prfwteststatuseventlistener.h"
 #include "prfwtestmessaging.h"

--- a/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencepublishing/t_presencepublishing.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,12 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
+#include<platform_paths.hrh>
+#include<eunitcaps.h>
+
 TARGET              t_presencepublishing.dll
+//CAPABILITY              ALL - TCB - DRM
+CAPABILITY      EUNIT_CAPS
 
 SOURCEPATH          .
 SOURCE              t_presencepublishing.cpp
@@ -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
 

--- a/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.cpp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,10 @@
 
 #include "eunittools.h"
 
-#include <eunitmacros.h>
+#include <platform/digia/eunit/eunitmacros.h>
+#include <platform/digia/eunit/teunitassertioninfo.h>
+
+
 #include <ecom/ecom.h>
 #include <badesca.h>
 

--- a/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.h	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,11 @@
 #ifndef T_PRESENCEWATCHERLISTMANAGEMENT_H
 #define T_PRESENCEWATCHERLISTMANAGEMENT_H
 
-#include <ceunittestsuiteclass.h>
+
+//  EXTERNAL INCLUDES
+#include <platform/digia/eunit/ceunittestsuiteclass.h>
+#include <platform/digia/eunit/EUnitDecorators.h>
+
 #include <ximpbase.h>
 #include <ximpcontextobserver.h>
 #include "presencetypehelpers.h"

--- a/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencewatcherlistmngt/t_presencewatcherlistmngt.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,11 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
+#include<platform_paths.hrh>
+#include<eunitcaps.h>
 TARGET              t_presencewatcherlistmngt.dll
+//CAPABILITY              ALL - TCB - DRM
+CAPABILITY      EUNIT_CAPS
 
 SOURCEPATH          .
 SOURCE              t_presencewatcherlistmngt.cpp
@@ -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

--- a/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.cpp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.cpp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,10 @@
 
 #include "eunittools.h"
 
-#include <eunitmacros.h>
+#include <platform/digia/eunit/eunitmacros.h>
+#include <platform/digia/eunit/teunitassertioninfo.h>
+
+
 #include <ecom/ecom.h>
 #include <badesca.h>
 

--- a/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.h	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.h	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,11 @@
 #ifndef T_PRESENCEWATCHING_H
 #define T_PRESENCEWATCHING_H
 
-#include <ceunittestsuiteclass.h>
+
+//  EXTERNAL INCLUDES
+#include <platform/digia/eunit/ceunittestsuiteclass.h>
+#include <platform/digia/eunit/EUnitDecorators.h>
+
 #include <ximpbase.h>
 #include "prfwteststatuseventlistener.h"
 #include "prfwtestmessaging.h"

--- a/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_presencewatching/t_presencewatching.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,11 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
+#include<platform_paths.hrh>
+#include<eunitcaps.h>
 TARGET              t_presencewatching.dll
+//CAPABILITY              ALL - TCB - DRM
+CAPABILITY      EUNIT_CAPS
 
 SOURCEPATH          .
 SOURCE              t_presencewatching.cpp
@@ -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
 

--- a/ximpfw/tsrc/src/t_rootservices/t_rootservices.cpp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_rootservices/t_rootservices.cpp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,9 +18,11 @@
 #include "t_rootservices.h"
 
 #include "eunittools.h"
-#include <eunitmacros.h>
+
 #include <ecom/ecom.h>
 #include <badesca.h>
+#include <platform/digia/eunit/eunitmacros.h>
+#include <platform/digia/eunit/teunitassertioninfo.h>
 
 //XIMP headers
 #include <ximpbase.h>

--- a/ximpfw/tsrc/src/t_rootservices/t_rootservices.h	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_rootservices/t_rootservices.h	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,12 @@
 #ifndef T_ROOTSERVICES_H__
 #define T_ROOTSERVICES_H__
 
-#include <ceunittestsuiteclass.h>
+
+
+//  EXTERNAL INCLUDES
+#include <platform/digia/eunit/ceunittestsuiteclass.h>
+#include <platform/digia/eunit/EUnitDecorators.h>
+
 #include <ximpbase.h>
 
 class MXIMPProtocolInfo;

--- a/ximpfw/tsrc/src/t_rootservices/t_rootservices.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_rootservices/t_rootservices.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,10 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
+#include<platform_paths.hrh>
+#include<eunitcaps.h>
 TARGET              t_rootservices.dll
+CAPABILITY      EUNIT_CAPS
 
 SOURCEPATH          .
 SOURCE              t_rootservices.cpp
@@ -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
 

--- a/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.cpp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.cpp	Thu Aug 19 10:14:19 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 
-#include <eunitmacros.h>
+//#include <eunitmacros.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 #include <e32base.h>
@@ -44,6 +44,9 @@
 
 
 
+#include <platform/digia/eunit/eunitmacros.h>
+#include <platform/digia/eunit/teunitassertioninfo.h>
+
 
 
 

--- a/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.h	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.h	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,13 @@
 #ifndef T_SESSIONMNG_H__
 #define T_SESSIONMNG_H__
 
-#include <ceunittestsuiteclass.h>
+
+
+
+//  EXTERNAL INCLUDES
+#include <platform/digia/eunit/ceunittestsuiteclass.h>
+#include <platform/digia/eunit/EUnitDecorators.h>
+
 #include <ximpbase.h>
 
 #include "prfwteststatuseventlistener.h"

--- a/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_sessionmng/t_sessionmng.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,10 @@
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
 #include            "../../tsrcutils/processmaster/pm.h"
 
+#include<platform_paths.hrh>
+#include<eunitcaps.h>
 TARGET              t_sessionmng.dll
+CAPABILITY      EUNIT_CAPS
 
 SOURCEPATH          .
 SOURCE              t_sessionmng.cpp
@@ -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
 

--- a/ximpfw/tsrc/src/t_utils/t_utils.cpp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_utils/t_utils.cpp	Thu Aug 19 10:14:19 2010 +0300
@@ -16,16 +16,21 @@
 */
 
 
-#include <eunitmacros.h>
 #include <ecom/ecom.h>
 #include <badesca.h>
 #include <e32property.h>
 #include <e32base.h>
 #include <e32std.h>
 
+#include "eunittools.h"
+
+
+#include <platform/digia/eunit/eunitmacros.h>
+#include <platform/digia/eunit/teunitassertioninfo.h>
+
 #include "t_utils.h"
 
-#include "eunittools.h"
+
 
 #include <ximpbase.h>
 #include <presenceinfo.h>

--- a/ximpfw/tsrc/src/t_utils/t_utils.h	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_utils/t_utils.h	Thu Aug 19 10:14:19 2010 +0300
@@ -18,7 +18,12 @@
 #ifndef T_UTILS_H__
 #define T_UTILS_H__
 
-#include <ceunittestsuiteclass.h>
+
+//  EXTERNAL INCLUDES
+#include <platform/digia/eunit/ceunittestsuiteclass.h>
+#include <platform/digia/eunit/EUnitDecorators.h>
+
+
 #include <ximpbase.h>
 
 #include "prfwteststatuseventlistener.h"

--- a/ximpfw/tsrc/src/t_utils/t_utils.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/src/t_utils/t_utils.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -16,13 +16,17 @@
 */
 
 #include            "../../tsrcutils/eunitcommon/eunittstdllbase.hrh"
+#include            "../../tsrcutils/processmaster/pm.h"
 
+#include<platform_paths.hrh>
+#include<eunitcaps.h>
 TARGET              t_utils.dll
+CAPABILITY      EUNIT_CAPS
 
 SOURCEPATH          .
 SOURCE              t_utils.cpp
 
-#include "../../tsrcutils/processmaster/pm.h"
+
 
 USERINCLUDE             ../../../core/srcdatamodel
 USERINCLUDE             ../../../presence/srcpresencedatamodel
@@ -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
 

--- a/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol/pr_prfwtestprotocol.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -17,12 +17,14 @@
 
 #include <platform_paths.hrh>
 #include "../prfwtestprotocols_resource.hrh"
+#include<eunitcaps.h>
 
 TARGET              pr_prfwtestprotocol.dll
 TARGETTYPE          PLUGIN
 UID                 XIMP_DLL_UID_ECOM_PLUGIN  PRFW_DLL_UID_PR_PRFWTESTPROTOCOL
 VENDORID            VID_DEFAULT
-CAPABILITY          ALL -TCB
+//CAPABILITY          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

--- a/ximpfw/tsrc/tsrcutils/eunitcommon/eunittools.h	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/tsrcutils/eunitcommon/eunittools.h	Thu Aug 19 10:14:19 2010 +0300
@@ -19,10 +19,14 @@
 #define EUNITTOOLS_H
 
 #include <e32std.h>
-#include <eunitmacros.h>
-#include <ceunittestcasedecorator.h>
-#include <ceunitalloctestcasedecorator.h>
-#include <ceunitemptytestcasedecorator.h>
+
+#include <platform/digia/eunit/eunitmacros.h>
+#include <platform/digia/eunit/teunitassertioninfo.h>
+
+#include <platform/digia/eunit/ceunittestsuiteclass.h>
+#include <platform/digia/eunit/EUnitDecorators.h>
+
+
 #include "cglobalwaitingnote.h"
 
 

--- a/ximpfw/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/tsrcutils/processmaster/prfwtestprocessmaster.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -17,17 +17,28 @@
 
 // To get the MW_LAYER_SYSTEMINCLUDE-definition
 #include <platform_paths.hrh>
-
+#include<eunitcaps.h>
 TARGET          prfwtestprocessmaster.exe
 TARGETTYPE      exe
 UID             0x0     0x10282DDE
 VENDORID        VID_DEFAULT
-CAPABILITY      CAP_SERVER ProtServ PowerMgmt AllFiles ReadDeviceData
+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

--- a/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestcaseutils.mmp	Thu Aug 19 10:14:19 2010 +0300
@@ -15,14 +15,17 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include                "prfwtestdlluids.hrh"
+#include<platform_paths.hrh>
+#include<eunitcaps.h>
+
+#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
 

--- a/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestmessenger.cpp	Thu Aug 19 10:14:19 2010 +0300
@@ -65,13 +65,13 @@
     {
     // check if we've already defined the keys. if we redefine and set
     // defaults, the test logic breaks.
-    TInt pubSubDefined = GetValueFor( EXIMPTestMetaPubSubDefined );
+    /*TInt pubSubDefined = GetValueFor( EXIMPTestMetaPubSubDefined );
     if ( pubSubDefined )
         {
         // all done
         return;
         }
-
+*/
     TInt r = 0;
 
     // special behavioral keys

--- a/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h	Mon Jun 21 16:01:18 2010 +0300
+++ b/ximpfw/tsrc/tsrcutils/testcaseutils/prfwtestrobustnesstools.h	Thu Aug 19 10:14:19 2010 +0300
@@ -21,7 +21,9 @@
 
 // INCLUDES
 #include <e32std.h>
-#include <eunitmacros.h>
+
+#include <platform/digia/eunit/eunitmacros.h>
+#include <platform/digia/eunit/teunitassertioninfo.h>
 #include "prfwtestprocessmaster.h"
 #include "userafter.h"
 #include "prfwtestfiletool.h"