--- a/traceservices/tracefw/integ_test/ost/TEF/group/te_ostv2integsuite_disabled.mmp	Thu Aug 19 11:36:21 2010 +0300
+++ b/traceservices/tracefw/integ_test/ost/TEF/group/te_ostv2integsuite_disabled.mmp	Tue Aug 31 16:57:14 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"
@@ -13,21 +13,31 @@
 // Description:
 //
 
-
-
-/**
- @file te_ostv2integsuite_disabled.mmp
- @internalTechnology
-*/
 TARGET      te_ostv2integsuite_disabled.exe
 TARGETTYPE  exe
 UID         0x1000007A 0x1028722F
+CAPABILITY CommDD NetworkControl LocalServices
+
+EPOCHEAPSIZE 1048576 4194304 //ask why this epocsize
 
 MACRO TE_UPT_TRACE_DISABLED //could remove this and just #ifdef on SYMBIAN_TRACE_ENABLE
 #include    <platform/opensystemtrace.mmh>
 
 epocprocesspriority high
 
+OS_LAYER_SYSTEMINCLUDE
+
+USERINCLUDE ../te_ostv2integsuite_common/inc/
+USERINCLUDE ../traces
+USERINCLUDE ../te_ostv2integsuite_functional/inc/
+USERINCLUDE ../te_ostv2integsuite_performance/inc/
+USERINCLUDE ../te_ostv2integsuite_performance/inc/timer
+USERINCLUDE ../te_ostv2integsuite_performance/inc/sanity
+USERINCLUDE ../te_ostv2integsuite_performance/inc/csvoutput
+USERINCLUDE ../te_ostv2integsuite_functional/inc/record_content
+USERINCLUDE ../perfdevicedriver/inc/
+USERINCLUDE ../../../../common_utils/lightlogger/inc
+
 SOURCEPATH    	../te_ostv2integsuite_common/src/
 SOURCE			te_ostv2integsuite_server.cpp 
 SOURCE			te_ostv2integsuite_controller.cpp
@@ -38,6 +48,7 @@
 SOURCE			te_tracecontrolclearconfig.cpp
 SOURCE			te_tracecontrolcmds.cpp
 SOURCE			te_tracecontroldefaultconfig.cpp
+SOURCE			te_ctor_disabled.cpp
 
 SOURCEPATH    	../te_ostv2integsuite_functional/src/
 SOURCE        	te_tracecollectorclient.cpp
@@ -73,7 +84,6 @@
 SOURCE 		te_perfsanityhelpers.cpp
 SOURCE 		te_perfsanitytimer.cpp
 
-
 SOURCEPATH  ../perfdevicedriver/src/
 SOURCE		te_d32perfdrv.cpp 
 
@@ -84,24 +94,6 @@
 SOURCEPATH  ../te_ostv2integsuite_functional/src/record_content
 SOURCE		te_parser.cpp 
 SOURCE		te_tracerecord.cpp
-	
-USERINCLUDE	../te_ostv2integsuite_common/inc/
-USERINCLUDE	../traces
-USERINCLUDE	../te_ostv2integsuite_functional/inc/
-USERINCLUDE ../te_ostv2integsuite_performance/inc/
-USERINCLUDE ../te_ostv2integsuite_performance/inc/timer
-USERINCLUDE ../te_ostv2integsuite_performance/inc/sanity
-USERINCLUDE ../te_ostv2integsuite_performance/inc/csvoutput
-USERINCLUDE	../te_ostv2integsuite_functional/inc/record_content
-USERINCLUDE ../perfdevicedriver/inc/
-USERINCLUDE ../../../../common_utils/lightlogger/inc
-
-
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/test
-SYSTEMINCLUDE /epoc32/include/ecom
-SYSTEMINCLUDE /epoc32/include/platform
- 
 
 LIBRARY     euser.lib
 LIBRARY 	testexecuteutils.lib 
@@ -114,9 +106,4 @@
 MACRO __TEST_LIGHTLOGGER_ENABLED
 MACRO __LIGHTLOGGER_ENABLED
 
-
-EPOCHEAPSIZE 1048576 4194304 //ask why this epocsize
-
-CAPABILITY CommDD NetworkControl LocalServices
-
 SMPSAFE