# HG changeset patch
# User Chetan Kapoor <chetank@symbian.org>
# Date 1283349517 -3600
# Node ID 757339892a897ced0da6e3ba319dcd54b828433f
# Parent  3df3f73a7802a21ca5c14c85395b105a49dee76d# Parent  693573a2280882b45b3b152b799686ed0456a8b6
Merge He 9 Fix

diff -r 3df3f73a7802 -r 757339892a89 common/tools/ats/bctest/base/basesvs.pl
--- a/common/tools/ats/bctest/base/basesvs.pl	Tue Aug 31 15:28:38 2010 +0100
+++ b/common/tools/ats/bctest/base/basesvs.pl	Wed Sep 01 14:58:37 2010 +0100
@@ -18,32 +18,32 @@
 copy $epoc . "release/winscw/udeb/t_testfsy1.fsy",                                     	"temp/basesvs/winscw_udeb/t_testfsy1.fsy" or die "failed : $!";
 copy $epoc . "release/winscw/udeb/t_testfxt.fxt",                                      	"temp/basesvs/winscw_udeb/t_testfxt.fxt" or die "failed : $!";
 
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-any.script",    "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-any.script",     "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-any.script",      "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-any.script",    "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-os.script",            "temp/basesvs/base/general/pbase-f32-rfs-publicapi-os.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-ram.script",    "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-ram.script",     "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-ram.script",      "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-ram.script",    "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-rom.script",           "temp/basesvs/base/general/pbase-f32-rfs-publicapi-rom.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-rem.script",    "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-rem.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-drives-publicapi-any.script",    "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-any.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-files-publicapi-any.script",     "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-any.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-misc-publicapi-any.script",      "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-any.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-mounts-publicapi-any.script",    "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-any.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-publicapi-os.script",            "temp/basesvs/base/general/pbase-f32-rfs-publicapi-os.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-drives-publicapi-ram.script",    "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-ram.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-files-publicapi-ram.script",     "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-ram.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-misc-publicapi-ram.script",      "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-ram.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-mounts-publicapi-ram.script",    "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-ram.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-publicapi-rom.script",           "temp/basesvs/base/general/pbase-f32-rfs-publicapi-rom.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-drives-publicapi-rem.script",    "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-rem.script" or die "failed : $!";
 
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-any.ini",       "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-any.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-any.ini",        "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-any.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-any.ini",         "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-any.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-any.ini",       "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-any.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-os.ini",               "temp/basesvs/base/general/pbase-f32-rfs-publicapi-os.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-ram.ini",       "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-ram.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-ram.ini",        "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-ram.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-ram.ini",         "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-ram.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-ram.ini",       "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-ram.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-rom.ini",              "temp/basesvs/base/general/pbase-f32-rfs-publicapi-rom.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-rem.ini",       "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-rem.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/winscw/base_f32_env.ini",                      "temp/basesvs/base/general/base_f32_env.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-drives-publicapi-any.ini",       "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-any.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-files-publicapi-any.ini",        "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-any.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-misc-publicapi-any.ini",         "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-any.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-mounts-publicapi-any.ini",       "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-any.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-publicapi-os.ini",               "temp/basesvs/base/general/pbase-f32-rfs-publicapi-os.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-drives-publicapi-ram.ini",       "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-ram.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-files-publicapi-ram.ini",        "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-ram.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-misc-publicapi-ram.ini",         "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-ram.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-mounts-publicapi-ram.ini",       "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-ram.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-publicapi-rom.ini",              "temp/basesvs/base/general/pbase-f32-rfs-publicapi-rom.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-drives-publicapi-rem.ini",       "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-rem.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/winscw/base_f32_env.ini",                      "temp/basesvs/base/general/base_f32_env.ini" or die "failed : $!";
 
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test.txt",                            	"temp/basesvs/base/t_sfsrv/general/test.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/usbload.zip",                         	"temp/basesvs/base/t_sfsrv/general/usbload.zip" or die "failed : $!";
+copy $epoc . "winscw/c/base/t_sfsrv/test.txt",                            	"temp/basesvs/base/t_sfsrv/general/test.txt" or die "failed : $!";
+copy $epoc . "winscw/c/base/t_sfsrv/usbload.zip",                         	"temp/basesvs/base/t_sfsrv/general/usbload.zip" or die "failed : $!";
 
 system("7z a -tzip basesvs.zip ./temp/*");
diff -r 3df3f73a7802 -r 757339892a89 common/tools/ats/bctest/base/basesvs.xml
--- a/common/tools/ats/bctest/base/basesvs.xml	Tue Aug 31 15:28:38 2010 +0100
+++ b/common/tools/ats/bctest/base/basesvs.xml	Wed Sep 01 14:58:37 2010 +0100
@@ -15,6 +15,7 @@
 	<target>
 		<device alias="emulator_udeb" rank="master">
 			<property name="harness" value="GENERIC" />
+			<property name="TYPE" value="WINSCW" />
 		</device>
 	</target>
 	<plan id="" name="Base SVS Plan" harness="GENERIC" enabled="true" passrate="100">
diff -r 3df3f73a7802 -r 757339892a89 common/tools/ats/bctest/connpref/connpref.pl
--- a/common/tools/ats/bctest/connpref/connpref.pl	Tue Aug 31 15:28:38 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#!/usr/bin/perl
-# Copyright (c) 2009 Symbian Foundation Ltd
-# This component and the accompanying materials are made available
-# under the terms of the License "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:
-# Symbian Foundation Ltd - initial contribution.
-#
-# Contributors:
-# Maciej Seroka <maciejs@symbian.org>
-#
-# Description:
-# Script to build ATS test drop for Extended Connection Pref BC tests
-
-
-use strict;
-use File::Copy;
-use File::Path;
-
-unlink "connpreftest.zip";
-rmtree "temp";
-mkpath "temp/connpreftest/general/testframework";
-mkpath "temp/connpreftest/winscw_udeb";
-
-my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
-copy("connpref.xml",	"temp/test.xml");
-
-copy($epoc . "release/winscw/udeb/econnprefbc.dll",					"temp/connpreftest/winscw_udeb/econnprefbc.dll") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/testframework_connpref.ini",	"temp/connpreftest/general/testframework/testframework_connpref.ini") or die "failed : $!";
-
-system("7z a -tzip connpreftest.zip ./temp/*");
diff -r 3df3f73a7802 -r 757339892a89 common/tools/ats/bctest/connpref/connpref.xml
--- a/common/tools/ats/bctest/connpref/connpref.xml	Tue Aug 31 15:28:38 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<test>
-	<id>1</id>
-	<owner>admin</owner>
-	<priority>10</priority>
-	<buildid></buildid>
-	<postAction>
-		<type>FileStoreAction</type>
-		<params>
-			<param name="report-type" value="ATS3_REPORT"/>
-		</params>
-    </postAction>
-	<name>Extended Connection Pref BC Tests</name>
-	<target>
-        <device rank="master" alias="emulator_udeb">
-            <property name="HARNESS" value="ATSINTERFACE" />
-            <property name="TYPE" value="WINSCW" />
-        </device>
-	</target>
-	<plan id="" name="Extended Connection Pref BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
-		<target>
-			<device rank="master" alias="emulator_udeb"/>
-		</target>
-		<session id="" name="Extended Connection Pref Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
-			<set id="" name="extended_connpref_api" harness="ATSINTERFACE" enabled="true" passrate="100">
-				<case id="" name="extended_connpref_api" harness="ATSINTERFACE" enabled="true" passrate="100">
-                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-                        <command>makedir</command>
-                        <params>
-                            <param dir="c:\spd_logs\xml" /> 
-                        </params>
-                    </step>
-                    <step id="" name="econnprefbc.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="econnprefbc.dll"/>
-							<param dst="c:\sys\bin\econnprefbc.dll"/>
-							<param component-path="connpreftest" />
-						</params>
-					</step>
-					<step id="" name="testframework_connpref.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testframework/testframework_connpref.ini"/>
-							<param dst="c:\testframework\testframework.ini"/>
-							<param component-path="connpreftest" />
-						</params>
-					</step>
-					<step id="" name="econnprefbc (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule econnprefbc"/>
-							<param result-file="c:\spd_logs\xml\econnprefbc.xml"/>
-                            <param timeout="3600"/>
-						</params>
-					</step>
-					<step id="" name="econnprefbc (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
-						<command>fetch-log</command>
-						<params>
-							<param path="c:\logs\testframework\TestReport.txt" /> 
-						</params>
-					</step>
-				</case>
-			</set>
-		</session>
-	</plan>
-	<files>
-		<file>connpreftest/winscw_udeb/econnprefbc.dll</file>
-		<file>connpreftest/general/testframework/testframework_connpref.ini</file>
-	</files>
-</test>
diff -r 3df3f73a7802 -r 757339892a89 common/tools/ats/bctest/contacts/phonebook/phonebook.xml
--- a/common/tools/ats/bctest/contacts/phonebook/phonebook.xml	Tue Aug 31 15:28:38 2010 +0100
+++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.xml	Wed Sep 01 14:58:37 2010 +0100
@@ -934,7 +934,7 @@
 						<command>execute</command>
 						<params>
 							<param file="atsinterface.exe"/>
-							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcspeeddial.cfg"/>
+							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcspeeddial.cfg -engineini C:\TestFramework\testframework_spdial.ini"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
                             <param timeout="900"/>
 						</params>
diff -r 3df3f73a7802 -r 757339892a89 common/tools/ats/bctest/graphics/graphicssvs.xml
--- a/common/tools/ats/bctest/graphics/graphicssvs.xml	Tue Aug 31 15:28:38 2010 +0100
+++ b/common/tools/ats/bctest/graphics/graphicssvs.xml	Wed Sep 01 14:58:37 2010 +0100
@@ -14,6 +14,7 @@
     <target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="GENERIC" />
+            <property name="TYPE" value="WINSCW" />
         </device>
     </target>
     <plan id="" name="Graphics SVS Plan" harness="GENERIC" enabled="true" passrate="100">
diff -r 3df3f73a7802 -r 757339892a89 common/tools/ats/bctest/ipconnmgmt/connpref/connpref.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/ipconnmgmt/connpref/connpref.pl	Wed Sep 01 14:58:37 2010 +0100
@@ -0,0 +1,33 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "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:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Maciej Seroka <maciejs@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for Extended Connection Pref BC tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "connpreftest.zip";
+rmtree "temp";
+mkpath "temp/connpreftest/general/testframework";
+mkpath "temp/connpreftest/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("connpref.xml",	"temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/econnprefbc.dll",					"temp/connpreftest/winscw_udeb/econnprefbc.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_connpref.ini",	"temp/connpreftest/general/testframework/testframework_connpref.ini") or die "failed : $!";
+
+system("7z a -tzip connpreftest.zip ./temp/*");
diff -r 3df3f73a7802 -r 757339892a89 common/tools/ats/bctest/ipconnmgmt/connpref/connpref.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/ipconnmgmt/connpref/connpref.xml	Wed Sep 01 14:58:37 2010 +0100
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+	<buildid></buildid>
+	<postAction>
+		<type>FileStoreAction</type>
+		<params>
+			<param name="report-type" value="ATS3_REPORT"/>
+		</params>
+    </postAction>
+	<name>Extended Connection Pref BC Tests</name>
+	<target>
+        <device rank="master" alias="emulator_udeb">
+            <property name="HARNESS" value="ATSINTERFACE" />
+            <property name="TYPE" value="WINSCW" />
+        </device>
+	</target>
+	<plan id="" name="Extended Connection Pref BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+		<session id="" name="Extended Connection Pref Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="extended_connpref_api" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="extended_connpref_api" harness="ATSINTERFACE" enabled="true" passrate="100">
+                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+                        <command>makedir</command>
+                        <params>
+                            <param dir="c:\spd_logs\xml" /> 
+                        </params>
+                    </step>
+                    <step id="" name="econnprefbc.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="econnprefbc.dll"/>
+							<param dst="c:\sys\bin\econnprefbc.dll"/>
+							<param component-path="connpreftest" />
+						</params>
+					</step>
+					<step id="" name="testframework_connpref.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_connpref.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="connpreftest" />
+						</params>
+					</step>
+					<step id="" name="econnprefbc (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule econnprefbc"/>
+							<param result-file="c:\spd_logs\xml\econnprefbc.xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="econnprefbc (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+		</session>
+	</plan>
+	<files>
+		<file>connpreftest/winscw_udeb/econnprefbc.dll</file>
+		<file>connpreftest/general/testframework/testframework_connpref.ini</file>
+	</files>
+</test>
diff -r 3df3f73a7802 -r 757339892a89 common/tools/ats/bctest/systemsw/cenrepnotifyhandler.xml
--- a/common/tools/ats/bctest/systemsw/cenrepnotifyhandler.xml	Tue Aug 31 15:28:38 2010 +0100
+++ b/common/tools/ats/bctest/systemsw/cenrepnotifyhandler.xml	Wed Sep 01 14:58:37 2010 +0100
@@ -8,13 +8,13 @@
 		<type>FileStoreAction</type>
 		<params>
 			<param name="report-type" value="ATS3_REPORT"/>
-            <property name="TYPE" value="WINSCW" />
 		</params>
     </postAction>
 	<name>Central Repository Notification Handler BC Tests</name>
 	<target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="ATSINTERFACE" />
+            <property name="TYPE" value="WINSCW" />
         </device>
 	</target>
 	<plan id="" name="Central Repository Notification Handler BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r 3df3f73a7802 -r 757339892a89 common/tools/ats/bctest/systemsw/systemsw.xml
--- a/common/tools/ats/bctest/systemsw/systemsw.xml	Tue Aug 31 15:28:38 2010 +0100
+++ b/common/tools/ats/bctest/systemsw/systemsw.xml	Wed Sep 01 14:58:37 2010 +0100
@@ -14,6 +14,7 @@
 	<target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="ATSINTERFACE" />
+            <property name="TYPE" value="WINSCW" />
         </device>
 	</target>
 	<plan id="" name="System Software BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r 3df3f73a7802 -r 757339892a89 common/tools/ats/bctest/websrv/websrv.xml
--- a/common/tools/ats/bctest/websrv/websrv.xml	Tue Aug 31 15:28:38 2010 +0100
+++ b/common/tools/ats/bctest/websrv/websrv.xml	Wed Sep 01 14:58:37 2010 +0100
@@ -14,6 +14,7 @@
 	<target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="ATSINTERFACE" />
+            <property name="TYPE" value="WINSCW" />
         </device>
 	</target>
 	<plan id="" name="Web Services BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r 3df3f73a7802 -r 757339892a89 sf-package/tip_pbc_props.ant.xml
--- a/sf-package/tip_pbc_props.ant.xml	Tue Aug 31 15:28:38 2010 +0100
+++ b/sf-package/tip_pbc_props.ant.xml	Wed Sep 01 14:58:37 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
 <project name="COMPILERCOMPATIBILITY-PROPS">
-  <property name="sf.spec.baseline.location" value="\\v800020\Candidates\symbian4_FCL.single.814"/>
+  <property name="sf.spec.baseline.location" value="\\v800020\Candidates\symbian4_FCL.single.821"/>
 </project>