# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1284500100 -10800
# Node ID 047f208ea78f0520ff775142079a89186340c2bb
# Parent  cc28652e0254d84c84761a20b2e6839820b544e6
Revision: 201035
Kit: 201035

diff -r cc28652e0254 -r 047f208ea78f loggingservices/eventlogger/LogWrap/inc/LOGWRAPLIMITS.H
--- a/loggingservices/eventlogger/LogWrap/inc/LOGWRAPLIMITS.H	Wed Sep 01 12:39:58 2010 +0100
+++ b/loggingservices/eventlogger/LogWrap/inc/LOGWRAPLIMITS.H	Wed Sep 15 00:35:00 2010 +0300
@@ -21,7 +21,7 @@
 
 /**
 String lengths
-@publishedPartner
+@publishedAll
 @released
 */
 const TInt KLogMaxRemotePartyLength = 64;
@@ -34,7 +34,7 @@
 
 /**
 Limits
-@publishedPartner
+@publishedAll
 @released
 */
    
diff -r cc28652e0254 -r 047f208ea78f loggingservices/eventlogger/group/BLD.INF
--- a/loggingservices/eventlogger/group/BLD.INF	Wed Sep 01 12:39:58 2010 +0100
+++ b/loggingservices/eventlogger/group/BLD.INF	Wed Sep 15 00:35:00 2010 +0300
@@ -23,7 +23,7 @@
 
 ../LogWrap/inc/LOGWRAP.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(logwrap.h)
 ../LogWrap/inc/LOGWRAPCONST.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(logwrapconst.h)
-../LogWrap/inc/LOGWRAPLIMITS.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(logwraplimits.h)
+../LogWrap/inc/LOGWRAPLIMITS.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(logwraplimits.h)
 ../LogWrap/inc/LOGWRAP.INL SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(logwrap.inl)
 ../LogWrap/inc/LOGWRAP.HRH /epoc32/include/logwrap.hrh
 ../LogWrap/inc/LOGFILTERANDEVENTCONSTANTS.HRH /epoc32/include/logfilterandeventconstants.hrh
diff -r cc28652e0254 -r 047f208ea78f persistentstorage/sqlite3api/GROUP/BLD.INF
--- a/persistentstorage/sqlite3api/GROUP/BLD.INF	Wed Sep 01 12:39:58 2010 +0100
+++ b/persistentstorage/sqlite3api/GROUP/BLD.INF	Wed Sep 15 00:35:00 2010 +0300
@@ -441,6 +441,7 @@
 ../TEST/TclScript/where5.test			z:/private/10285a82/where5.test
 ../TEST/TclScript/where6.test			z:/private/10285a82/where6.test
 ../TEST/TclScript/zeroblob.test			z:/private/10285a82/zeroblob.test
+../TEST/t_sqliteapi.txt				z:/private/212c3129/t_sqliteapi.txt
 
 PRJ_TESTMMPFILES
 
diff -r cc28652e0254 -r 047f208ea78f persistentstorage/sqlite3api/GROUP/sqlite3tests.iby
--- a/persistentstorage/sqlite3api/GROUP/sqlite3tests.iby	Wed Sep 01 12:39:58 2010 +0100
+++ b/persistentstorage/sqlite3api/GROUP/sqlite3tests.iby	Wed Sep 15 00:35:00 2010 +0300
@@ -430,6 +430,7 @@
 data=ZPRIVATE\10285a82\where5.test			\private\10285a82\where5.test
 data=ZPRIVATE\10285a82\where6.test			\private\10285a82\where6.test
 data=ZPRIVATE\10285a82\zeroblob.test			\private\10285a82\zeroblob.test
+data=ZPRIVATE\212C3129\t_sqliteapi.txt		\private\212c3129\t_sqliteapi.txt
 
 //The next line to be uncommented if the testing is performed locally. Otherwise tests will fail - 
 //the following file is missing and needed by the timezone server.
diff -r cc28652e0254 -r 047f208ea78f persistentstorage/sqlite3api/GROUP/t_sqliteapi.mmp
--- a/persistentstorage/sqlite3api/GROUP/t_sqliteapi.mmp	Wed Sep 01 12:39:58 2010 +0100
+++ b/persistentstorage/sqlite3api/GROUP/t_sqliteapi.mmp	Wed Sep 15 00:35:00 2010 +0300
@@ -31,6 +31,7 @@
 LIBRARY         sqlite3.lib
 LIBRARY			efsrv.lib
 
+UID		  0 0x212C3129
 VENDORID 0x70000001
 
 SMPSAFE
diff -r cc28652e0254 -r 047f208ea78f persistentstorage/sqlite3api/TEST/t_sqliteapi.c
--- a/persistentstorage/sqlite3api/TEST/t_sqliteapi.c	Wed Sep 01 12:39:58 2010 +0100
+++ b/persistentstorage/sqlite3api/TEST/t_sqliteapi.c	Wed Sep 15 00:35:00 2010 +0300
@@ -942,6 +942,8 @@
 			}
 		}
 	
+	srand((unsigned)&ThreadFunc);
+	
 	PrintS("Thread \"%s\" - begin\r\n", (char*)pname);
 	err = sqlite3_open(TheTestDbName, &db);
 	TEST2(err, SQLITE_OK);
@@ -949,6 +951,10 @@
 	
 	while(records < KRecordsCount)
 		{
+        if((records % 10) == 0)
+            {
+            PrintSI("Thread \"%s\", %d records.\r\n", (char*)pname, records);
+            }
 		err = sqlite3_exec(db, "BEGIN", 0, 0, &errmsg);
 		if(err == SQLITE_OK)
 			{
@@ -966,7 +972,7 @@
 		if(err == SQLITE_OK)
 			{
 			TheInsertRecCnt[threadIdx]	+= KCommitRecordsCount;
-			records += 2;
+			records += KCommitRecordsCount;
 			}
 		else if(err == SQLITE_BUSY)
 			{
@@ -974,11 +980,15 @@
 			(void)sqlite3_exec(db, "ROLLBACK", 0, 0, 0);
 			if(errmsg)
 				{
-				PrintSI("Err msg: %s. Err: %d.\r\n", errmsg, err);
+                char fmt[100];
+                strcpy(fmt, "Thread \"");
+                strcat(fmt, (char*)pname);
+                strcat(fmt, "\". Err msg: %s. Err: %d.\r\n");
+				PrintSI(fmt, errmsg, err);
 				sqlite3_free(errmsg);
 				errmsg = 0;
 				}
-			usleep(100);
+			usleep((rand() % 3000) + 500);
 			}
 		}
 
diff -r cc28652e0254 -r 047f208ea78f persistentstorage/sqlite3api/TEST/t_sqliteapi.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/persistentstorage/sqlite3api/TEST/t_sqliteapi.txt	Wed Sep 15 00:35:00 2010 +0300
@@ -0,0 +1,3 @@
+This file is not used by any of the SQLite tests.
+The only purpose of this file is: to create a private branch
+on Z: drive for t_sqliteapi test and copy the file there.
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/src/sysconfig/configfilemanager.cpp
--- a/traceservices/tracefw/ulogger/src/sysconfig/configfilemanager.cpp	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/src/sysconfig/configfilemanager.cpp	Wed Sep 15 00:35:00 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 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"
@@ -107,12 +107,14 @@
 	TInt error= fs.MkDir(fileName);
 	if(error==KErrNone || error== KErrAlreadyExists)
 		{
+        CleanupClosePushL(fs);
 		CFileMan* fMan = CFileMan::NewL(fs);
 		CleanupStack::PushL(fMan);
 		fileName.Append(KConfigFilename);
 		User::LeaveIfError(fMan->Copy(KDefaultConfigFilePath, fileName, CFileMan::EOverWrite) );
 		CleanupStack::PopAndDestroy(fMan);
 		User::LeaveIfError(fs.SetAtt(fileName,0, KEntryAttReadOnly));
+		CleanupStack::Pop(&fs);
 		}
 	fs.Close();
 	aFilePath.Zero();
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/src/uloggerserver/uloggerserver.cpp
--- a/traceservices/tracefw/ulogger/src/uloggerserver/uloggerserver.cpp	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/src/uloggerserver/uloggerserver.cpp	Wed Sep 15 00:35:00 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 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"
@@ -33,6 +33,18 @@
 namespace Ulogger {
 
 
+void CleanupPointerArray( TAny* aArray )
+    {
+    static_cast< RPointerArray< TPluginConfiguration >* >( aArray )->ResetAndDestroy();
+    static_cast< RPointerArray< TPluginConfiguration >* >( aArray )->Close();
+    }
+
+void CleanupResetAndDestroyPushL( RPointerArray< TPluginConfiguration >& aArray )
+    {
+    TCleanupItem item( CleanupPointerArray, &aArray );
+    CleanupStack::PushL( item );
+    }
+
 /*Default constructor*/
 CULoggerServer::CULoggerServer(TInt aPriority)
 : CServer2( aPriority )
@@ -1148,20 +1160,23 @@
 		}
 	}
 
-
 void CULoggerServer::InitializeFrameworksL()
 	{
 	//<create plugin allocator (plugins)>
 	//output settings
 	RBuf8 outPluginName;
 	outPluginName.Create(KMaxPluginName);
+	outPluginName.CleanupClosePushL();
 	RPointerArray<TPluginConfiguration> outputPluginSettings;
+	CleanupResetAndDestroyPushL(outputPluginSettings);
 	GetPluginAndSettingsL(outPluginName, &outputPluginSettings, EOutputPluginFilter);
 
 	//control settings
 	RBuf8 inputPluginName;
 	inputPluginName.Create(KMaxPluginName);
+	inputPluginName.CleanupClosePushL();
 	RPointerArray<TPluginConfiguration> inputPluginSettings;
+	CleanupResetAndDestroyPushL(inputPluginSettings);
 	this->GetPluginAndSettingsL(inputPluginName, &inputPluginSettings, EInputPluginFilter);
 
 	#if defined(__LIGHTLOGGER_ENABLED) && defined(__VERBOSE_MODE)
@@ -1184,14 +1199,8 @@
 		iInputFramework = CInputFramework::NewL(iPluginAllocator->GetInputPlugin(), inputPluginSettings, this);
 
 	//cleanup
-	outPluginName.Close();
-	outputPluginSettings.ResetAndDestroy();
-	outputPluginSettings.Close();
-	inputPluginName.Close();
-	inputPluginSettings.ResetAndDestroy();
-	inputPluginSettings.Close();
-
-	iDataWatcher = CULoggerWatcher::NewL();	
+	CleanupStack::PopAndDestroy(4,&outPluginName);
+	iDataWatcher = CULoggerWatcher::NewL();
 	}
 
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/group/bld.inf
--- a/traceservices/tracefw/ulogger/unit_test/group/bld.inf	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/group/bld.inf	Wed Sep 15 00:35:00 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 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"
@@ -25,45 +25,45 @@
 
 //te_outfrwk files
 te_outfrwk.iby		/epoc32/rom/include/te_outfrwk.iby
-../scripts/te_outfrwk.script      /epoc32/release/winscw/udeb/z/testdata/scripts/te_outfrwk.script
+../scripts/te_outfrwk.script      z:/testdata/scripts/te_outfrwk.script
 
 
 //te_sysconfig
 te_sysconfig.iby		/epoc32/rom/include/te_sysconfig.iby
-../scripts/te_sysconfig.script      /epoc32/release/winscw/udeb/z/testdata/scripts/te_sysconfig.script
+../scripts/te_sysconfig.script      z:/testdata/scripts/te_sysconfig.script
 
 
 //te_outfrwkchans/te_file
 te_file.iby /epoc32/rom/include/te_file.iby
-../scripts/te_file.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_file.script
+../scripts/te_file.script z:/testdata/scripts/te_file.script
 
 //te_outfrwkchans/te_serial
 te_serial.iby /epoc32/rom/include/te_serial.iby
-../scripts/te_serial.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_serial.script
+../scripts/te_serial.script z:/testdata/scripts/te_serial.script
 
 //te_server
 te_server.iby   	/epoc32/rom/include/te_server.iby
-../scripts/te_server.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_server.script
+../scripts/te_server.script z:/testdata/scripts/te_server.script
 
 //te_client
 te_client.iby   		/epoc32/rom/include/te_client.iby
-../scripts/te_client.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_client.script
+../scripts/te_client.script z:/testdata/scripts/te_client.script
 
 
 //to run all script files at once.
 te_unittestsuite.iby   			/epoc32/rom/include/te_unittestsuite.iby
-../scripts/te_unittestsuite.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_unittestsuite.script
+../scripts/te_unittestsuite.script z:/testdata/scripts/te_unittestsuite.script
 
 //to run automated script files at once
 te_automatedsuite.iby   			/epoc32/rom/include/te_automatedsuite.iby
-../scripts/te_automatedsuite.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_automatedsuite.script
+../scripts/te_automatedsuite.script z:/testdata/scripts/te_automatedsuite.script
 
 //te_createconfig
 te_createconfig.iby  	/epoc32/rom/include/te_createconfig.iby
 
 //te_sysstart
 te_sysstart.iby   			/epoc32/rom/include/te_sysstart.iby
-../scripts/te_sysstart.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_sysstart.script
+../scripts/te_sysstart.script z:/testdata/scripts/te_sysstart.script
 
 PRJ_TESTMMPFILES
 te_outfrwk.mmp
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/group/te_client.mmp
--- a/traceservices/tracefw/ulogger/unit_test/group/te_client.mmp	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_client.mmp	Wed Sep 15 00:35:00 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-2010 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"
@@ -43,8 +43,7 @@
 
 USERINCLUDE   ../../inc
 
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/test
+OS_LAYER_SYSTEMINCLUDE
 
 //Please add your system include under here. 
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/group/te_createconfig.mmp
--- a/traceservices/tracefw/ulogger/unit_test/group/te_createconfig.mmp	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_createconfig.mmp	Wed Sep 15 00:35:00 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-2010 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"
@@ -28,8 +28,7 @@
 SOURCE         	te_createconfigfullstep.cpp
 USERINCLUDE   	../../inc
 
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/test
+OS_LAYER_SYSTEMINCLUDE
 
 //Please add your system include under here. 
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/group/te_file.mmp
--- a/traceservices/tracefw/ulogger/unit_test/group/te_file.mmp	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_file.mmp	Wed Sep 15 00:35:00 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 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"
@@ -24,10 +24,7 @@
 //---------------------------------------
 // Specific files for TEFUnit
 //---------------------------------------
-SYSTEMINCLUDE	/epoc32/include
-SYSTEMINCLUDE	/epoc32/include/test
-SYSTEMINCLUDE	/epoc32/include/libc
-SYSTEMINCLUDE	/epoc32/include/ecom
+OS_LAYER_SYSTEMINCLUDE
 
 USERINCLUDE ../te-outfrwkchans/te-file
 USERINCLUDE ../../inc
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/group/te_outfrwk.mmp
--- a/traceservices/tracefw/ulogger/unit_test/group/te_outfrwk.mmp	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_outfrwk.mmp	Wed Sep 15 00:35:00 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 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"
@@ -34,9 +34,7 @@
 USERINCLUDE		../../inc
 
 USERINCLUDE		../../src/pluginframework
-SYSTEMINCLUDE	/epoc32/include
-SYSTEMINCLUDE	/epoc32/include/test
-SYSTEMINCLUDE	/epoc32/include/ecom
+OS_LAYER_SYSTEMINCLUDE
 
 LIBRARY		bafl.lib
 LIBRARY		euser.lib
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/group/te_serial.mmp
--- a/traceservices/tracefw/ulogger/unit_test/group/te_serial.mmp	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_serial.mmp	Wed Sep 15 00:35:00 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 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"
@@ -24,10 +24,7 @@
 //---------------------------------------
 // Specific files for TEFUnit
 //---------------------------------------
-SYSTEMINCLUDE	/epoc32/include
-SYSTEMINCLUDE	/epoc32/include/test
-SYSTEMINCLUDE	/epoc32/include/libc
-SYSTEMINCLUDE	/epoc32/include/ecom
+OS_LAYER_SYSTEMINCLUDE
 
 USERINCLUDE ../te-outfrwkchans/te-serial
 USERINCLUDE ../../inc
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/group/te_server.mmp
--- a/traceservices/tracefw/ulogger/unit_test/group/te_server.mmp	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_server.mmp	Wed Sep 15 00:35:00 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-2010 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"
@@ -57,9 +57,7 @@
 USERINCLUDE  ../../src/pluginframework
 USERINCLUDE   ../../src/uloggerserver
 
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/test
-SYSTEMINCLUDE /epoc32/include/ecom
+OS_LAYER_SYSTEMINCLUDE
 
 
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/group/te_sysconfig.mmp
--- a/traceservices/tracefw/ulogger/unit_test/group/te_sysconfig.mmp	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_sysconfig.mmp	Wed Sep 15 00:35:00 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 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"
@@ -40,9 +40,8 @@
 userinclude	../../src/sysconfig
 userinclude	../../inc
 userinclude	../../src/pluginframework
-SYSTEMINCLUDE	/epoc32/include
-SYSTEMINCLUDE	/epoc32/include/ecom
-SYSTEMINCLUDE	/epoc32/include/test
+
+OS_LAYER_SYSTEMINCLUDE
 
 LIBRARY		euser.lib
 LIBRARY		testexecutelogclient.lib
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/group/te_sysstart.mmp
--- a/traceservices/tracefw/ulogger/unit_test/group/te_sysstart.mmp	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_sysstart.mmp	Wed Sep 15 00:35:00 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 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"
@@ -21,10 +21,7 @@
 VENDORID 	0x70000001
 MACRO __ULOGGER_SYSTEMSTART_UNIT_TEST
 
-SYSTEMINCLUDE	/epoc32/include
-SYSTEMINCLUDE	/epoc32/include/test
-
-
+OS_LAYER_SYSTEMINCLUDE
 
 USERINCLUDE ../te-sysstart
 USERINCLUDE ../../inc
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/te_uloggerclientsuiteserver.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/te_uloggerclientsuiteserver.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/te_uloggerclientsuiteserver.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 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"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_ULOGGERCLIENT_SERVER_H__)
 #define __TE_ULOGGERCLIENT_SERVER_H__
-#include <testexecuteserverbase.h>
+#include <test/testexecuteserverbase.h>
 
 
 class CTestUloggerClientApi : public CTestServer
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/te_uloggerclientsuitestepbase.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/te_uloggerclientsuitestepbase.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/te_uloggerclientsuitestepbase.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 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"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_ULOGGERCLIENT_STEP_BASE__)
 #define __TE_ULOGGERCLIENT_STEP_BASE__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 
 #include "uloggerclient.h"
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/testconnectstep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testconnectstep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testconnectstep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTCONNECT_STEP_H__)
 #define __TESTCONNECT_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestConnectStep : public CTestUloggerClientApiStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/testdeactivateoutputpluginstep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testdeactivateoutputpluginstep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testdeactivateoutputpluginstep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTDEACTIVATEOUTPUTPLUGIN_STEP_H__)
 #define __TESTDEACTIVATEOUTPUTPLUGIN_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestDeactivateOutputPluginStep : public CTestUloggerClientApiStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/testgetprimaryfilterslstep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testgetprimaryfilterslstep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testgetprimaryfilterslstep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTGETPRIMARYFILTERSL_STEP_H__)
 #define __TESTGETPRIMARYFILTERSL_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestGetPrimaryFiltersLStep : public CTestUloggerClientApiStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/testgetsecondaryfilterslstep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testgetsecondaryfilterslstep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testgetsecondaryfilterslstep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTGETSECONDARYFILTERSL_STEP_H__)
 #define __TESTGETSECONDARYFILTERSL_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestGetSecondaryFiltersLStep : public CTestUloggerClientApiStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/testgettracebuffersizestep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testgettracebuffersizestep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testgettracebuffersizestep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTGETTRACEBUFFERSIZE_STEP_H__)
 #define __TESTGETTRACEBUFFERSIZE_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestGetTraceBufferSizeStep : public CTestUloggerClientApiStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/testremoveprimaryfltstep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testremoveprimaryfltstep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testremoveprimaryfltstep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTREMOVEPRIMARYFLT_STEP_H__)
 #define __TESTREMOVEPRIMARYFLT_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/testresizetracebuffersizestep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testresizetracebuffersizestep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testresizetracebuffersizestep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTRESIZETRACEBUFFERSIZE_STEP_H__)
 #define __TESTRESIZETRACEBUFFERSIZE_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestResizeTraceBufferSizeStep : public CTestUloggerClientApiStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/testruloggerapi_ext.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testruloggerapi_ext.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testruloggerapi_ext.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTRULOGGERAPI_EXT_H__)
 #define __TESTRULOGGERAPI_EXT_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 #include <uloggerclient.h>
 using namespace Ulogger;
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/testsetdatanotificationsizestep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testsetdatanotificationsizestep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testsetdatanotificationsizestep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTSETDATANOTIFICATIONSIZE_STEP_H__)
 #define __TESTSETDATANOTIFICATIONSIZE_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestSetDataNotificationSizeStep : public CTestUloggerClientApiStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/testsetprimaryfltstep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testsetprimaryfltstep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testsetprimaryfltstep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -24,7 +24,7 @@
 #if (!defined __TESTSETPRIMARYFLT_STEP_H__)
 #define __TESTSETPRIMARYFLT_STEP_H__
 
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestSetPrimaryFltStep : public CTestUloggerClientApiStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/testsetsecondaryfilterallstep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testsetsecondaryfilterallstep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testsetsecondaryfilterallstep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTSETSECONDARYFILTERALL_STEP_H__)
 #define __TESTSETSECONDARYFILTERALL_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestSetSecondaryFilterAllStep : public CTestUloggerClientApiStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/testsetsecondaryfltstep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testsetsecondaryfltstep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testsetsecondaryfltstep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTSETSECONDARYFLT_STEP_H__)
 #define __TESTSETSECONDARYFLT_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestSetSecondaryFltStep : public CTestUloggerClientApiStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/teststartstep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/teststartstep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/teststartstep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTSTART_STEP_H__)
 #define __TESTSTART_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestStartStep : public CTestUloggerClientApiStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/teststopstep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/teststopstep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/teststopstep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTSTOP_STEP_H__)
 #define __TESTSTOP_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestStopStep : public CTestUloggerClientApiStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/testtracebuffermodestep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testtracebuffermodestep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testtracebuffermodestep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTRESIZETRACEBUFFERSIZE_STEP_H__)
 #define __TESTRESIZETRACEBUFFERSIZE_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestTraceBufferModeStep : public CTestUloggerClientApiStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-client/testversionstep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testversionstep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testversionstep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTVERSION_STEP_H__)
 #define __TESTVERSION_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestVersionStep : public CTestUloggerClientApiStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigemptystep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigemptystep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigemptystep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -25,7 +25,7 @@
 #ifndef TE_CREATECONFIGEMPTYSTEP_H
 #define TE_CREATECONFIGEMPTYSTEP_H
 
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 
 //Test Sysconfig of Ulogger
 class CCreateConfigEmptyTestStep : public CTestStep
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigfullstep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigfullstep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigfullstep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -25,7 +25,7 @@
 #ifndef TE_CREATECONFIGFULLSTEP_H
 #define TE_CREATECONFIGFULLSTEP_H
 
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 
 //Test Sysconfig of Ulogger
 class CCreateConfigFUllTestStep : public CTestStep
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigserver.h
--- a/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigserver.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigserver.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 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"
@@ -16,7 +16,7 @@
 #ifndef TE_CREATECONFIG_SERVER_H
 #define TE_CREATECONFIG_SERVER_H
 
-#include<testexecuteserverbase.h>
+#include<test/testexecuteserverbase.h>
 
 /*
  * Derived class of the CTestServer
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-outfrwk/te_outfrwk_testserver.h
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwk/te_outfrwk_testserver.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwk/te_outfrwk_testserver.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 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"
@@ -16,7 +16,7 @@
 #ifndef T_OUTFRWK_SERVER_H
 #define T_OUTFRWK_SERVER_H
 
-#include<testexecuteserverbase.h>
+#include<test/testexecuteserverbase.h>
 
 /*
  * Derived class of the CTestServer
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-outfrwk/te_outfrwk_teststep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwk/te_outfrwk_teststep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwk/te_outfrwk_teststep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 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"
@@ -23,7 +23,7 @@
 #ifndef T_OUTFRWK_TESTSTEP_H
 #define T_OUTFRWK_TESTSTEP_H
 
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <e32base.h> // CBase
 #include <e32test.h>
 #include <f32file.h> // RFs, RFile
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/te_filesuiteserver.h
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/te_filesuiteserver.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/te_filesuiteserver.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_FILE_SERVER_H__)
 #define __TE_FILE_SERVER_H__
-#include <testexecuteserverbase.h>
+#include <test/testexecuteserverbase.h>
 
 
 class CTe_fileSuite : public CTestServer
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/te_filesuitestepbase.h
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/te_filesuitestepbase.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/te_filesuitestepbase.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_FILE_STEP_BASE__)
 #define __TE_FILE_STEP_BASE__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <uloggerclient.h>
 using namespace Ulogger;
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/uloggerfileplugintest.h
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/uloggerfileplugintest.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/uloggerfileplugintest.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 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"
@@ -20,7 +20,7 @@
 #ifndef __ULOGGERFILEPLUGINTEST_H__
 #define __ULOGGERFILEPLUGINTEST_H__
 
-#include <tefunit.h>
+#include <test/tefunit.h>
 #include "uloggerfileplugin.h"
 #include "te_filesuitestepbase.h"
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/te_serialsuiteserver.h
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/te_serialsuiteserver.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/te_serialsuiteserver.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_SERIAL_SERVER_H__)
 #define __TE_SERIAL_SERVER_H__
-#include <testexecuteserverbase.h>
+#include <test/testexecuteserverbase.h>
 
 
 class CTe_serialSuite : public CTestServer
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/te_serialsuitestepbase.h
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/te_serialsuitestepbase.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/te_serialsuitestepbase.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_SERIAL_STEP_BASE__)
 #define __TE_SERIAL_STEP_BASE__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <uloggerclient.h>
 using namespace Ulogger;
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/uloggerserialplugintest.h
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/uloggerserialplugintest.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/uloggerserialplugintest.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 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"
@@ -22,7 +22,7 @@
 #ifndef __ULOGGERSERIALPLUGINTEST_H__
 #define __ULOGGERSERIALPLUGINTEST_H__
 
-#include <tefunit.h>
+#include <test/tefunit.h>
 #include "uloggerserialplugin.h"
 #include "te_serialsuitestepbase.h"
 	
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-server/te_uloggerservertestsuiteserver.h
--- a/traceservices/tracefw/ulogger/unit_test/te-server/te_uloggerservertestsuiteserver.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/te_uloggerservertestsuiteserver.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 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"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_ULOGGERSERVERTEST_SERVER_H__)
 #define __TE_ULOGGERSERVERTEST_SERVER_H__
-#include <testexecuteserverbase.h>
+#include <test/testexecuteserverbase.h>
 
 
 class CTe_UloggerServerTestSuite : public CTestServer
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-server/te_uloggerservertestsuitestepbase.h
--- a/traceservices/tracefw/ulogger/unit_test/te-server/te_uloggerservertestsuitestepbase.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/te_uloggerservertestsuitestepbase.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 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"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_ULOGGERSERVERTEST_STEP_BASE__)
 #define __TE_ULOGGERSERVERTEST_STEP_BASE__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 // Please add your include here if you have 
 
 /****************************************************************************
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest0step.h
--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest0step.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest0step.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __ULOGGERSERVERTEST0_STEP_H__)
 #define __ULOGGERSERVERTEST0_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerservertestsuitestepbase.h"
 #include "uloggerwatcher.h"
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest1step.h
--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest1step.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest1step.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __ULOGGERSERVERTEST1_STEP_H__)
 #define __ULOGGERSERVERTEST1_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerservertestsuitestepbase.h"
 
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest2step.h
--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest2step.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest2step.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __ULOGGERSERVERTEST2_STEP_H__)
 #define __ULOGGERSERVERTEST2_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerservertestsuitestepbase.h"
 
 class CUloggerServerTest2Step : public CTe_UloggerServerTestSuiteStepBase
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest3step.h
--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest3step.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest3step.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __ULOGGERSERVERTEST3_STEP_H__)
 #define __ULOGGERSERVERTEST3_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerservertestsuitestepbase.h"
 #include "uloggerwatcher.h"
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest4step.h
--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest4step.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest4step.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __ULOGGERSERVERTEST4_STEP_H__)
 #define __ULOGGERSERVERTEST4_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerservertestsuitestepbase.h"
 #include "pluginallocator.h"
 #include "inputframework.h"
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest5step.h
--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest5step.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest5step.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -24,7 +24,7 @@
 
 #if (!defined __ULOGGERSERVERTEST5_STEP_H__)
 #define __ULOGGERSERVERTEST5_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerservertestsuitestepbase.h"
 
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest6step.h
--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest6step.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest6step.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -23,7 +23,7 @@
 */
 #if (!defined __ULOGGERSERVERTEST6_STEP_H__)
 #define __ULOGGERSERVERTEST6_STEP_H__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include "te_uloggerservertestsuitestepbase.h"
 #include "inputdata.h"
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-sysconfig/te_test_syscfgserver.h
--- a/traceservices/tracefw/ulogger/unit_test/te-sysconfig/te_test_syscfgserver.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-sysconfig/te_test_syscfgserver.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 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"
@@ -16,7 +16,7 @@
 #ifndef TE_SYSCFG_SERVER_H
 #define TE_SYSCFG_SERVER_H
 
-#include<testexecuteserverbase.h>
+#include<test/testexecuteserverbase.h>
 
 /*
  * Derived class of the CTestServer
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-sysconfig/te_test_syscfgstep.h
--- a/traceservices/tracefw/ulogger/unit_test/te-sysconfig/te_test_syscfgstep.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-sysconfig/te_test_syscfgstep.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -24,7 +24,7 @@
 #ifndef TE_SYSCFG_TESTSTEP_H
 #define TE_SYSCFG_TESTSTEP_H
 
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <e32base.h> // cbase
 #include <e32test.h>
 #include <f32file.h> // rfs, rfile
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-sysstart/te_sysstartersuiteserver.h
--- a/traceservices/tracefw/ulogger/unit_test/te-sysstart/te_sysstartersuiteserver.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-sysstart/te_sysstartersuiteserver.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_SYSSTARTER_SERVER_H__)
 #define __TE_SYSSTARTER_SERVER_H__
-#include <testexecuteserverbase.h>
+#include <test/testexecuteserverbase.h>
 
 
 class CTe_sysstartSuite : public CTestServer
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-sysstart/te_sysstartersuitestepbase.h
--- a/traceservices/tracefw/ulogger/unit_test/te-sysstart/te_sysstartersuitestepbase.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-sysstart/te_sysstartersuitestepbase.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_SYSSTART_STEP_BASE__)
 #define __TE_SYSSTART_STEP_BASE__
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 #include <uloggerclient.h>
 using namespace Ulogger;
 
diff -r cc28652e0254 -r 047f208ea78f traceservices/tracefw/ulogger/unit_test/te-sysstart/uloggersysstarttest.h
--- a/traceservices/tracefw/ulogger/unit_test/te-sysstart/uloggersysstarttest.h	Wed Sep 01 12:39:58 2010 +0100
+++ b/traceservices/tracefw/ulogger/unit_test/te-sysstart/uloggersysstarttest.h	Wed Sep 15 00:35:00 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 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"
@@ -20,7 +20,7 @@
 #ifndef __ULOGGERSYSSTARTTEST_H__
 #define __ULOGGERSYSSTARTTEST_H__
 
-#include <tefunit.h>
+#include <test/tefunit.h>
 #include "uloggersysstarter.h"
 #include "te_sysstartersuitestepbase.h"