--- a/traceservices/tracefw/integ_test/ost/TEF/traces/fixed_id.definitions	Tue Aug 31 16:57:14 2010 +0300
+++ b/traceservices/tracefw/integ_test/ost/TEF/traces/fixed_id.definitions	Wed Sep 01 12:39:58 2010 +0100
@@ -1,22 +1,18 @@
 #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
 [GROUP]TEST_GROUP=0xde
+[GROUP]TRACE_DEBUG=0x89
 [GROUP]TRACE_DUMP=0x89
 [GROUP]TRACE_FATAL=0x81
 [GROUP]TRACE_FLOW=0x8a
-[GROUP]TRACE_NORMAL=0x86
 [GROUP]TRACE_PERFORMANCE=0x8b
 [GROUP]TRACE_STATE=0x87
 [GROUP]USER_DEFINED_GID_1=0xdf
 [GROUP]USER_DEFINED_GID_2=0xe0
 [TRACE]TEST_GROUP[0xDE]_OstTesting=0x1
-[TRACE]TRACE_DUMP[0x89]_TEST_OSTTRACEWRAPPER2=0x1
-[TRACE]TRACE_DUMP[0x89]_TEST_OSTTRACEWRAPPER2w=0x5
-[TRACE]TRACE_DUMP[0x89]_TEST_OSTTRACEWRAPPER3=0x2
-[TRACE]TRACE_DUMP[0x89]_TEST_OSTTRACEWRAPPER3w=0x6
-[TRACE]TRACE_DUMP[0x89]_TEST_OSTTRACEWRAPPER5=0x3
-[TRACE]TRACE_DUMP[0x89]_TEST_OSTTRACEWRAPPER5w=0x7
-[TRACE]TRACE_DUMP[0x89]_TEST_OSTTRACEWRAPPER6=0x4
-[TRACE]TRACE_DUMP[0x89]_TEST_OSTTRACEWRAPPER6w=0x8
+[TRACE]TRACE_DEBUG[0x89]_TEST_OSTTRACEWRAPPER2=0x1
+[TRACE]TRACE_DEBUG[0x89]_TEST_OSTTRACEWRAPPER5=0x2
+[TRACE]TRACE_DUMP[0x89]_TEST_OSTTRACEWRAPPER3=0x1
+[TRACE]TRACE_DUMP[0x89]_TEST_OSTTRACEWRAPPER6=0x2
 [TRACE]TRACE_FATAL[0x81]_TEST_OSTTRACE0=0x9
 [TRACE]TRACE_FATAL[0x81]_TEST_OSTTRACE1=0xa
 [TRACE]TRACE_FATAL[0x81]_TEST_OSTTRACEDATA=0xb
@@ -28,9 +24,7 @@
 [TRACE]TRACE_FATAL[0x81]_TEST_OSTTRACEEXT4=0xf
 [TRACE]TRACE_FATAL[0x81]_TEST_OSTTRACEEXT5=0x10
 [TRACE]TRACE_FATAL[0x81]_TEST_OSTTRACEWRAPPER1=0x13
-[TRACE]TRACE_FATAL[0x81]_TEST_OSTTRACEWRAPPER1w=0x15
 [TRACE]TRACE_FATAL[0x81]_TEST_OSTTRACEWRAPPER4=0x14
-[TRACE]TRACE_FATAL[0x81]_TEST_OSTTRACEWRAPPER4w=0x16
 [TRACE]TRACE_FATAL[0x81]_TEST_OstTraceDef0=0x1
 [TRACE]TRACE_FATAL[0x81]_TEST_OstTraceDef1=0x2
 [TRACE]TRACE_FATAL[0x81]_TEST_OstTraceDefData=0x3
@@ -39,29 +33,16 @@
 [TRACE]TRACE_FATAL[0x81]_TEST_OstTraceDefExt3=0x6
 [TRACE]TRACE_FATAL[0x81]_TEST_OstTraceDefExt4=0x7
 [TRACE]TRACE_FATAL[0x81]_TEST_OstTraceDefExt5=0x8
-[TRACE]TRACE_FLOW[0x8A]_CTESTCTOR_INITLIST_TRACE=0x1
-[TRACE]TRACE_FLOW[0x8A]_CTESTCTOR_NO_INITLIST_TRACE=0x2
-[TRACE]TRACE_FLOW[0x8A]_TEST_OSTTRACEFUNCTIONEXIT1=0x7
-[TRACE]TRACE_FLOW[0x8A]_TEST_OSTTRACEFUNCTIONEXITEXT=0x8
-[TRACE]TRACE_FLOW[0x8A]_TEST_OSTTraceFunctionalityEntry0=0x3
-[TRACE]TRACE_FLOW[0x8A]_TEST_OSTTraceFunctionalityEntry1=0x4
-[TRACE]TRACE_FLOW[0x8A]_TEST_OSTTraceFunctionalityExt=0x5
-[TRACE]TRACE_FLOW[0x8A]_TEST_OstTraceFunctionExit0=0x6
-[TRACE]TRACE_NORMAL[0x86]_TEST_OSTTRACEWRAPPER1m=0x1
-[TRACE]TRACE_NORMAL[0x86]_TEST_OSTTRACEWRAPPER2m=0x2
-[TRACE]TRACE_NORMAL[0x86]_TEST_OSTTRACEWRAPPER3m=0x3
-[TRACE]TRACE_NORMAL[0x86]_TEST_OSTTRACEWRAPPER4m=0x4
-[TRACE]TRACE_NORMAL[0x86]_TEST_OSTTRACEWRAPPER5m=0x5
-[TRACE]TRACE_NORMAL[0x86]_TEST_OSTTRACEWRAPPER6m=0x6
-[TRACE]TRACE_NORMAL[0x86]_TEST_OSTTRACEWRAPPER7m=0x7
-[TRACE]TRACE_NORMAL[0x86]_TEST_OSTTRACEWRAPPER8m=0x8
-[TRACE]TRACE_NORMAL[0x86]_TEST_OSTTRACEWRAPPER9m=0x9
+[TRACE]TRACE_FLOW[0x8A]_TEST_OSTTRACEFUNCTIONEXIT1=0x5
+[TRACE]TRACE_FLOW[0x8A]_TEST_OSTTRACEFUNCTIONEXITEXT=0x6
+[TRACE]TRACE_FLOW[0x8A]_TEST_OSTTraceFunctionalityEntry0=0x1
+[TRACE]TRACE_FLOW[0x8A]_TEST_OSTTraceFunctionalityEntry1=0x2
+[TRACE]TRACE_FLOW[0x8A]_TEST_OSTTraceFunctionalityExt=0x3
+[TRACE]TRACE_FLOW[0x8A]_TEST_OstTraceFunctionExit0=0x4
 [TRACE]TRACE_PERFORMANCE[0x8B]_TEST_OSTTRACEEVENTSTART0=0x1
 [TRACE]TRACE_PERFORMANCE[0x8B]_TEST_OSTTRACEEVENTSTART1=0x2
 [TRACE]TRACE_PERFORMANCE[0x8B]_TEST_OSTTRACEEVENTSTOP=0x3
 [TRACE]TRACE_STATE[0x87]_TEST_OSTTRACESTATE0=0x1
 [TRACE]TRACE_STATE[0x87]_TEST_OSTTRACESTATE1=0x2
 [TRACE]USER_DEFINED_GID_1[0xDF]_TEST_OSTTRACEWRAPPER7=0x1
-[TRACE]USER_DEFINED_GID_1[0xDF]_TEST_OSTTRACEWRAPPER7w=0x2
 [TRACE]USER_DEFINED_GID_2[0xE0]_TEST_OSTTRACEWRAPPER8=0x1
-[TRACE]USER_DEFINED_GID_2[0xE0]_TEST_OSTTRACEWRAPPER8w=0x2