diff -r 28839de615b4 -r 26645d81f48d traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorclient_disabled.script
--- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorclient_disabled.script	Thu Aug 19 11:36:21 2010 +0300
+++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorclient_disabled.script	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"
@@ -14,7 +14,7 @@
 //
 
 
-//! @File
+//! @file
 //! @SYMTestSuiteName           te-integ-tracecollectorclient_disabled.script
 //! @SYMScriptTestEnvironment   TEF
 
@@ -31,7 +31,7 @@
 //! @SYMTestActions             Run a combination of single and multiple group ID filter set() methods and check the contents of the get() methods on server return the filters as expected
 //! @SYMTestExpectedResults     Verify that the values returned by get methods match those expected from settings (test step returns a test pass if so)
 //! @SYMTestType                CT
-//! @SYMTESTSTATUS              Implemented
+//! @SYMTestStatus              Implemented
 //! @SYMPREQ                    PREQ2390
 //! @SYMREQ                     12128 12974 12975
     START_TEST_BLOCK    1000    te_ostv2integsuite_disabled             \testdata\configs\te_integ_tracecollectorclient.ini
@@ -48,7 +48,7 @@
 //! @SYMTestActions             Run a combination of single and multiple component ID filter set() methods and check the contents of the get() methods on server return the filters as expected
 //! @SYMTestExpectedResults     Verify that the values returned by get methods match those expected from settings (test step returns a test pass if so)
 //! @SYMTestType                CT
-//! @SYMTESTSTATUS              Implemented
+//! @SYMTestStatus              Implemented
 //! @SYMPREQ                    PREQ2390
 //! @SYMREQ                     12128 12974 12975
     START_TEST_BLOCK    20000   te_ostv2integsuite_disabled             \testdata\configs\te_integ_tracecollectorclient.ini
@@ -65,7 +65,7 @@
 //! @SYMTestActions             Run a combination of single and multiple filter and filtering set() methods instrument user-side trace points accordingly for positive, begative and multiple setting tests
 //! @SYMTestExpectedResults     Verify that no returned trace data and no output trace log files accordingly
 //! @SYMTestType                CT
-//! @SYMTESTSTATUS              Implemented
+//! @SYMTestStatus              Implemented
 //! @SYMPREQ                    PREQ2390
 //! @SYMREQ                     12128 12974 12975 12823 12824 12825 12128 12974 12975
     START_TEST_BLOCK    20000   te_ostv2integsuite_disabled             \testdata\configs\te_integ_tracecollectorclient.ini
@@ -82,7 +82,7 @@
 //! @SYMTestActions             Run a combination of single and multiple group ID filter and filtering set() methods and check the contents of the get() methods on server return the filters as expected
 //! @SYMTestExpectedResults     Verify that the values returned by get methods match those expected from settings (test step returns a test pass if so)
 //! @SYMTestType                CT
-//! @SYMTESTSTATUS              Implemented
+//! @SYMTestStatus              Implemented
 //! @SYMPREQ                    PREQ2390
 //! @SYMREQ                     12128 12974 12975
     START_TEST_BLOCK    1000    te_ostv2integsuite_disabled             \testdata\configs\te_integ_tracecollectorclient.ini
@@ -105,7 +105,7 @@
 //! @SYMTestActions             Run a combination of single and multiple component ID filter and filtering set() methods and check the contents of the get() methods on server return the filters as expected
 //! @SYMTestExpectedResults     Verify that the values returned by get methods match those expected from settings (test step returns a test pass if so)
 //! @SYMTestType                CT
-//! @SYMTESTSTATUS              Implemented
+//! @SYMTestStatus              Implemented
 //! @SYMPREQ                    PREQ2390
 //! @SYMREQ                     12128 12974 12975
     START_TEST_BLOCK    1000    te_ostv2integsuite_disabled             \testdata\configs\te_integ_tracecollectorclient.ini
@@ -128,7 +128,7 @@
 //! @SYMTestActions             Run a combination of buffer resizing methods and run over various stress testing trace instrumentations. Check the contents of the output file is as expected
 //! @SYMTestExpectedResults     Verify that output file contains no #traces as expected
 //! @SYMTestType                CT
-//! @SYMTESTSTATUS              Implemented
+//! @SYMTestStatus              Implemented
 //! @SYMPREQ                    PREQ2390
 //! @SYMREQ                     12152 
     START_TEST_BLOCK    1000    te_ostv2integsuite_disabled             \testdata\configs\te_integ_tracecollectorclient.ini
@@ -145,7 +145,7 @@
 //! @SYMTestActions             Run a combination of buffer mode change methods and run over various stress testing trace instrumentations. check the contents of the output file is as expected
 //! @SYMTestExpectedResults     Verify that output file contains no 
 //! @SYMTestType                CT
-//! @SYMTESTSTATUS              Implemented
+//! @SYMTestStatus              Implemented
 //! @SYMPREQ                    PREQ2390
 //! @SYMREQ                     12152 
     START_TEST_BLOCK    1000    te_ostv2integsuite_disabled             \testdata\configs\te_integ_tracecollectorclient.ini
@@ -163,7 +163,7 @@
 //! @SYMTestActions             Run a combination of single and multiple filter and filtering set() methods instrument kernel-side trace points accordingly for positive, negative and multiple setting tests
 //! @SYMTestExpectedResults     Verify that no returned trace data and no output trace log files accordingly
 //! @SYMTestType                CT
-//! @SYMTESTSTATUS              Implemented
+//! @SYMTestStatus              Implemented
 //! @SYMPREQ                    PREQ2390
 //! @SYMREQ                     12128 12974 12975 12823 12824 12825 12128 12974 12975
 //  START_TEST_BLOCK    1000    te_ostv2integsuite_disabled             \testdata\configs\te_integ_tracecollectorclient.ini
@@ -180,7 +180,7 @@
 //! @SYMTestActions             Run a combination of single and multiple filter and filtering set() methods instrument user-side trace printf-style points accordingly for positive, negative and multiple setting tests
 //! @SYMTestExpectedResults     Verify that no returned trace data and no output trace log files accordingly
 //! @SYMTestType                CT
-//! @SYMTESTSTATUS              Implemented
+//! @SYMTestStatus              Implemented
 //! @SYMPREQ                    PREQ2390
 //! @SYMREQ                     12128 12974 12975 12823 12824 12825 12128 12974 12975
     START_TEST_BLOCK    1000    te_ostv2integsuite_disabled             \testdata\configs\te_integ_tracecollectorclient.ini
@@ -198,7 +198,7 @@
 //! @SYMTestActions             Run a combination of single and multiple filter and filtering set() methods instrument kernel-side trace printf-style points accordingly for positive, negative and multiple setting tests
 //! @SYMTestExpectedResults     Verify that no returned trace data and no output trace log files accordingly
 //! @SYMTestType                CT
-//! @SYMTESTSTATUS              Implemented
+//! @SYMTestStatus              Implemented
 //! @SYMPREQ                    PREQ2390
 //! @SYMREQ                     12128 12974 12975 12823 12824 12825 12128 12974 12975
 //  START_TEST_BLOCK    1000    te_ostv2integsuite_disabled             \testdata\configs\te_integ_tracecollectorclient.ini
@@ -218,7 +218,7 @@
 //! @SYMTestActions             Run a combination of plugin configuration methods for the file plugin and log over trace instrumentation
 //! @SYMTestExpectedResults     Verify that the trace data is not output as expected to the file plugin
 //! @SYMTestType                CT
-//! @SYMTESTSTATUS              Implemented
+//! @SYMTestStatus              Implemented
 //! @SYMPREQ                    PREQ2390
 //! @SYMREQ                     12129 12153
     START_TEST_BLOCK    1000    te_ostv2integsuite_disabled             \testdata\configs\te_integ_tracecollectorclient.ini
@@ -235,7 +235,7 @@
 //! @SYMTestActions             Run a combination of plugin configuration methods for the serial plugin and log over trace instrumentation
 //! @SYMTestExpectedResults     Verify that trace data is not output as expected to the serial plugin
 //! @SYMTestType                CT
-//! @SYMTESTSTATUS              Implemented
+//! @SYMTestStatus              Implemented
 //! @SYMPREQ                    PREQ2390
 //! @SYMREQ                     12129 12153 12147
     START_TEST_BLOCK    1000    te_ostv2integsuite_disabled             \testdata\configs\te_integ_tracecollectorclient.ini
@@ -252,7 +252,7 @@
 //! @SYMTestActions             Run a combination of plugin configuration methods for the file plugin and test on the return errors
 //! @SYMTestExpectedResults     Verify that the errors returned are as expected
 //! @SYMTestType                CT
-//! @SYMTESTSTATUS              Implemented
+//! @SYMTestStatus              Implemented
 //! @SYMPREQ                    PREQ2390
 //! @SYMREQ                     12129 12153 12147
     START_TEST_BLOCK    1000    te_ostv2integsuite_disabled             \testdata\configs\te_integ_tracecollectorclient.ini