# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1255104209 -3600
# Node ID 84fc7d5ec18f8a39c370f850badd693926de3d1a
# Parent  3effbd6728d46927888a8046f4c9c9abbb1846af# Parent  4709730d52260a9c367e784ea56a32f4035a7619
catchup merge.

diff -r 3effbd6728d4 -r 84fc7d5ec18f common/build.postbuild.xml
--- a/common/build.postbuild.xml	Fri Oct 09 17:01:52 2009 +0100
+++ b/common/build.postbuild.xml	Fri Oct 09 17:03:29 2009 +0100
@@ -524,8 +524,9 @@
         </java>
         <!-- Make sure that the summary directory is available to display the BRAG link -->
         <mkdir  dir="${publish.dir}/summary/"/>
-        <copy file="${build.log.dir}/summary/_brag.xml" toDir="${publish.dir}/summary/"/>
-        <copy file="${build.log.dir}/summary/brag.xsl" toDir="${publish.dir}/summary/"/>
+        <copy todir="${publish.dir}/summary/" preservelastmodified="true" failonerror="false">
+           <fileset dir="${build.log.dir}/summary/"><include name="*.*"/></fileset>
+        </copy>
         <if>
             <istrue value="${sf.spec.publish.enable}"/>
             <then>
diff -r 3effbd6728d4 -r 84fc7d5ec18f common/tools/ats/bctest/base/basesvs.pl
--- a/common/tools/ats/bctest/base/basesvs.pl	Fri Oct 09 17:01:52 2009 +0100
+++ b/common/tools/ats/bctest/base/basesvs.pl	Fri Oct 09 17:03:29 2009 +0100
@@ -11,100 +11,39 @@
 mkpath "temp/basesvs/base/t_sfsrv/general";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
-copy("test.xml",                                                          "temp/test.xml");
-
-copy $epoc . "release/winscw/udeb/t_fat32server.exe",                                               "temp/basesvs/winscw_udeb/t_fat32server.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_perf.exe",                                                      "temp/basesvs/winscw_udeb/t_perf.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_prompt.exe",                                                    "temp/basesvs/winscw_udeb/t_prompt.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_sfsrv.exe",                                                     "temp/basesvs/winscw_udeb/t_sfsrv.exe" or die "failed : $!";
-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("basesvs.xml",                                                          			"temp/test.xml");
 
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-driveunit-publicapi-any.script",                 "temp/basesvs/base/general/pbase-f32-driveunit-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi-ram.script",                    "temp/basesvs/base/general/pbase-f32-format-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi-rem.script",                    "temp/basesvs/base/general/pbase-f32-format-publicapi-rem.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi-rom.script",                    "temp/basesvs/base/general/pbase-f32-format-publicapi-rom.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rawdisk-publicapi-ram.script",                   "temp/basesvs/base/general/pbase-f32-rawdisk-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rawdisk-publicapi-rem.script",                   "temp/basesvs/base/general/pbase-f32-rawdisk-publicapi-rem.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dir-publicapi-ram.script",                       "temp/basesvs/base/general/pbase-f32-dir-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dirscan-publicapi-ram.script",                   "temp/basesvs/base/general/pbase-f32-dirscan-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-file-publicapi-ram.script",                      "temp/basesvs/base/general/pbase-f32-file-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-fileman-publicapi-ram.script",                   "temp/basesvs/base/general/pbase-f32-fileman-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-fileman-publicapi-os.script",                    "temp/basesvs/base/general/pbase-f32-fileman-publicapi-os.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filenamesidentical-publicapi-ram.script",        "temp/basesvs/base/general/pbase-f32-filenamesidentical-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rdir-publicapi-ram.script",                      "temp/basesvs/base/general/pbase-f32-rdir-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entry-publicapi-ram.script",                     "temp/basesvs/base/general/pbase-f32-entry-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filetext-publicapi-ram.script",                  "temp/basesvs/base/general/pbase-f32-filetext-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-volumeinfo-publicapi-any.script",                "temp/basesvs/base/general/pbase-f32-volumeinfo-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parse-publicapi-any.script",                     "temp/basesvs/base/general/pbase-f32-parse-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptr-publicapi-any.script",                  "temp/basesvs/base/general/pbase-f32-parseptr-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptrc-publicapi-any.script",                 "temp/basesvs/base/general/pbase-f32-parseptrc-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parse-inherited-publicapi-any.script",           "temp/basesvs/base/general/pbase-f32-parse-inherited-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptr-inherited-publicapi-any.script",        "temp/basesvs/base/general/pbase-f32-parseptr-inherited-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptrc-inherited-publicapi-any.script",       "temp/basesvs/base/general/pbase-f32-parseptrc-inherited-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entryarray-publicapi-ram.script",                "temp/basesvs/base/general/pbase-f32-entryarray-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-findfile-publicapi-os.script",                   "temp/basesvs/base/general/pbase-f32-findfile-publicapi-os.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-findfile-publicapi-rem.script",                  "temp/basesvs/base/general/pbase-f32-findfile-publicapi-rem.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-openfilescan-publicapi-ram.script",              "temp/basesvs/base/general/pbase-f32-openfilescan-publicapi-ram.script" 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 . "release/winscw/udeb/t_prompt.exe",                                       	"temp/basesvs/winscw_udeb/t_prompt.exe" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/t_sfsrv.exe",                                        	"temp/basesvs/winscw_udeb/t_sfsrv.exe" or die "failed : $!";
+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-driveunit-publicapi.ini",                        "temp/basesvs/base/general/pbase-f32-driveunit-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi.ini",                           "temp/basesvs/base/general/pbase-f32-format-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rawdisk-publicapi.ini",                          "temp/basesvs/base/general/pbase-f32-rawdisk-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dir-publicapi.ini",                              "temp/basesvs/base/general/pbase-f32-dir-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dirscan-publicapi.ini",                          "temp/basesvs/base/general/pbase-f32-dirscan-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-file-publicapi.ini",                             "temp/basesvs/base/general/pbase-f32-file-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-fileman-publicapi.ini",                          "temp/basesvs/base/general/pbase-f32-fileman-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filenamesidentical-publicapi.ini",               "temp/basesvs/base/general/pbase-f32-filenamesidentical-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rdir-publicapi.ini",                             "temp/basesvs/base/general/pbase-f32-rdir-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entry-publicapi.ini",                            "temp/basesvs/base/general/pbase-f32-entry-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filetext-publicapi.ini",                         "temp/basesvs/base/general/pbase-f32-filetext-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-volumeinfo-publicapi.ini",                       "temp/basesvs/base/general/pbase-f32-volumeinfo-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parse-publicapi.ini",                            "temp/basesvs/base/general/pbase-f32-parse-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptr-publicapi.ini",                         "temp/basesvs/base/general/pbase-f32-parseptr-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptrc-publicapi.ini",                        "temp/basesvs/base/general/pbase-f32-parseptrc-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parsebase-inherited-publicapi.ini",              "temp/basesvs/base/general/pbase-f32-parsebase-inherited-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entryarray-publicapi.ini",                       "temp/basesvs/base/general/pbase-f32-entryarray-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-findfile-publicapi.ini",                         "temp/basesvs/base/general/pbase-f32-findfile-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-openfilescan-publicapi.ini",                     "temp/basesvs/base/general/pbase-f32-openfilescan-publicapi.ini" 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/base_f32_env.ini",                                         "temp/basesvs/base/general/base_f32_env.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_base.tcs",                                               "temp/basesvs/base/general/t_base.tcs" 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/t_sfsrv/test.txt",                                         "temp/basesvs/base/t_sfsrv/general/test.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test_rom.txt",                                     "temp/basesvs/base/t_sfsrv/general/test_rom.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 . "release/winscw/udeb/z/base/t_sfsrv/test1.txt",                                        "temp/basesvs/base/t_sfsrv/general/test1.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test2.txt",                                        "temp/basesvs/base/t_sfsrv/general/test2.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test3.txt",                                        "temp/basesvs/base/t_sfsrv/general/test3.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/1mb",                                              "temp/basesvs/base/t_sfsrv/general/1mb" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/any.txt",                                          "temp/basesvs/base/t_sfsrv/general/any.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/big_line.txt",                                     "temp/basesvs/base/t_sfsrv/general/big_line.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/filetext_eof.txt",                                 "temp/basesvs/base/t_sfsrv/general/filetext_eof.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/filetext_read.txt",                                "temp/basesvs/base/t_sfsrv/general/filetext_read.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/multiline.txt",                                    "temp/basesvs/base/t_sfsrv/general/multiline.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/new_file.txt",                                     "temp/basesvs/base/t_sfsrv/general/new_file.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/oneliner.txt",                                     "temp/basesvs/base/t_sfsrv/general/oneliner.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/big.txt",                                          "temp/basesvs/base/t_sfsrv/general/big.txt" 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 . "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 3effbd6728d4 -r 84fc7d5ec18f common/tools/ats/bctest/base/basesvs.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/base/basesvs.xml	Fri Oct 09 17:03:29 2009 +0100
@@ -0,0 +1,460 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+    <build></build>
+    <buildid></buildid>
+	<name>Base SVS Tests</name>
+	<target>
+		<device alias="emulator_udeb" rank="master">
+			<property name="harness" value="GENERIC" />
+		</device>
+	</target>
+	<plan id="" name="Base SVS Plan" harness="GENERIC" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+        <session id="" name="Base SVS Session" harness="GENERIC" enabled="true" passrate="100">
+            <set id="" name="FAT32" harness="GENERIC" enabled="true" passrate="100">
+                <case id="" name="Install Common Files for FAT32" harness="GENERIC" enabled="true" passrate="100">
+					<step name="test.txt (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="test.txt"/>
+							<param dst="C:\base\t_sfsrv\test.txt"/>
+							<param component-path="basesvs\base\t_sfsrv"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="USBLOAD.ZIP (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="USBLOAD.ZIP"/>
+							<param dst="C:\base\t_sfsrv\USBLOAD.ZIP"/>
+							<param component-path="basesvs\base\t_sfsrv"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="base_f32_env.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="base_f32_env.ini"/>
+							<param dst="C:\base\base_f32_env.ini"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="T_SFSRV.EXE (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="binary"/>
+							<param src="T_SFSRV.EXE"/>
+							<param dst="C:\sys\bin\T_SFSRV.EXE"/>
+							<param component-path="basesvs"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="T_PROMPT.EXE (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="binary"/>
+							<param src="T_PROMPT.EXE"/>
+							<param dst="C:\sys\bin\T_PROMPT.EXE"/>
+							<param component-path="basesvs"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="T_TESTFSY1.FSY (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="binary"/>
+							<param src="T_TESTFSY1.FSY"/>
+							<param dst="C:\sys\bin\T_TESTFSY1.FSY"/>
+							<param component-path="basesvs"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="T_TESTFXT.FXT (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="binary"/>
+							<param src="T_TESTFXT.FXT"/>
+							<param dst="C:\sys\bin\T_TESTFXT.FXT"/>
+							<param component-path="basesvs"/>
+						</params>
+						<command>install</command>
+					</step> 
+                </case>
+                <case id="" name="RFs Drive Functions (Any)" harness="GENERIC" enabled="true" passrate="100">
+					<step name="pbase-f32-rfs-drives-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-drives-publicapi-any.script"/>
+							<param dst="c:\base\pbase-f32-rfs-drives-publicapi-any.script"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-drives-publicapi-any.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-drives-publicapi-any.ini"/>
+							<param dst="c:\base\pbase-f32-rfs-drives-publicapi-any.ini"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-drives-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
+						<params>
+							<param file="testexecute.exe"/>
+							<param parameters="c:\base\pbase-f32-rfs-drives-publicapi-any.script"/>
+							<param result-file="c:\logs\testexecute\pbase-f32-rfs-drives-publicapi-any.htm"/> 
+                            <param timeout="1200" />
+							<param parser="TEFTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+						<command>execute</command>
+					</step>
+                </case>
+                <case id="" name="RFs Drive Functions (RAM)" harness="GENERIC" enabled="true" passrate="100">
+					<step name="pbase-f32-rfs-drives-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-drives-publicapi-ram.script"/>
+							<param dst="c:\base\pbase-f32-rfs-drives-publicapi-ram.script"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-drives-publicapi-ram.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-drives-publicapi-ram.ini"/>
+							<param dst="c:\base\pbase-f32-rfs-drives-publicapi-ram.ini"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-drives-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
+						<params>
+							<param file="testexecute.exe"/>
+							<param parameters="c:\base\pbase-f32-rfs-drives-publicapi-ram.script"/>
+							<param result-file="c:\logs\testexecute\pbase-f32-rfs-drives-publicapi-ram.htm"/> 
+                            <param timeout="1200" />
+							<param parser="TEFTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+						<command>execute</command>
+					</step>
+                </case>
+                <case id="" name="RFs Drive Functions (Removable Drive)" harness="GENERIC" enabled="true" passrate="100">
+                	<step name="pbase-f32-rfs-drives-publicapi-rem.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-drives-publicapi-rem.script"/>
+							<param dst="c:\base\pbase-f32-rfs-drives-publicapi-rem.script"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-drives-publicapi-rem.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-drives-publicapi-rem.ini"/>
+							<param dst="c:\base\pbase-f32-rfs-drives-publicapi-rem.ini"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-drives-publicapi-rem.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
+						<params>
+							<param file="testexecute.exe"/>
+							<param parameters="c:\base\pbase-f32-rfs-drives-publicapi-rem.script"/>
+							<param result-file="c:\logs\testexecute\pbase-f32-rfs-drives-publicapi-rem.htm"/>
+                            <param timeout="1200" />
+							<param parser="TEFTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+						<command>execute</command>
+					</step>
+                </case>
+                <case id="" name="RFs File Functions (Any)" harness="GENERIC" enabled="true" passrate="100">
+					<step name="pbase-f32-rfs-files-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-files-publicapi-any.script"/>
+							<param dst="c:\base\pbase-f32-rfs-files-publicapi-any.script"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-files-publicapi-any.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-files-publicapi-any.ini"/>
+							<param dst="c:\base\pbase-f32-rfs-files-publicapi-any.ini"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-files-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
+						<params>
+							<param file="testexecute.exe"/>
+							<param parameters="c:\base\pbase-f32-rfs-files-publicapi-any.script"/>
+							<param result-file="c:\logs\testexecute\pbase-f32-rfs-files-publicapi-any.htm"/> 
+                            <param timeout="1200" />
+							<param parser="TEFTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+						<command>execute</command>
+					</step>
+                </case>
+                <case id="" name="RFs File Functions (RAM)" harness="GENERIC" enabled="true" passrate="100">
+					<step name="pbase-f32-rfs-files-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-files-publicapi-ram.script"/>
+							<param dst="c:\base\pbase-f32-rfs-files-publicapi-ram.script"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-files-publicapi-ram.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-files-publicapi-ram.ini"/>
+							<param dst="c:\base\pbase-f32-rfs-files-publicapi-ram.ini"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-files-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
+						<params>
+							<param file="testexecute.exe"/>
+							<param parameters="c:\base\pbase-f32-rfs-files-publicapi-ram.script"/>
+							<param result-file="c:\logs\testexecute\pbase-f32-rfs-files-publicapi-ram.htm"/> 
+                            <param timeout="1200" />
+							<param parser="TEFTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+						<command>execute</command>
+					</step>
+                </case>
+                <case id="" name="RFs Miscellaneous Functions (Any)" harness="GENERIC" enabled="true" passrate="100">
+					<step name="pbase-f32-rfs-misc-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-misc-publicapi-any.script"/>
+							<param dst="c:\base\pbase-f32-rfs-misc-publicapi-any.script"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-misc-publicapi-any.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-misc-publicapi-any.ini"/>
+							<param dst="c:\base\pbase-f32-rfs-misc-publicapi-any.ini"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-misc-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
+						<params>
+							<param file="testexecute.exe"/>
+							<param parameters="c:\base\pbase-f32-rfs-misc-publicapi-any.script"/>
+							<param result-file="c:\logs\testexecute\pbase-f32-rfs-misc-publicapi-any.htm"/> 
+                            <param timeout="1200" />
+							<param parser="TEFTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+						<command>execute</command>
+					</step>
+                </case>
+                <case id="" name="RFs Miscellaneous Functions (RAM)" harness="GENERIC" enabled="true" passrate="100">
+					<step name="pbase-f32-rfs-misc-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-misc-publicapi-ram.script"/>
+							<param dst="c:\base\pbase-f32-rfs-misc-publicapi-ram.script"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-misc-publicapi-ram.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-misc-publicapi-ram.ini"/>
+							<param dst="c:\base\pbase-f32-rfs-misc-publicapi-ram.ini"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-misc-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
+						<params>
+							<param file="testexecute.exe"/>
+							<param parameters="c:\base\pbase-f32-rfs-misc-publicapi-ram.script"/>
+							<param result-file="c:\logs\testexecute\pbase-f32-rfs-misc-publicapi-ram.htm"/> 
+                            <param timeout="1200" />
+							<param parser="TEFTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+						<command>execute</command>
+					</step>
+                </case>
+                <case id="" name="RFs Drive Mounting Functions (Any)" harness="GENERIC" enabled="true" passrate="100">
+					<step name="pbase-f32-rfs-mounts-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-mounts-publicapi-any.script"/>
+							<param dst="c:\base\pbase-f32-rfs-mounts-publicapi-any.script"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-mounts-publicapi-any.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-mounts-publicapi-any.ini"/>
+							<param dst="c:\base\pbase-f32-rfs-mounts-publicapi-any.ini"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-mounts-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
+						<params>
+							<param file="testexecute.exe"/>
+							<param parameters="c:\base\pbase-f32-rfs-mounts-publicapi-any.script"/>
+							<param result-file="c:\logs\testexecute\pbase-f32-rfs-mounts-publicapi-any.htm"/> 
+                            <param timeout="1200" />
+							<param parser="TEFTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+						<command>execute</command>
+					</step>
+                </case>
+                <case id="" name="RFs Drive Mounting Functions (RAM)" harness="GENERIC" enabled="true" passrate="100">
+					<step name="pbase-f32-rfs-mounts-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-mounts-publicapi-ram.script"/>
+							<param dst="c:\base\pbase-f32-rfs-mounts-publicapi-ram.script"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-mounts-publicapi-ram.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-mounts-publicapi-ram.ini"/>
+							<param dst="c:\base\pbase-f32-rfs-mounts-publicapi-ram.ini"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-mounts-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
+						<params>
+							<param file="testexecute.exe"/>
+							<param parameters="c:\base\pbase-f32-rfs-mounts-publicapi-ram.script"/>
+							<param result-file="c:\logs\testexecute\pbase-f32-rfs-mounts-publicapi-ram.htm"/> 
+                            <param timeout="1200" />
+							<param parser="TEFTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+						<command>execute</command>
+					</step>
+                </case>
+                <case id="" name="RFs Functions (OS)" harness="GENERIC" enabled="true" passrate="100">
+					<step name="pbase-f32-rfs-publicapi-os.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-publicapi-os.script"/>
+							<param dst="c:\base\pbase-f32-rfs-publicapi-os.script"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-publicapi-os.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-publicapi-os.ini"/>
+							<param dst="c:\base\pbase-f32-rfs-publicapi-os.ini"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-publicapi-os.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
+						<params>
+							<param file="testexecute.exe"/>
+							<param parameters="c:\base\pbase-f32-rfs-publicapi-os.script"/>
+							<param result-file="c:\logs\testexecute\pbase-f32-rfs-publicapi-os.htm"/> 
+                            <param timeout="1200" />
+							<param parser="TEFTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+						<command>execute</command>
+					</step>
+                </case>
+                <case id="" name="RFs Functions (ROM)" harness="GENERIC" enabled="true" passrate="100">
+					<step name="pbase-f32-rfs-publicapi-rom.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-publicapi-rom.script"/>
+							<param dst="c:\base\pbase-f32-rfs-publicapi-rom.script"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-publicapi-rom.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
+						<params>
+							<param type="data"/>
+							<param src="pbase-f32-rfs-publicapi-rom.ini"/>
+							<param dst="c:\base\pbase-f32-rfs-publicapi-rom.ini"/>
+							<param component-path="basesvs\base"/>
+						</params>
+						<command>install</command>
+					</step>
+					<step name="pbase-f32-rfs-publicapi-rom.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
+						<params>
+							<param file="testexecute.exe"/>
+							<param parameters="c:\base\pbase-f32-rfs-publicapi-rom.script"/>
+							<param result-file="c:\logs\testexecute\pbase-f32-rfs-publicapi-rom.htm"/> 
+                            <param timeout="1200" />
+							<param parser="TEFTestResultParser"/>
+							<param leave-old-result="true"/>
+						</params>
+						<command>execute</command>
+					</step>
+                </case>
+			</set>
+		</session>
+	</plan>
+	<files>
+		<file>basesvs\base\general\pbase-f32-rfs-drives-publicapi-any.script</file>
+		<file>basesvs\base\general\pbase-f32-rfs-files-publicapi-any.script</file>
+		<file>basesvs\base\general\pbase-f32-rfs-misc-publicapi-any.script</file>
+		<file>basesvs\base\general\pbase-f32-rfs-mounts-publicapi-any.script</file>
+		<file>basesvs\base\general\pbase-f32-rfs-publicapi-os.script</file>
+		<file>basesvs\base\general\pbase-f32-rfs-drives-publicapi-ram.script</file>
+		<file>basesvs\base\general\pbase-f32-rfs-files-publicapi-ram.script</file>
+		<file>basesvs\base\general\pbase-f32-rfs-misc-publicapi-ram.script</file>
+		<file>basesvs\base\general\pbase-f32-rfs-mounts-publicapi-ram.script</file>
+		<file>basesvs\base\general\pbase-f32-rfs-publicapi-rom.script</file>
+		<file>basesvs\base\general\pbase-f32-rfs-drives-publicapi-rem.script</file>
+		<file>basesvs\base\general\pbase-f32-rfs-drives-publicapi-any.ini</file>
+		<file>basesvs\base\general\pbase-f32-rfs-files-publicapi-any.ini</file>
+		<file>basesvs\base\general\pbase-f32-rfs-misc-publicapi-any.ini</file>
+		<file>basesvs\base\general\pbase-f32-rfs-mounts-publicapi-any.ini</file>
+		<file>basesvs\base\general\pbase-f32-rfs-publicapi-os.ini</file>
+		<file>basesvs\base\general\pbase-f32-rfs-drives-publicapi-ram.ini</file>
+		<file>basesvs\base\general\pbase-f32-rfs-files-publicapi-ram.ini</file>
+		<file>basesvs\base\general\pbase-f32-rfs-misc-publicapi-ram.ini</file>
+		<file>basesvs\base\general\pbase-f32-rfs-mounts-publicapi-ram.ini</file>
+		<file>basesvs\base\general\pbase-f32-rfs-publicapi-rom.ini</file>
+		<file>basesvs\base\general\pbase-f32-rfs-drives-publicapi-rem.ini</file>
+        <file>basesvs\base\general\base_f32_env.ini</file>
+		<file>basesvs\base\t_sfsrv\general\test.txt</file>
+		<file>basesvs\base\t_sfsrv\general\usbload.zip</file>
+		<file>basesvs\winscw_udeb\t_sfsrv.exe</file>
+		<file>basesvs\winscw_udeb\t_prompt.exe</file>
+        <file>basesvs\winscw_udeb\t_testfsy1.fsy</file>
+        <file>basesvs\winscw_udeb\t_testfxt.fxt</file>
+	</files>
+</test>
diff -r 3effbd6728d4 -r 84fc7d5ec18f common/tools/ats/bctest/base/test.xml
--- a/common/tools/ats/bctest/base/test.xml	Fri Oct 09 17:01:52 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1408 +0,0 @@
-<?xml version="1.0"?>
-<test>
-	<id>1</id>
-	<owner>admin</owner>
-	<priority>10</priority>
-    <build></build>
-    <buildid></buildid>
-	<name>Base SVS Tests</name>
-	<target>
-		<device alias="emulator_udeb" rank="master">
-			<property name="harness" value="GENERIC" />
-		</device>
-	</target>
-	<plan id="" name="Base SVS Plan" harness="GENERIC" enabled="true" passrate="100">
-		<target>
-			<device rank="master" alias="emulator_udeb"/>
-		</target>
-        <session id="" name="Base SVS Session" harness="GENERIC" enabled="true" passrate="100">
-            <set id="" name="FAT32" harness="GENERIC" enabled="true" passrate="100">
-                <case id="" name="Install Common Files for FAT32" harness="GENERIC" enabled="true" passrate="100">
-					<step name="test.txt (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="test.txt"/>
-							<param dst="C:\base\t_sfsrv\test.txt"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="USBLOAD.ZIP (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="USBLOAD.ZIP"/>
-							<param dst="C:\base\t_sfsrv\USBLOAD.ZIP"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="test_rom.txt (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="test_rom.txt"/>
-							<param dst="z:\base\t_sfsrv\test_rom.txt"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="Test1.txt (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="Test1.txt"/>
-							<param dst="C:\base\t_sfsrv\Test1.txt"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="Test2.txt (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="Test2.txt"/>
-							<param dst="C:\base\t_sfsrv\Test2.txt"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="Test3.txt (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="Test3.txt"/>
-							<param dst="C:\base\t_sfsrv\Test3.txt"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="1mb (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="1mb"/>
-							<param dst="C:\base\t_sfsrv\1mb"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="any.txt (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="any.txt"/>
-							<param dst="C:\base\t_sfsrv\any.txt"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="big_line.txt (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="big_line.txt"/>
-							<param dst="C:\base\t_sfsrv\big_line.txt"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="filetext_eof.txt (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="filetext_eof.txt"/>
-							<param dst="C:\base\t_sfsrv\filetext_eof.txt"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="filetext_read.txt (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="filetext_read.txt"/>
-							<param dst="C:\base\t_sfsrv\filetext_read.txt"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="multiline.txt (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="multiline.txt"/>
-							<param dst="C:\base\t_sfsrv\multiline.txt"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="new_file.txt (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="new_file.txt"/>
-							<param dst="C:\base\t_sfsrv\new_file.txt"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="oneliner.txt (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="oneliner.txt"/>
-							<param dst="C:\base\t_sfsrv\oneliner.txt"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="big.txt (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="big.txt"/>
-							<param dst="C:\base\t_sfsrv\big.txt"/>
-							<param component-path="basesvs\base\t_sfsrv"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="base_f32_env.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="base_f32_env.ini"/>
-							<param dst="C:\base\base_f32_env.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="t_base.tcs (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="t_base.tcs"/>
-							<param dst="C:\base\t_base.tcs"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="T_SFSRV.EXE (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="binary"/>
-							<param src="T_SFSRV.EXE"/>
-							<param dst="C:\sys\bin\T_SFSRV.EXE"/>
-							<param component-path="basesvs"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="T_PERF.EXE (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="binary"/>
-							<param src="T_PERF.EXE"/>
-							<param dst="C:\sys\bin\T_PERF.EXE"/>
-							<param component-path="basesvs"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="T_PROMPT.EXE (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="binary"/>
-							<param src="T_PROMPT.EXE"/>
-							<param dst="C:\sys\bin\T_PROMPT.EXE"/>
-							<param component-path="basesvs"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="T_FAT32SERVER.EXE (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="binary"/>
-							<param src="T_FAT32SERVER.EXE"/>
-							<param dst="C:\sys\bin\T_FAT32SERVER.EXE"/>
-							<param component-path="basesvs"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="T_TESTFSY1.FSY (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="binary"/>
-							<param src="T_TESTFSY1.FSY"/>
-							<param dst="C:\sys\bin\T_TESTFSY1.FSY"/>
-							<param component-path="basesvs"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="T_TESTFXT.FXT (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="binary"/>
-							<param src="T_TESTFXT.FXT"/>
-							<param dst="C:\sys\bin\T_TESTFXT.FXT"/>
-							<param component-path="basesvs"/>
-						</params>
-						<command>install</command>
-					</step> 
-                </case>
-                <case id="" name="Drive Unit (Any)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-driveunit-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-driveunit-publicapi-any.script"/>
-							<param dst="c:\base\pbase-f32-driveunit-publicapi-any.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-driveunit-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-driveunit-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-driveunit-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-driveunit-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-driveunit-publicapi-any.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-driveunit-publicapi-any.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Format (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-format-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-format-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-format-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-format-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-format-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-format-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-format-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-format-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-format-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Format (ROM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-format-publicapi-rom.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-format-publicapi-rom.script"/>
-							<param dst="c:\base\pbase-f32-format-publicapi-rom.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-format-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-format-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-format-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-format-publicapi-rom.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-format-publicapi-rom.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-format-publicapi-rom.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Raw Disk (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-rawdisk-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rawdisk-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-rawdisk-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rawdisk-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rawdisk-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-rawdisk-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rawdisk-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-rawdisk-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-rawdisk-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Directories (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-dir-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-dir-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-dir-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-dir-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-dir-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-dir-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-dir-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-dir-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-dir-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="teftestresultparser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Directory Scan (RAM)" harness="GENERIC" enabled="true" passrate="100">
-                    <step name="pbase-f32-dirscan-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-dirscan-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-dirscan-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-dirscan-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-dirscan-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-dirscan-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-dirscan-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-dirscan-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-dirscan-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Files (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-file-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-file-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-file-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-file-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-file-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-file-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-file-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-file-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-file-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="File Manager (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-fileman-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-fileman-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-fileman-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-fileman-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-fileman-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-fileman-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-fileman-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-fileman-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-fileman-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="File Manager (OS)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-fileman-publicapi-os.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-fileman-publicapi-os.script"/>
-							<param dst="c:\base\pbase-f32-fileman-publicapi-os.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-fileman-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-fileman-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-fileman-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-fileman-publicapi-os.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-fileman-publicapi-os.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-fileman-publicapi-os.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Identical File Names (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-filenamesidentical-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-filenamesidentical-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-filenamesidentical-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-filenamesidentical-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-filenamesidentical-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-filenamesidentical-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-filenamesidentical-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-filenamesidentical-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-filenamesidentical-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="RDir (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-rdir-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rdir-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-rdir-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rdir-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rdir-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-rdir-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rdir-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-rdir-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-rdir-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Entries (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-entry-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-entry-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-entry-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-entry-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-entry-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-entry-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-entry-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-entry-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-entry-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="File Text (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-filetext-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-filetext-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-filetext-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-filetext-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-filetext-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-filetext-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-filetext-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-filetext-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-filetext-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Volume Info (Any)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-volumeinfo-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-volumeinfo-publicapi-any.script"/>
-							<param dst="c:\base\pbase-f32-volumeinfo-publicapi-any.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-volumeinfo-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-volumeinfo-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-volumeinfo-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-volumeinfo-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-volumeinfo-publicapi-any.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-volumeinfo-publicapi-any.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Parse (Any)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-parse-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-parse-publicapi-any.script"/>
-							<param dst="c:\base\pbase-f32-parse-publicapi-any.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-parse-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-parse-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-parse-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-parse-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-parse-publicapi-any.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-parse-publicapi-any.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Parse Ptr (Any)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-parseptr-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-parseptr-publicapi-any.script"/>
-							<param dst="c:\base\pbase-f32-parseptr-publicapi-any.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-parseptr-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-parseptr-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-parseptr-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-parseptr-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-parseptr-publicapi-any.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-parseptr-publicapi-any.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Parse PtrC (Any)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-parseptrc-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-parseptrc-publicapi-any.script"/>
-							<param dst="c:\base\pbase-f32-parseptrc-publicapi-any.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-parseptrc-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-parseptrc-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-parseptrc-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-parseptrc-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-parseptrc-publicapi-any.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-parseptrc-publicapi-any.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case><case id="" name="Parse Inherited (Any)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-parse-inherited-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-parse-inherited-publicapi-any.script"/>
-							<param dst="c:\base\pbase-f32-parse-inherited-publicapi-any.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-parsebase-inherited-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-parsebase-inherited-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-parsebase-inherited-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-parse-inherited-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-parse-inherited-publicapi-any.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-parse-inherited-publicapi-any.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Parse Ptr Inherited (Any)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-parseptr-inherited-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-parseptr-inherited-publicapi-any.script"/>
-							<param dst="c:\base\pbase-f32-parseptr-inherited-publicapi-any.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-parsebase-inherited-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-parsebase-inherited-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-parsebase-inherited-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-parseptr-inherited-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-parseptr-inherited-publicapi-any.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-parseptr-inherited-publicapi-any.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Parse PtrC Inherited (Any)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-parseptrc-inherited-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-parseptrc-inherited-publicapi-any.script"/>
-							<param dst="c:\base\pbase-f32-parseptrc-inherited-publicapi-any.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-parsebase-inherited-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-parsebase-inherited-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-parsebase-inherited-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-parseptrc-inherited-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-parseptrc-inherited-publicapi-any.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-parseptrc-inherited-publicapi-any.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Entry Array (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-entryarray-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-entryarray-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-entryarray-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-entryarray-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-entryarray-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-entryarray-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-entryarray-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-entryarray-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-entryarray-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Find File (OS)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-findfile-publicapi-os.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-findfile-publicapi-os.script"/>
-							<param dst="c:\base\pbase-f32-findfile-publicapi-os.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-findfile-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-findfile-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-findfile-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-findfile-publicapi-os.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-findfile-publicapi-os.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-findfile-publicapi-os.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Find File (Removable Drive)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-findfile-publicapi-rem.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-findfile-publicapi-rem.script"/>
-							<param dst="c:\base\pbase-f32-findfile-publicapi-rem.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-findfile-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-findfile-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-findfile-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-findfile-publicapi-rem.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-findfile-publicapi-rem.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-findfile-publicapi-rem.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="Open File Scan (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-openfilescan-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-openfilescan-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-openfilescan-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-openfilescan-publicapi.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-openfilescan-publicapi.ini"/>
-							<param dst="c:\base\pbase-f32-openfilescan-publicapi.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-openfilescan-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-openfilescan-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-openfilescan-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="RFs Drive Functions (Any)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-rfs-drives-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-drives-publicapi-any.script"/>
-							<param dst="c:\base\pbase-f32-rfs-drives-publicapi-any.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-drives-publicapi-any.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-drives-publicapi-any.ini"/>
-							<param dst="c:\base\pbase-f32-rfs-drives-publicapi-any.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-drives-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-rfs-drives-publicapi-any.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-rfs-drives-publicapi-any.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="RFs Drive Functions (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-rfs-drives-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-drives-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-rfs-drives-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-drives-publicapi-ram.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-drives-publicapi-ram.ini"/>
-							<param dst="c:\base\pbase-f32-rfs-drives-publicapi-ram.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-drives-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-rfs-drives-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-rfs-drives-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="RFs Drive Functions (Removable Drive)" harness="GENERIC" enabled="true" passrate="100">
-                	<step name="pbase-f32-rfs-drives-publicapi-rem.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-drives-publicapi-rem.script"/>
-							<param dst="c:\base\pbase-f32-rfs-drives-publicapi-rem.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-drives-publicapi-rem.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-drives-publicapi-rem.ini"/>
-							<param dst="c:\base\pbase-f32-rfs-drives-publicapi-rem.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-drives-publicapi-rem.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-rfs-drives-publicapi-rem.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-rfs-drives-publicapi-rem.htm"/>
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="RFs File Functions (Any)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-rfs-files-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-files-publicapi-any.script"/>
-							<param dst="c:\base\pbase-f32-rfs-files-publicapi-any.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-files-publicapi-any.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-files-publicapi-any.ini"/>
-							<param dst="c:\base\pbase-f32-rfs-files-publicapi-any.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-files-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-rfs-files-publicapi-any.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-rfs-files-publicapi-any.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="RFs File Functions (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-rfs-files-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-files-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-rfs-files-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-files-publicapi-ram.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-files-publicapi-ram.ini"/>
-							<param dst="c:\base\pbase-f32-rfs-files-publicapi-ram.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-files-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-rfs-files-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-rfs-files-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="RFs Miscellaneous Functions (Any)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-rfs-misc-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-misc-publicapi-any.script"/>
-							<param dst="c:\base\pbase-f32-rfs-misc-publicapi-any.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-misc-publicapi-any.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-misc-publicapi-any.ini"/>
-							<param dst="c:\base\pbase-f32-rfs-misc-publicapi-any.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-misc-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-rfs-misc-publicapi-any.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-rfs-misc-publicapi-any.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="RFs Miscellaneous Functions (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-rfs-misc-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-misc-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-rfs-misc-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-misc-publicapi-ram.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-misc-publicapi-ram.ini"/>
-							<param dst="c:\base\pbase-f32-rfs-misc-publicapi-ram.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-misc-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-rfs-misc-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-rfs-misc-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="RFs Drive Mounting Functions (Any)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-rfs-mounts-publicapi-any.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-mounts-publicapi-any.script"/>
-							<param dst="c:\base\pbase-f32-rfs-mounts-publicapi-any.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-mounts-publicapi-any.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-mounts-publicapi-any.ini"/>
-							<param dst="c:\base\pbase-f32-rfs-mounts-publicapi-any.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-mounts-publicapi-any.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-rfs-mounts-publicapi-any.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-rfs-mounts-publicapi-any.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="RFs Drive Mounting Functions (RAM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-rfs-mounts-publicapi-ram.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-mounts-publicapi-ram.script"/>
-							<param dst="c:\base\pbase-f32-rfs-mounts-publicapi-ram.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-mounts-publicapi-ram.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-mounts-publicapi-ram.ini"/>
-							<param dst="c:\base\pbase-f32-rfs-mounts-publicapi-ram.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-mounts-publicapi-ram.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-rfs-mounts-publicapi-ram.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-rfs-mounts-publicapi-ram.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="RFs Functions (OS)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-rfs-publicapi-os.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-publicapi-os.script"/>
-							<param dst="c:\base\pbase-f32-rfs-publicapi-os.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-publicapi-os.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-publicapi-os.ini"/>
-							<param dst="c:\base\pbase-f32-rfs-publicapi-os.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-publicapi-os.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-rfs-publicapi-os.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-rfs-publicapi-os.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-                <case id="" name="RFs Functions (ROM)" harness="GENERIC" enabled="true" passrate="100">
-					<step name="pbase-f32-rfs-publicapi-rom.script (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-publicapi-rom.script"/>
-							<param dst="c:\base\pbase-f32-rfs-publicapi-rom.script"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-publicapi-rom.ini (install)" passrate="100" id="" enabled="true" significant="false" harness="GENERIC">
-						<params>
-							<param type="data"/>
-							<param src="pbase-f32-rfs-publicapi-rom.ini"/>
-							<param dst="c:\base\pbase-f32-rfs-publicapi-rom.ini"/>
-							<param component-path="basesvs\base"/>
-						</params>
-						<command>install</command>
-					</step>
-					<step name="pbase-f32-rfs-publicapi-rom.script (execute)" passrate="100" id="" enabled="true" significant="true" harness="GENERIC">
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="c:\base\pbase-f32-rfs-publicapi-rom.script"/>
-							<param result-file="c:\logs\testexecute\pbase-f32-rfs-publicapi-rom.htm"/> 
-                            <param timeout="1200" />
-							<param parser="TEFTestResultParser"/>
-							<param leave-old-result="true"/>
-						</params>
-						<command>execute</command>
-					</step>
-                </case>
-			</set>
-		</session>
-	</plan>
-	<files>
-		<file>basesvs\base\general\pbase-f32-driveunit-publicapi-any.script</file>
-		<file>basesvs\base\general\pbase-f32-format-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-format-publicapi-rem.script</file>
-		<file>basesvs\base\general\pbase-f32-format-publicapi-rom.script</file>
-		<file>basesvs\base\general\pbase-f32-rawdisk-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-rawdisk-publicapi-rem.script</file>
-		<file>basesvs\base\general\pbase-f32-dir-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-dirscan-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-file-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-fileman-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-fileman-publicapi-os.script</file>
-		<file>basesvs\base\general\pbase-f32-filenamesidentical-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-rdir-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-entry-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-filetext-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-volumeinfo-publicapi-any.script</file>
-		<file>basesvs\base\general\pbase-f32-parse-publicapi-any.script</file>
-		<file>basesvs\base\general\pbase-f32-parseptr-publicapi-any.script</file>
-		<file>basesvs\base\general\pbase-f32-parseptrc-publicapi-any.script</file>
-		<file>basesvs\base\general\pbase-f32-parse-inherited-publicapi-any.script</file>
-		<file>basesvs\base\general\pbase-f32-parseptr-inherited-publicapi-any.script</file>
-		<file>basesvs\base\general\pbase-f32-parseptrc-inherited-publicapi-any.script</file>
-		<file>basesvs\base\general\pbase-f32-entryarray-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-findfile-publicapi-os.script</file>
-		<file>basesvs\base\general\pbase-f32-findfile-publicapi-rem.script</file>
-		<file>basesvs\base\general\pbase-f32-openfilescan-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-rfs-drives-publicapi-any.script</file>
-		<file>basesvs\base\general\pbase-f32-rfs-files-publicapi-any.script</file>
-		<file>basesvs\base\general\pbase-f32-rfs-misc-publicapi-any.script</file>
-		<file>basesvs\base\general\pbase-f32-rfs-mounts-publicapi-any.script</file>
-		<file>basesvs\base\general\pbase-f32-rfs-publicapi-os.script</file>
-		<file>basesvs\base\general\pbase-f32-rfs-drives-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-rfs-files-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-rfs-misc-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-rfs-mounts-publicapi-ram.script</file>
-		<file>basesvs\base\general\pbase-f32-rfs-publicapi-rom.script</file>
-		<file>basesvs\base\general\pbase-f32-rfs-drives-publicapi-rem.script</file>
-		<file>basesvs\base\general\pbase-f32-driveunit-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-format-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-rawdisk-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-dir-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-dirscan-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-file-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-fileman-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-filenamesidentical-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-rdir-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-entry-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-filetext-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-volumeinfo-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-parse-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-parseptr-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-parseptrc-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-parsebase-inherited-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-entryarray-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-findfile-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-openfilescan-publicapi.ini</file>
-		<file>basesvs\base\general\pbase-f32-rfs-drives-publicapi-any.ini</file>
-		<file>basesvs\base\general\pbase-f32-rfs-files-publicapi-any.ini</file>
-		<file>basesvs\base\general\pbase-f32-rfs-misc-publicapi-any.ini</file>
-		<file>basesvs\base\general\pbase-f32-rfs-mounts-publicapi-any.ini</file>
-		<file>basesvs\base\general\pbase-f32-rfs-publicapi-os.ini</file>
-		<file>basesvs\base\general\pbase-f32-rfs-drives-publicapi-ram.ini</file>
-		<file>basesvs\base\general\pbase-f32-rfs-files-publicapi-ram.ini</file>
-		<file>basesvs\base\general\pbase-f32-rfs-misc-publicapi-ram.ini</file>
-		<file>basesvs\base\general\pbase-f32-rfs-mounts-publicapi-ram.ini</file>
-		<file>basesvs\base\general\pbase-f32-rfs-publicapi-rom.ini</file>
-		<file>basesvs\base\general\pbase-f32-rfs-drives-publicapi-rem.ini</file>
-        <file>basesvs\base\general\base_f32_env.ini</file>
-		<file>basesvs\base\t_sfsrv\general\test.txt</file>
-        <file>basesvs\base\t_sfsrv\general\test_rom.txt</file>
-		<file>basesvs\base\t_sfsrv\general\usbload.zip</file>
-		<file>basesvs\base\t_sfsrv\general\test1.txt</file>
-		<file>basesvs\base\t_sfsrv\general\test2.txt</file>
-		<file>basesvs\base\t_sfsrv\general\test3.txt</file>
-		<file>basesvs\base\t_sfsrv\general\1mb</file>
-		<file>basesvs\base\t_sfsrv\general\any.txt</file>
-		<file>basesvs\base\t_sfsrv\general\big_line.txt</file>
-		<file>basesvs\base\t_sfsrv\general\filetext_eof.txt</file>
-		<file>basesvs\base\t_sfsrv\general\filetext_read.txt</file>
-		<file>basesvs\base\t_sfsrv\general\multiline.txt</file>
-		<file>basesvs\base\t_sfsrv\general\new_file.txt</file>
-		<file>basesvs\base\t_sfsrv\general\oneliner.txt</file>
-		<file>basesvs\base\t_sfsrv\general\big.txt</file>
-		<file>basesvs\base\general\t_base.tcs</file>
-		<file>basesvs\winscw_udeb\t_sfsrv.exe</file>
-		<file>basesvs\winscw_udeb\t_perf.exe</file>
-		<file>basesvs\winscw_udeb\t_prompt.exe</file>
-		<file>basesvs\winscw_udeb\t_fat32server.exe</file>
-        <file>basesvs\winscw_udeb\t_testfsy1.fsy</file>
-        <file>basesvs\winscw_udeb\t_testfxt.fxt</file>
-	</files>
-</test>
diff -r 3effbd6728d4 -r 84fc7d5ec18f common/tools/ats/bctest/browser/browser.xml
--- a/common/tools/ats/bctest/browser/browser.xml	Fri Oct 09 17:01:52 2009 +0100
+++ b/common/tools/ats/bctest/browser/browser.xml	Fri Oct 09 17:03:29 2009 +0100
@@ -8,7 +8,6 @@
 	<target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="ATSINTERFACE" />
-            <property name="NAME" value="emulator_udeb" />
         </device>
 	</target>
 	<plan id="" name="Browser BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r 3effbd6728d4 -r 84fc7d5ec18f common/tools/ats/bctest/graphics/graphicssvs.pl
--- a/common/tools/ats/bctest/graphics/graphicssvs.pl	Fri Oct 09 17:01:52 2009 +0100
+++ b/common/tools/ats/bctest/graphics/graphicssvs.pl	Fri Oct 09 17:03:29 2009 +0100
@@ -7,127 +7,40 @@
 unlink "graphicssvs.zip";
 rmtree "temp";
 mkpath "temp/graphicssvs/graphics/general";
+mkpath "temp/graphicssvs/graphics/winscw/general";
 mkpath "temp/graphicssvs/winscw_udeb";
-mkpath "temp/graphicssvs/graphics/bitgdi/general";
-mkpath "temp/graphicssvs/graphics/fntstore/general";
 mkpath "temp/graphicssvs/graphics/t_fbservapi/general";
-mkpath "temp/graphicssvs/graphics/wserv/general";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
-copy("graphicssvs.xml",                                                          "temp/test.xml");
+copy("graphicssvs.xml",                                                          			"temp/test.xml");
 
-copy $epoc . "release/winscw/udeb/twsgraphicshare.exe",                                                     "temp/graphicssvs/winscw_udeb/twsgraphicshare.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/twsgraphicunshare.exe",                                                   "temp/graphicssvs/winscw_udeb/twsgraphicunshare.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_animplugin.dll",                                                        "temp/graphicssvs/winscw_udeb/t_animplugin.dll" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_fbservapi.exe",                                                         "temp/graphicssvs/winscw_udeb/t_fbservapi.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_graphicsbitgdiapi.exe",                                                 "temp/graphicssvs/winscw_udeb/t_graphicsbitgdiapi.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_graphicsfntstoreapi.exe",                                               "temp/graphicssvs/winscw_udeb/t_graphicsfntstoreapi.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_graphicswservapi.exe",                                                  "temp/graphicssvs/winscw_udeb/t_graphicswservapi.exe" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/t_fbservapi.exe",                                            "temp/graphicssvs/winscw_udeb/t_fbservapi.exe" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_graphics.ini",                                               "temp/graphicssvs/graphics/general/t_graphics.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/winscw/t_graphics.ini",                                        "temp/graphicssvs/graphics/winscw/general/t_graphics.ini" or die "failed : $!";
 
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi-2.ini",                     "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-2.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi-3.ini",                     "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-3.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi.ini",                       "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi.script",                    "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgcfont-publicapi.ini",                   "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgcfont-publicapi.script",                "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitmapdevice-publicapi.ini",                "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitmapdevice-publicapi.script",             "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsdevice-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsdevice-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsscreendevice-publicapi.ini",                "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsscreendevice-publicapi.script",             "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-polygonfiller-publicapi.ini",                  "temp/graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-polygonfiller-publicapi.script",               "temp/graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-publicapi.tcs",                                 "temp/graphicssvs/graphics/general/graphics-fbserv-publicapi.tcs" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-publicapi.script",                  		   "temp/graphicssvs/graphics/general/graphics-fbserv-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-bitmaputil-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbsbitmap-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbscolor256bitmaputil-publicapi.script",       "temp/graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbsfont-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbssession-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbstypefacestore-publicapi.script",            "temp/graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.script" or die "failed : $!";
 
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-bitmaputil-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-bitmaputil-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsbitmap-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsbitmap-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini",          "temp/graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbscolor256bitmaputil-publicapi.script",       "temp/graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsfont-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsfont-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbssession-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbssession-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbstypefacestore-publicapi.ini",               "temp/graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbstypefacestore-publicapi.script",            "temp/graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-bitmapfont-publicapi.ini",                   "temp/graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-bitmapfont-publicapi.script",                "temp/graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-fntstore-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-fntstore-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-openfontrasterizercontext-publicapi.ini",    "temp/graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-openfontrasterizercontext-publicapi.script", "temp/graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-anim-publicapi.ini",                            "temp/graphicssvs/graphics/general/graphics-wserv-anim-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-anim-publicapi.script",                         "temp/graphicssvs/graphics/general/graphics-wserv-anim-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animdll-publicapi.ini",                         "temp/graphicssvs/graphics/general/graphics-wserv-animdll-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animdll-publicapi.script",                      "temp/graphicssvs/graphics/general/graphics-wserv-animdll-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgeneralfunctions-publicapi.ini",            "temp/graphicssvs/graphics/general/graphics-wserv-animgeneralfunctions-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgeneralfunctions-publicapi.script",         "temp/graphicssvs/graphics/general/graphics-wserv-animgeneralfunctions-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgfwe-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-animgfwe-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgfwe-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-animgfwe-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animspritefunctions-publicapi.ini",             "temp/graphicssvs/graphics/general/graphics-wserv-animspritefunctions-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animspritefunctions-publicapi.script",          "temp/graphicssvs/graphics/general/graphics-wserv-animspritefunctions-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animwindowfunctions-publicapi.ini",             "temp/graphicssvs/graphics/general/graphics-wserv-animwindowfunctions-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animwindowfunctions-publicapi.script",          "temp/graphicssvs/graphics/general/graphics-wserv-animwindowfunctions-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-backedupwindow-publicapi.ini",                  "temp/graphicssvs/graphics/general/graphics-wserv-backedupwindow-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-backedupwindow-publicapi.script",               "temp/graphicssvs/graphics/general/graphics-wserv-backedupwindow-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-blankwindow-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-wserv-blankwindow-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-blankwindow-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-wserv-blankwindow-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-directscreenaccess-publicapi.ini",              "temp/graphicssvs/graphics/general/graphics-wserv-directscreenaccess-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-directscreenaccess-publicapi.script",           "temp/graphicssvs/graphics/general/graphics-wserv-directscreenaccess-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-dsasession-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-wserv-dsasession-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-dsasession-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-wserv-dsasession-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-events-publicapi.ini",                          "temp/graphicssvs/graphics/general/graphics-wserv-events-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-events-publicapi.script",                       "temp/graphicssvs/graphics/general/graphics-wserv-events-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-frame-publicapi.ini",                           "temp/graphicssvs/graphics/general/graphics-wserv-frame-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-frame-publicapi.script",                        "temp/graphicssvs/graphics/general/graphics-wserv-frame-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-session-publicapi.ini",                         "temp/graphicssvs/graphics/general/graphics-wserv-session-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-session-publicapi.script",                      "temp/graphicssvs/graphics/general/graphics-wserv-session-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-soundplugin-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-wserv-soundplugin-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-soundplugin-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-wserv-soundplugin-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-window-publicapi.ini",                          "temp/graphicssvs/graphics/general/graphics-wserv-window-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-window-publicapi.script",                       "temp/graphicssvs/graphics/general/graphics-wserv-window-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgc-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-windowgc-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgc-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-windowgc-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgroup-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-wserv-windowgroup-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgroup-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-wserv-windowgroup-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsbitmap-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-wsbitmap-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsbitmap-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-wsbitmap-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmap-publicapi.ini",                 "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmap-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmap-publicapi.script",              "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmap-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmapanimation-publicapi.ini",        "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmapanimation-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmapanimation-publicapi.script",     "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmapanimation-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicmsgbuf-publicapi.ini",                 "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicmsgbuf-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicmsgbuf-publicapi.script",              "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicmsgbuf-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wspointercursor-publicapi.ini",                 "temp/graphicssvs/graphics/general/graphics-wserv-wspointercursor-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wspointercursor-publicapi.script",              "temp/graphicssvs/graphics/general/graphics-wserv-wspointercursor-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsscreendevice-publicapi.ini",                  "temp/graphicssvs/graphics/general/graphics-wserv-wsscreendevice-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsscreendevice-publicapi.script",               "temp/graphicssvs/graphics/general/graphics-wserv-wsscreendevice-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wssprite-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-wssprite-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wssprite-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-wssprite-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_graphics.ini",                                               "temp/graphicssvs/graphics/general/t_graphics.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_graphics.tcs",                                               "temp/graphicssvs/graphics/general/t_graphics.tcs" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_graphics_panic.tcs",                                         "temp/graphicssvs/graphics/general/t_graphics_panic.tcs" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-bitmaputil-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbsbitmap-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini",          "temp/graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbsfont-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbssession-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbstypefacestore-publicapi.ini",            	"temp/graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.ini" or die "failed : $!";
 
-copy $epoc . "release/winscw/udeb/z/graphics/bitgdi/test_rwssprite_bitmap.mbm",                             "temp/graphicssvs/graphics/bitgdi/general/test_rwssprite_bitmap.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/bitgdi/testfontws.gdr",                                        "temp/graphicssvs/graphics/bitgdi/general/testfontws.gdr" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/fntstore/bad_entrysel",                                        "temp/graphicssvs/graphics/fntstore/general/bad_entrysel" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/fntstore/dummy",                                               "temp/graphicssvs/graphics/fntstore/general/dummy" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/fntstore/dummy",                                               "temp/graphicssvs/graphics/fntstore/general/dummy_2" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/fntstore/testfontws.gdr",                                      "temp/graphicssvs/graphics/fntstore/general/testfontws.gdr" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/empty_file.txt",                                   "temp/graphicssvs/graphics/t_fbservapi/general/empty_file.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/scaniline_10bytes.txt",                            "temp/graphicssvs/graphics/t_fbservapi/general/scaniline_10bytes.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/testfontfb.gdr",                                   "temp/graphicssvs/graphics/t_fbservapi/general/testfontfb.gdr" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap.mbm",                                  "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_24bit_400x300.mbm",                    "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_24bit_400x300.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_32x8.mbm",                             "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_32x8.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_offset8.mbm",                          "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_offset8.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_rom.rbm",                              "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_rom.rbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/testfontws.gdr",                                         "temp/graphicssvs/graphics/wserv/general/testfontws.gdr" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_alpha.mbm",                                         "temp/graphicssvs/graphics/wserv/general/test_alpha.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_board.mbm",                                         "temp/graphicssvs/graphics/wserv/general/test_board.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_mask.mbm",                                          "temp/graphicssvs/graphics/wserv/general/test_mask.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_rwssprite_bitmap.mbm",                              "temp/graphicssvs/graphics/wserv/general/test_rwssprite_bitmap.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/wsgraphicbitmapanimation.mbm",                           "temp/graphicssvs/graphics/wserv/general/wsgraphicbitmapanimation.mbm" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/empty_file.txt",                                   "temp/graphicssvs/graphics/t_fbservapi/general/empty_file.txt" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/scaniline_10bytes.txt",                            "temp/graphicssvs/graphics/t_fbservapi/general/scaniline_10bytes.txt" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/testfontfb.gdr",                                   "temp/graphicssvs/graphics/t_fbservapi/general/testfontfb.gdr" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap.mbm",                                  "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap.mbm" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap_24bit_400x300.mbm",                    "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_24bit_400x300.mbm" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap_32x8.mbm",                             "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_32x8.mbm" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap_offset8.mbm",                          "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_offset8.mbm" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap_rom.rbm",                              "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_rom.rbm" or die "failed : $!";
 
 system("7z a -tzip graphicssvs.zip ./temp/*");
diff -r 3effbd6728d4 -r 84fc7d5ec18f common/tools/ats/bctest/graphics/graphicssvs.xml
--- a/common/tools/ats/bctest/graphics/graphicssvs.xml	Fri Oct 09 17:01:52 2009 +0100
+++ b/common/tools/ats/bctest/graphics/graphicssvs.xml	Fri Oct 09 17:03:29 2009 +0100
@@ -15,32 +15,14 @@
             <device rank="master" alias="emulator_udeb"/>
         </target>
         <session id="" name="Graphics SVS Session" harness="GENERIC" enabled="true" passrate="100">
-            <set id="" name="Window Server" harness="GENERIC" enabled="true" passrate="100">
-                <case id="" name="Install Common Files for Window Server" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="t_graphicswservapi.exe (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+            <set id="" name="Font and Bitmap Server" harness="GENERIC" enabled="true" passrate="100">
+                <case id="" name="Font and Bitmap Server Tests" harness="GENERIC" enabled="true" passrate="100">
+                    <step id="" name="t_fbservapi.exe (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>install</command>
                         <params>
                             <param type="binary"/>
-                            <param src="t_graphicswservapi.exe"/>
-                            <param dst="c:\sys\bin\t_graphicswservapi.exe"/>
-                            <param component-path="graphicssvs" />
-                        </params>
-                    </step>
-                    <step id="" name="t_animplugin.dll (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="binary"/>
-                            <param src="t_animplugin.dll"/>
-                            <param dst="c:\sys\bin\t_animplugin.dll"/>
-                            <param component-path="graphicssvs" />
-                        </params>
-                    </step>
-                    <step id="" name="twsgraphicunshare.exe (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="binary"/>
-                            <param src="twsgraphicunshare.exe"/>
-                            <param dst="c:\sys\bin\twsgraphicunshare.exe"/>
+                            <param src="t_fbservapi.exe"/>
+                            <param dst="c:\sys\bin\t_fbservapi.exe"/>
                             <param component-path="graphicssvs" />
                         </params>
                     </step>
@@ -53,1077 +35,12 @@
 							<param component-path="graphicssvs\graphics" />
 						</params>
 					</step>
-                    <step id="" name="test_rwssprite_bitmap.mbm (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="test_rwssprite_bitmap.mbm"/>
-							<param dst="c:\graphics\wserv\test_rwssprite_bitmap.mbm"/>
-							<param component-path="graphicssvs\graphics\wserv" />
-						</params>
-					</step>
-                    <step id="" name="test_board.mbm (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="test_board.mbm"/>
-							<param dst="c:\graphics\wserv\test_board.mbm"/>
-							<param component-path="graphicssvs\graphics\wserv" />
-						</params>
-					</step>
-                    <step id="" name="test_alpha.mbm (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="test_alpha.mbm"/>
-							<param dst="c:\graphics\wserv\test_alpha.mbm"/>
-							<param component-path="graphicssvs\graphics\wserv" />
-						</params>
-					</step>
-                    <step id="" name="test_mask.mbm (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="test_mask.mbm"/>
-							<param dst="c:\graphics\wserv\test_mask.mbm"/>
-							<param component-path="graphicssvs\graphics\wserv" />
-						</params>
-					</step>
-                    <step id="" name="wsgraphicbitmapanimation.mbm (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="wsgraphicbitmapanimation.mbm"/>
-							<param dst="c:\graphics\wserv\wsgraphicbitmapanimation.mbm"/>
-							<param component-path="graphicssvs\graphics\wserv" />
-						</params>
-					</step>
-                    <step id="" name="testfontws.gdr (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testfontws.gdr"/>
-							<param dst="c:\graphics\wserv\testfontws.gdr"/>
-							<param component-path="graphicssvs\graphics\wserv" />
-						</params>
-					</step>
-                </case>
-                <case id="" name="Animation" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-anim-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="graphics-wserv-anim-publicapi.script"/>
-							<param dst="c:\graphics\graphics-wserv-anim-publicapi.script"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-					<step id="" name="graphics-wserv-anim-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="graphics-wserv-anim-publicapi.ini"/>
-							<param dst="c:\graphics\graphics-wserv-anim-publicapi.ini"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-                    <step id="" name="graphics-wserv-anim-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>execute</command>
-						<params>
-							<param file="testexecute.exe" /> 
-							<param parameters="c:\graphics\graphics-wserv-anim-publicapi.script" /> 
-							<param result-file="c:\logs\testexecute\graphics-wserv-anim-publicapi.htm" /> 
-							<param timeout="1200" /> 
-							<param parser="TEFTestResultParser" /> 
-							<param leave-old-result="true" /> 
-						</params>
-                    </step>
-                </case>
-                <case id="" name="Animation Plugin DLL" harness="GENERIC" enabled="true" passrate="100">
-					<step id="" name="graphics-wserv-animdll-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="graphics-wserv-animdll-publicapi.script"/>
-							<param dst="c:\graphics\graphics-wserv-animdll-publicapi.script"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-					<step id="" name="graphics-wserv-animdll-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="graphics-wserv-animdll-publicapi.ini"/>
-							<param dst="c:\graphics\graphics-wserv-animdll-publicapi.ini"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-                    <step id="" name="graphics-wserv-animdll-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>execute</command>
-						<params>
-							<param file="testexecute.exe" /> 
-							<param parameters="c:\graphics\graphics-wserv-animdll-publicapi.script" /> 
-							<param result-file="c:\logs\testexecute\graphics-wserv-animdll-publicapi.htm" /> 
-							<param timeout="1200" /> 
-							<param parser="TEFTestResultParser" /> 
-							<param leave-old-result="true" /> 
-						</params>
-                    </step>
-                </case>
-                <case id="" name="Animation General Functions" harness="GENERIC" enabled="true" passrate="100">
-					<step id="" name="graphics-wserv-animgeneralfunctions-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="graphics-wserv-animgeneralfunctions-publicapi.script"/>
-							<param dst="c:\graphics\graphics-wserv-animgeneralfunctions-publicapi.script"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-					<step id="" name="graphics-wserv-animgeneralfunctions-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="graphics-wserv-animgeneralfunctions-publicapi.ini"/>
-							<param dst="c:\graphics\graphics-wserv-animgeneralfunctions-publicapi.ini"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-                    <step id="" name="graphics-wserv-animgeneralfunctions-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>execute</command>
-						<params>
-							<param file="testexecute.exe" /> 
-							<param parameters="c:\graphics\graphics-wserv-animgeneralfunctions-publicapi.script" /> 
-							<param result-file="c:\logs\testexecute\graphics-wserv-animgeneralfunctions-publicapi.htm" /> 
-							<param timeout="1200" /> 
-							<param parser="TEFTestResultParser" /> 
-							<param leave-old-result="true" /> 
-						</params>
-                    </step>
-                </case>
-                <case id="" name="Animation General Functions(Window Extension)" harness="GENERIC" enabled="true" passrate="100">
-					<step id="" name="graphics-wserv-animgfwe-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="graphics-wserv-animgfwe-publicapi.script"/>
-							<param dst="c:\graphics\graphics-wserv-animgfwe-publicapi.script"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-					<step id="" name="graphics-wserv-animgfwe-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+                    <step id="" name="graphics-fbserv-publicapi.tcs (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="data"/>
-							<param src="graphics-wserv-animgfwe-publicapi.ini"/>
-							<param dst="c:\graphics\graphics-wserv-animgfwe-publicapi.ini"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-                    <step id="" name="graphics-wserv-animgfwe-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>execute</command>
-						<params>
-							<param file="testexecute.exe" /> 
-							<param parameters="c:\graphics\graphics-wserv-animgfwe-publicapi.script" /> 
-							<param result-file="c:\logs\testexecute\graphics-wserv-animgfwe-publicapi.htm" /> 
-							<param timeout="1200" /> 
-							<param parser="TEFTestResultParser" /> 
-							<param leave-old-result="true" /> 
-						</params>
-                    </step>
-                </case>
-                <case id="" name="Animation Sprite Functions" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-animspritefunctions-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-animspritefunctions-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-animspritefunctions-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-animspritefunctions-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-animspritefunctions-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-animspritefunctions-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-animspritefunctions-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-animspritefunctions-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-animspritefunctions-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Animation Window Functions" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-animwindowfunctions-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-animwindowfunctions-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-animwindowfunctions-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-animwindowfunctions-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-animwindowfunctions-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-animwindowfunctions-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-animwindowfunctions-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-animwindowfunctions-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-animwindowfunctions-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Backed Up Window" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-backedupwindow-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-backedupwindow-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-backedupwindow-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-backedupwindow-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-backedupwindow-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-backedupwindow-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-backedupwindow-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-backedupwindow-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-backedupwindow-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Blank Window" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-blankwindow-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-blankwindow-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-blankwindow-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-blankwindow-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-blankwindow-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-blankwindow-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-blankwindow-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-blankwindow-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-blankwindow-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Direct Screen Access" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-directscreenaccess-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-directscreenaccess-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-directscreenaccess-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-directscreenaccess-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-directscreenaccess-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-directscreenaccess-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-directscreenaccess-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-directscreenaccess-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-directscreenaccess-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Direct Screen Access Session" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-dsasession-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-dsasession-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-dsasession-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-dsasession-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-dsasession-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-dsasession-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-dsasession-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-dsasession-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-dsasession-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Events" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-events-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-events-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-events-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-events-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-events-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-events-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-events-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-events-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-events-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Frames" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-frame-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-frame-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-frame-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-frame-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-frame-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-frame-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-frame-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-frame-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-frame-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Session" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-session-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-session-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-session-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-session-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-session-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-session-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-session-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-session-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-session-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Sound Plugin" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-soundplugin-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-soundplugin-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-soundplugin-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-soundplugin-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-soundplugin-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-soundplugin-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-soundplugin-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-soundplugin-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-soundplugin-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Graphics Context" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-windowgc-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-windowgc-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-windowgc-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-windowgc-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-windowgc-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-windowgc-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-windowgc-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-windowgc-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-windowgc-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Groups" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-windowgroup-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-windowgroup-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-windowgroup-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-windowgroup-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-windowgroup-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-windowgroup-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-windowgroup-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-windowgroup-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-windowgroup-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Windows" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-window-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-window-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-window-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-window-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-window-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-window-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-window-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-window-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-window-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Bitmap" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-wsbitmap-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsbitmap-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-wsbitmap-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsbitmap-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsbitmap-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-wsbitmap-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsbitmap-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-wsbitmap-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-wsbitmap-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Graphic Bitmap Animation" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-wsgraphicbitmapanimation-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsgraphicbitmapanimation-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-wsgraphicbitmapanimation-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsgraphicbitmapanimation-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsgraphicbitmapanimation-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-wsgraphicbitmapanimation-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsgraphicbitmapanimation-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-wsgraphicbitmapanimation-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-wsgraphicbitmapanimation-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Graphic Bitmap" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-wsgraphicbitmap-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsgraphicbitmap-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-wsgraphicbitmap-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsgraphicbitmap-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsgraphicbitmap-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-wsgraphicbitmap-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsgraphicbitmap-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-wsgraphicbitmap-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-wsgraphicbitmap-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Graphic Message Buffer" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-wsgraphicmsgbuf-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsgraphicmsgbuf-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-wsgraphicmsgbuf-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsgraphicmsgbuf-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsgraphicmsgbuf-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-wsgraphicmsgbuf-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsgraphicmsgbuf-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-wsgraphicmsgbuf-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-wsgraphicmsgbuf-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Pointer Cursor" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-wspointercursor-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wspointercursor-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-wspointercursor-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wspointercursor-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wspointercursor-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-wspointercursor-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wspointercursor-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-wspointercursor-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-wspointercursor-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Screen Device" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-wsscreendevice-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsscreendevice-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-wsscreendevice-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsscreendevice-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsscreendevice-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-wsscreendevice-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsscreendevice-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-wsscreendevice-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-wsscreendevice-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Sprite" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-wssprite-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wssprite-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-wssprite-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wssprite-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wssprite-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-wssprite-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wssprite-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-wssprite-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-wssprite-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-            </set>
-            <set id="" name="Bit GDI (Graphics Device Interface)" harness="GENERIC" enabled="true" passrate="100">
-                <case id="" name="Install Common Files for Bit GDI" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="t_graphicsbitgdiapi.exe (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="binary"/>
-                            <param src="t_graphicsbitgdiapi.exe"/>
-                            <param dst="c:\sys\bin\t_graphicsbitgdiapi.exe"/>
-                            <param component-path="graphicssvs" />
-                        </params>
-                    </step>
-                    <step id="" name="t_graphics.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="t_graphics.ini"/>
-							<param dst="c:\graphics\t_graphics.ini"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-                    <step id="" name="test_rwssprite_bitmap.mbm (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="test_rwssprite_bitmap.mbm"/>
-							<param dst="c:\graphics\bitgdi\test_rwssprite_bitmap.mbm"/>
-							<param component-path="graphicssvs\graphics\bitgdi" />
-						</params>
-					</step>
-                    <step id="" name="testfontws.gdr (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testfontws.gdr"/>
-							<param dst="c:\graphics\bitgdi"/>
-							<param component-path="graphicssvs\graphics\bitgdi" />
-						</params>
-					</step>
-                    <step id="" name="test_bitmap_rom.rbm (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="test_bitmap_rom.rbm"/>
-							<param dst="z:\graphics\t_fbservapi\test_bitmap_rom.rbm"/>
-							<param component-path="graphicssvs\graphics\t_fbservapi" />
-						</params>
-					</step>                  
-                </case>
-                <case id="" name="Bit Graphics Context" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-bitgdi-fbsbitgc-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitgc-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitgc-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitgc-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitgc-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitgc-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitgc-publicapi-2.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitgc-publicapi-2.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitgc-publicapi-2.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitgc-publicapi-3.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitgc-publicapi-3.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitgc-publicapi-3.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitgc-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-bitgdi-fbsbitgc-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-bitgdi-fbsbitgc-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Bit Graphics Context Font" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-bitgdi-fbsbitgcfont-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitgcfont-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitgcfont-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitgcfont-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitgcfont-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitgcfont-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitgcfont-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-bitgdi-fbsbitgcfont-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-bitgdi-fbsbitgcfont-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Bitmap Device" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-bitgdi-fbsbitmapdevice-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitmapdevice-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitmapdevice-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitmapdevice-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitmapdevice-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitmapdevice-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitmapdevice-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-bitgdi-fbsbitmapdevice-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-bitgdi-fbsbitmapdevice-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="FBS Device" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-bitgdi-fbsdevice-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsdevice-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsdevice-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsdevice-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsdevice-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsdevice-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsdevice-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-bitgdi-fbsdevice-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-bitgdi-fbsdevice-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="FBS Screen Device" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-bitgdi-fbsscreendevice-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsscreendevice-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsscreendevice-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsscreendevice-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsscreendevice-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsscreendevice-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsscreendevice-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-bitgdi-fbsscreendevice-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-bitgdi-fbsscreendevice-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Polygon Filler" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-bitgdi-polygonfiller-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-polygonfiller-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-bitgdi-polygonfiller-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-polygonfiller-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-polygonfiller-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-polygonfiller-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-polygonfiller-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-bitgdi-polygonfiller-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-bitgdi-polygonfiller-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-            </set>
-            <set id="" name="Font and Bitmap Server" harness="GENERIC" enabled="true" passrate="100">
-                <case id="" name="Install Common Files for Font and Bitmap Server" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="t_fbservapi.exe (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="binary"/>
-                            <param src="t_fbservapi.exe"/>
-                            <param dst="c:\sys\bin\t_fbservapi.exe"/>
-                            <param component-path="graphicssvs" />
-                        </params>
-                    </step>
-                    
-                    <step id="" name="t_graphics.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="t_graphics.ini"/>
-							<param dst="c:\graphics\t_graphics.ini"/>
+							<param src="graphics-fbserv-publicapi.tcs"/>
+							<param dst="c:\graphics\graphics-fbserv-publicapi.tcs"/>
 							<param component-path="graphicssvs\graphics" />
 						</params>
 					</step>
@@ -1199,8 +116,15 @@
 							<param component-path="graphicssvs\graphics\t_fbservapi" />
 						</params>
 					</step>
-                </case>
-                <case id="" name="Bitmap Utilities" harness="GENERIC" enabled="true" passrate="100">
+                    <step id="" name="graphics-fbserv-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+                        <command>install</command>
+                        <params>
+                            <param type="data"/>
+                            <param src="graphics-fbserv-publicapi.script"/>
+                            <param dst="c:\graphics\graphics-fbserv-publicapi.script"/>
+                            <param component-path="graphicssvs\graphics" />
+                        </params>
+                    </step>
                     <step id="" name="graphics-fbserv-bitmaputil-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>install</command>
                         <params>
@@ -1219,19 +143,6 @@
                             <param component-path="graphicssvs\graphics" />
                         </params>
                     </step>
-                    <step id="" name="graphics-fbserv-bitmaputil-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fbserv-bitmaputil-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fbserv-bitmaputil-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="FBS Bitmap" harness="GENERIC" enabled="true" passrate="100">
                     <step id="" name="graphics-fbserv-fbsbitmap-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>install</command>
                         <params>
@@ -1250,19 +161,6 @@
                             <param component-path="graphicssvs\graphics" />
                         </params>
                     </step>
-                    <step id="" name="graphics-fbserv-fbsbitmap-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fbserv-fbsbitmap-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fbserv-fbsbitmap-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="256-Color Bitmap Utilities" harness="GENERIC" enabled="true" passrate="100">
                     <step id="" name="graphics-fbserv-fbscolor256bitmaputil-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>install</command>
                         <params>
@@ -1281,19 +179,6 @@
                             <param component-path="graphicssvs\graphics" />
                         </params>
                     </step>
-                    <step id="" name="graphics-fbserv-fbscolor256bitmaputil-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fbserv-fbscolor256bitmaputil-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fbserv-fbscolor256bitmaputil-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="FBS Fonts" harness="GENERIC" enabled="true" passrate="100">
                     <step id="" name="graphics-fbserv-fbsfont-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>install</command>
                         <params>
@@ -1312,19 +197,6 @@
                             <param component-path="graphicssvs\graphics" />
                         </params>
                     </step>
-                    <step id="" name="graphics-fbserv-fbsfont-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fbserv-fbsfont-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fbserv-fbsfont-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="FBS Session" harness="GENERIC" enabled="true" passrate="100">
                     <step id="" name="graphics-fbserv-fbssession-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>install</command>
                         <params>
@@ -1343,19 +215,6 @@
                             <param component-path="graphicssvs\graphics" />
                         </params>
                     </step>
-                    <step id="" name="graphics-fbserv-fbssession-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fbserv-fbssession-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fbserv-fbssession-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="FBS Typeface Store" harness="GENERIC" enabled="true" passrate="100">
                     <step id="" name="graphics-fbserv-fbstypefacestore-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>install</command>
                         <params>
@@ -1374,164 +233,13 @@
                             <param component-path="graphicssvs\graphics" />
                         </params>
                     </step>
-                    <step id="" name="graphics-fbserv-fbstypefacestore-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+                    <step id="" name="graphics-fbserv-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>execute</command>
                         <params>
                             <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fbserv-fbstypefacestore-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fbserv-fbstypefacestore-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-            </set>
-            <set id="" name="Font Store" harness="GENERIC" enabled="true" passrate="100">
-                <case id="" name="Install Common Files for Font Store" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="t_graphicsfntstoreapi.exe (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="binary"/>
-                            <param src="t_graphicsfntstoreapi.exe"/>
-                            <param dst="c:\sys\bin\t_graphicsfntstoreapi.exe"/>
-                            <param component-path="graphicssvs" />
-                        </params>
-                    </step>
-                    <step id="" name="t_graphics.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="t_graphics.ini"/>
-							<param dst="c:\graphics\t_graphics.ini"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-                    <step id="" name="testfontws.gdr (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testfontws.gdr"/>
-							<param dst="c:\graphics\fntstore\testfontws.gdr"/>
-							<param component-path="graphicssvs\graphics\fntstore" />
-						</params>
-					</step>
-                    <step id="" name="bad_entrysel (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="bad_entrysel"/>
-							<param dst="c:\graphics\fntstore\bad_entrysel"/>
-							<param component-path="graphicssvs\graphics\fntstore" />
-						</params>
-					</step>
-                    <step id="" name="dummy (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="dummy"/>
-							<param dst="c:\graphics\fntstore\dummy"/>
-							<param component-path="graphicssvs\graphics\fntstore" />
-						</params>
-					</step>
-                    <step id="" name="dummy_2 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="dummy_2"/>
-							<param dst="c:\graphics\fntstore\dummy_2"/>
-							<param component-path="graphicssvs\graphics\fntstore" />
-						</params>
-					</step>
-                </case>
-                <case id="" name="Bitmap Font" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-fntstore-bitmapfont-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-fntstore-bitmapfont-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-fntstore-bitmapfont-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-fntstore-bitmapfont-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-fntstore-bitmapfont-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-fntstore-bitmapfont-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-fntstore-bitmapfont-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fntstore-bitmapfont-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fntstore-bitmapfont-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Font Store" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-fntstore-fntstore-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-fntstore-fntstore-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-fntstore-fntstore-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-fntstore-fntstore-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-fntstore-fntstore-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-fntstore-fntstore-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-fntstore-fntstore-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fntstore-fntstore-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fntstore-fntstore-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Open Font Rasterizer Context" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-fntstore-openfontrasterizercontext-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-fntstore-openfontrasterizercontext-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-fntstore-openfontrasterizercontext-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-fntstore-openfontrasterizercontext-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-fntstore-openfontrasterizercontext-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-fntstore-openfontrasterizercontext-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-fntstore-openfontrasterizercontext-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fntstore-openfontrasterizercontext-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fntstore-openfontrasterizercontext-publicapi.htm" /> 
-                            <param timeout="1200" /> 
+                            <param parameters="c:\graphics\graphics-fbserv-publicapi.script -tcx \graphics\graphics-fbserv-publicapi.tcs" /> 
+                            <param result-file="c:\logs\testexecute\graphics-fbserv-publicapi.htm" /> 
+                            <param timeout="3600" /> 
                             <param parser="TEFTestResultParser" /> 
                             <param leave-old-result="true" /> 
                         </params>
@@ -1541,27 +249,10 @@
         </session>
 	</plan>
 	<files>
-		<file>graphicssvs/winscw_udeb/twsgraphicshare.exe</file>
-        <file>graphicssvs/winscw_udeb/twsgraphicunshare.exe</file>
-        <file>graphicssvs/winscw_udeb/t_animplugin.dll</file>
         <file>graphicssvs/winscw_udeb/t_fbservapi.exe</file>
-        <file>graphicssvs/winscw_udeb/t_graphicsbitgdiapi.exe</file>
-        <file>graphicssvs/winscw_udeb/t_graphicsfntstoreapi.exe</file>
-		<file>graphicssvs/winscw_udeb/t_graphicswservapi.exe</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-2.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-3.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.ini</file>
+		<file>graphicssvs/graphics/general/t_graphics.ini</file>
+		<file>graphicssvs/graphics/general/graphics-fbserv-publicapi.tcs</file>
+		<file>graphicssvs/graphics/general/graphics-fbserv-publicapi.script</file>
         <file>graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.script</file>
         <file>graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.ini</file>
         <file>graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.script</file>
@@ -1574,69 +265,6 @@
         <file>graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.ini</file>
         <file>graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.script</file>
         <file>graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-anim-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-anim-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animdll-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animdll-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animgeneralfunctions-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animgeneralfunctions-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animgfwe-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animgfwe-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animspritefunctions-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animspritefunctions-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animwindowfunctions-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animwindowfunctions-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-backedupwindow-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-backedupwindow-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-blankwindow-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-blankwindow-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-directscreenaccess-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-directscreenaccess-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-dsasession-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-dsasession-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-events-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-events-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-frame-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-frame-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-session-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-session-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-soundplugin-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-soundplugin-publicapi.ini</file>        
-        <file>graphicssvs/graphics/general/graphics-wserv-windowgc-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-windowgc-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-windowgroup-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-windowgroup-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-window-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-window-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsbitmap-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsbitmap-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmapanimation-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmapanimation-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmap-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmap-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsgraphicmsgbuf-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsgraphicmsgbuf-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wspointercursor-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wspointercursor-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsscreendevice-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsscreendevice-publicapi.ini</file>        
-        <file>graphicssvs/graphics/general/graphics-wserv-wssprite-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wssprite-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/t_graphics.ini</file>
-        <file>graphicssvs/graphics/general/t_graphics.tcs</file>
-        <file>graphicssvs/graphics/general/t_graphics_panic.tcs</file>
-        <file>graphicssvs/graphics/bitgdi/general/test_rwssprite_bitmap.mbm</file>
-        <file>graphicssvs/graphics/bitgdi/general/testfontws.gdr</file>
-        <file>graphicssvs/graphics/fntstore/general/bad_entrysel</file>
-        <file>graphicssvs/graphics/fntstore/general/dummy</file>
-        <file>graphicssvs/graphics/fntstore/general/dummy_2</file>
-        <file>graphicssvs/graphics/fntstore/general/testfontws.gdr</file>
         <file>graphicssvs/graphics/t_fbservapi/general/test_bitmap_rom.rbm</file>
         <file>graphicssvs/graphics/t_fbservapi/general/empty_file.txt</file>
         <file>graphicssvs/graphics/t_fbservapi/general/scaniline_10bytes.txt</file>
@@ -1645,11 +273,5 @@
         <file>graphicssvs/graphics/t_fbservapi/general/test_bitmap_24bit_400x300.mbm</file>
         <file>graphicssvs/graphics/t_fbservapi/general/test_bitmap_32x8.mbm</file>
         <file>graphicssvs/graphics/t_fbservapi/general/test_bitmap_offset8.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/test_rwssprite_bitmap.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/test_alpha.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/test_board.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/test_mask.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/wsgraphicbitmapanimation.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/testfontws.gdr</file>
     </files>
 </test>
diff -r 3effbd6728d4 -r 84fc7d5ec18f common/tools/ats/bctest/locationsrv/locaddedit/locaddedit.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/locationsrv/locaddedit/locaddedit.pl	Fri Oct 09 17:03:29 2009 +0100
@@ -0,0 +1,35 @@
+#!/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 Landmarks Application Editor BC tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "locaddedittest.zip";
+rmtree "temp";
+mkpath "temp/locaddedittest/general/testframework";
+mkpath "temp/locaddedittest/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("locaddedit.xml",	"temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/bcapplmkaddedit.dll",					"temp/locaddedittest/winscw_udeb/bcapplmkaddedit.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/TestFramework_locaddedit.ini",		"temp/locaddedittest/general/testframework/TestFramework_locaddedit.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/ui_lmkaddedit.cfg",				"temp/locaddedittest/general/testframework/ui_lmkaddedit.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tcLmkAddEdit.cfg",					"temp/locaddedittest/general/testframework/tcLmkAddEdit.cfg") or die "failed : $!";
+
+system("7z a -tzip locaddedittest.zip ./temp/*");
diff -r 3effbd6728d4 -r 84fc7d5ec18f common/tools/ats/bctest/locationsrv/locaddedit/locaddedit.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/locationsrv/locaddedit/locaddedit.xml	Fri Oct 09 17:03:29 2009 +0100
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+	<buildid></buildid>
+	<name>Landmarks Application Editor BC Tests</name>
+	<target>
+        <device rank="master" alias="emulator_udeb">
+            <property name="HARNESS" value="ATSINTERFACE" />
+        </device>
+	</target>
+	<plan id="" name="Landmarks Application Editor BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+		<session id="" name="Landmarks Application Editor Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="Landmarks Add Edit" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="Landmarks Add Edit" 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="BCAppLmkAddEdit.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bcapplmkaddedit.dll"/>
+							<param dst="c:\sys\bin\bcapplmkaddedit.dll"/>
+							<param component-path="locaddedittest" />
+						</params>
+					</step>
+					<step id="" name="TestFramework_locaddedit.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/TestFramework_locaddedit.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="locaddedittest" />
+						</params>
+					</step>
+					<step id="" name="UI_LmkAddEdit.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/ui_lmkaddedit.cfg"/>
+							<param dst="c:\testframework\ui_lmkaddedit.cfg"/>
+							<param component-path="locaddedittest" />
+						</params>
+					</step>
+					<step id="" name="tcLmkAddEdit.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tclmkaddedit.cfg"/>
+							<param dst="c:\testframework\tclmkaddedit.cfg"/>
+							<param component-path="locaddedittest" />
+						</params>
+					</step>
+					<step id="" name="tcLmkAddEdit (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testcombiner -config c:\testframework\tclmkaddedit.cfg"/>
+							<param result-file="c:\spd_logs\xml\testcombiner.xml"/>
+                            <param timeout="3600"/>
+						</params>
+					</step>
+					<step id="" name="tcLmkAddEdit (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>locaddedittest/winscw_udeb/bcapplmkaddedit.dll</file>
+		<file>locaddedittest/general/testframework/TestFramework_locaddedit.ini</file>
+		<file>locaddedittest/general/testframework/ui_lmkaddedit.cfg</file>
+		<file>locaddedittest/general/testframework/tcLmkAddEdit.cfg</file>
+	</files>
+</test>
diff -r 3effbd6728d4 -r 84fc7d5ec18f common/tools/ats/bctest/messaging/messaging.pl
--- a/common/tools/ats/bctest/messaging/messaging.pl	Fri Oct 09 17:01:52 2009 +0100
+++ b/common/tools/ats/bctest/messaging/messaging.pl	Fri Oct 09 17:03:29 2009 +0100
@@ -23,6 +23,7 @@
 rmtree "temp";
 
 mkpath "temp/bcmessaging/testframework/general";
+mkpath "temp/bcmessaging/pluginbiocontrolapitest/general";
 mkpath "temp/bcmessaging/resource/general";
 mkpath "temp/bcmessaging/winscw_udeb";
 
@@ -35,9 +36,8 @@
 copy($epoc . "release/winscw/udeb/PluginBioControlAPITest.dll",             "temp/bcmessaging/winscw_udeb/PluginBioControlAPITest.dll") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/tcTestUIBioCombiner.cfg",              "temp/bcmessaging/testframework/general/tcTestUIBioCombiner.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_PluginBioControlAPITest.cfg",       "temp/bcmessaging/testframework/general/ui_PluginBioControlAPITest.cfg") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/test.txt",                             "temp/bcmessaging/testframework/general/test.txt") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/test.txt",                             "temp/bcmessaging/pluginbiocontrolapitest/general/test.txt") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/PluginBioControlAPITest.rsc",          "temp/bcmessaging/testframework/general/PluginBioControlAPITest.rsc") or die "failed : $!";
 copy($epoc . "data/z/resource/pluginbiocontrolapitest.rsc",                 "temp/bcmessaging/resource/general/pluginbiocontrolapitest.rsc") or die "failed : $!";
-copy($epoc . "data/z/resource/pluginbiocontrolapitest.r01",                 "temp/bcmessaging/resource/general/pluginbiocontrolapitest.r01") or die "failed : $!";
 
 system("7z a -tzip messaging.zip ./temp/*");
\ No newline at end of file
diff -r 3effbd6728d4 -r 84fc7d5ec18f common/tools/ats/bctest/messaging/messaging.xml
--- a/common/tools/ats/bctest/messaging/messaging.xml	Fri Oct 09 17:01:52 2009 +0100
+++ b/common/tools/ats/bctest/messaging/messaging.xml	Fri Oct 09 17:03:29 2009 +0100
@@ -105,8 +105,17 @@
 						<params>
 							<param type="data"/>
 							<param src="test.txt"/>
-							<param dst="c:\testframework\test.txt"/>
-							<param component-path="bcmessaging\testframework" />
+							<param dst="e:\testing\data\pluginbiocontrolapitest\test.txt"/>
+							<param component-path="bcmessaging\pluginbiocontrolapitest" />
+						</params>
+					</step>
+					<step id="" name="test.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="test.txt"/>
+							<param dst="c:\testing\data\pluginbiocontrolapitest\test.txt"/>
+							<param component-path="bcmessaging\pluginbiocontrolapitest" />
 						</params>
 					</step>
 					<step id="" name="PluginBioControlAPITest.rsc on C (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
@@ -114,28 +123,10 @@
 						<params>
 							<param type="data"/>
 							<param src="PluginBioControlAPITest.rsc"/>
-							<param dst="c:\testframework\PluginBioControlAPITest.rsc"/>
+							<param dst="c:\resource\PluginBioControlAPITest.rsc"/>
 							<param component-path="bcmessaging\testframework" />
 						</params>
 					</step>
-					<step id="" name="PluginBioControlAPITest.rsc on Z (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="pluginbiocontrolapitest.rsc"/>
-							<param dst="z:\resource\pluginbiocontrolapitest.rsc"/>
-							<param component-path="bcmessaging\resource" />
-						</params>
-					</step>
-					<step id="" name="PluginBioControlAPITest.r01 on Z (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="pluginbiocontrolapitest.r01"/>
-							<param dst="z:\resource\pluginbiocontrolapitest.r01"/>
-							<param component-path="bcmessaging\resource" />
-						</params>
-					</step>  
 					<step id="" name="PluginBioControlAPITest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
 						<command>execute</command>
 						<params>
@@ -162,9 +153,8 @@
         <file>bcmessaging/winscw_udeb/PluginBioControlAPITest.dll</file>
         <file>bcmessaging/testframework/general/tcTestUIBioCombiner.cfg</file>
         <file>bcmessaging/testframework/general/ui_PluginBioControlAPITest.cfg</file>
-        <file>bcmessaging/testframework/general/test.txt</file>
+        <file>bcmessaging/pluginbiocontrolapitest/general/test.txt</file>
         <file>bcmessaging/testframework/general/PluginBioControlAPITest.rsc</file>
         <file>bcmessaging/resource/general/pluginbiocontrolapitest.rsc</file>
-        <file>bcmessaging/resource/general/pluginbiocontrolapitest.r01</file>
 	</files>
 </test>
\ No newline at end of file
diff -r 3effbd6728d4 -r 84fc7d5ec18f common/tools/ats/bctest/messagingmw/sendui/sendui.pl
--- a/common/tools/ats/bctest/messagingmw/sendui/sendui.pl	Fri Oct 09 17:01:52 2009 +0100
+++ b/common/tools/ats/bctest/messagingmw/sendui/sendui.pl	Fri Oct 09 17:03:29 2009 +0100
@@ -12,7 +12,7 @@
 # Brendan Donegan <brendand@symbian.org>
 #
 # Description:
-# Script to build ATS test drop for BC Profiles Engine tests
+# Script to build ATS test drop for BC Send UI tests
 
 
 use strict;
@@ -20,15 +20,17 @@
 use File::Path;
 
 unlink "sendui.zip";
-##rmtree "temp";
+rmtree "temp";
 mkpath "temp/bcsendui/general/testframework";
+mkpath "temp/bcsendui/general/senduiapitest";
 mkpath "temp/bcsendui/winscw_udeb";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("sendui.xml",	"temp/test.xml");
 
-copy($epoc . "release/winscw/udeb/senduiapitest.dll",                   "temp/bcsendui/winscw_udeb/senduiapitest.dll");
-copy($epoc . "winscw/c/testframework/testframework_sendui.ini",         "temp/bcsendui/general/testframework/testframework_sendui.ini");
-copy($epoc . "winscw/c/testframework/ui_senduiapitest.cfg",             "temp/bcsendui/general/testframework/ui_senduiapitest.cfg");
+copy($epoc . "release/winscw/udeb/senduiapitest.dll",                   "temp/bcsendui/winscw_udeb/senduiapitest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_sendui.ini",         "temp/bcsendui/general/testframework/testframework_sendui.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/ui_senduiapitest.cfg",             "temp/bcsendui/general/testframework/ui_senduiapitest.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/data/testdata/senduiapitest/attachment.txt",		"temp/bcsendui/general/senduiapitest/attachment.txt") or die "failed : $!";
 
 system("7z a -tzip sendui.zip ./temp/*");
\ No newline at end of file
diff -r 3effbd6728d4 -r 84fc7d5ec18f common/tools/ats/bctest/messagingmw/sendui/sendui.xml
--- a/common/tools/ats/bctest/messagingmw/sendui/sendui.xml	Fri Oct 09 17:01:52 2009 +0100
+++ b/common/tools/ats/bctest/messagingmw/sendui/sendui.xml	Fri Oct 09 17:03:29 2009 +0100
@@ -49,7 +49,16 @@
 							<param dst="c:\testframework\ui_senduiapitest.cfg"/>
 							<param component-path="bcsendui" />
 						</params>
-					</step>  
+					</step>
+					<step id="" name="attachment.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="senduiapitest\attachment.txt"/>
+							<param dst="c:\data\testdata\senduiapitest\attachment.txt"/>
+							<param component-path="bcsendui" />
+						</params>
+					</step> 					
 					<step id="" name="senduiapitest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
 						<command>execute</command>
 						<params>
@@ -73,5 +82,6 @@
 		<file>bcsendui/winscw_udeb/senduiapitest.dll</file>
         <file>bcsendui/general/testframework/testframework_sendui.ini</file>
         <file>bcsendui/general/testframework/ui_senduiapitest.cfg</file>
+		<file>bcsendui/general/senduiapitest/attachment.txt</file>
 	</files>
 </test>
\ No newline at end of file
diff -r 3effbd6728d4 -r 84fc7d5ec18f common/tools/ats/bctest/multimedia/multimediatest.xml
--- a/common/tools/ats/bctest/multimedia/multimediatest.xml	Fri Oct 09 17:01:52 2009 +0100
+++ b/common/tools/ats/bctest/multimedia/multimediatest.xml	Fri Oct 09 17:03:29 2009 +0100
@@ -62,15 +62,6 @@
 							<param component-path="multimediatest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_multimedia.ini"/>
-							<param dst="c:\multimedia\t_multimedia.ini"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
 					<step id="" name="Test Step 2 (location)" harness="GENERIC" enabled="true" passrate="100">
 						<command>install</command>
 						<params>
@@ -102,7 +93,7 @@
 						<command>execute</command>
 						<params>
 							<param file="testexecute.exe"/>
-							<param parameters="\multimedia\mm-ecm-publicapi.script -tcs \multimedia\t_multimedia.tcs"/>
+							<param parameters="\multimedia\mm-ecm-publicapi.script"/>
 							<param result-file="c:\logs\testexecute\mm-ecm-publicapi.htm"/>
 							<param parser="TEFTestResultParser"/>
 							<param timeout="1000"/>
@@ -125,15 +116,6 @@
 						<command>install</command>
 						<params>
 							<param type="data"/>
-							<param src="multimedia/t_multimedia.tcs"/>
-							<param dst="c:\multimedia\t_multimedia.tcs"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
 							<param src="multimedia/t_multimedia.ini"/>
 							<param dst="c:\multimedia\t_multimedia.ini"/>
 							<param component-path="multimediatest" />
@@ -277,15 +259,6 @@
 						<command>install</command>
 						<params>
 							<param type="data"/>
-							<param src="multimedia/t_multimedia.tcs"/>
-							<param dst="c:\multimedia\t_multimedia.tcs"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
 							<param src="multimedia/t_multimedia.ini"/>
 							<param dst="c:\multimedia\t_multimedia.ini"/>
 							<param component-path="multimediatest" />
@@ -331,7 +304,7 @@
 						<command>execute</command>
 						<params>
 							<param file="testexecute.exe"/>
-							<param parameters="\multimedia\mm-mmf-aclnt-cnvrt-publicapi.script -tcs \multimedia\t_multimedia.tcs"/>
+							<param parameters="\multimedia\mm-mmf-aclnt-cnvrt-publicapi.script"/>
 							<param result-file="c:\logs\testexecute\mm-mmf-aclnt-cnvrt-publicapi.htm"/>
 							<param parser="TEFTestResultParser"/>
 							<param timeout="1000"/>
diff -r 3effbd6728d4 -r 84fc7d5ec18f common/tools/ats/bctest/syslibs/syslibssvs.pl
--- a/common/tools/ats/bctest/syslibs/syslibssvs.pl	Fri Oct 09 17:01:52 2009 +0100
+++ b/common/tools/ats/bctest/syslibs/syslibssvs.pl	Fri Oct 09 17:03:29 2009 +0100
@@ -29,10 +29,10 @@
 copy("syslibstest.xml",	"temp/test.xml");
 
 copy($epoc . "data/z/syslibs/t_syslibs.tcs",		"temp/syslibstest/general/syslibs/t_syslibs.tcs") or die "failed : $!";
-copy($epoc . "data/z/syslibs/winscw/t_syslibs.ini",	"temp/syslibstest/general/syslibs/t_syslibs.ini") or die "failed : $!";
+copy($epoc . "winscw/c/syslibs/winscw/t_syslibs.ini",	"temp/syslibstest/general/syslibs/t_syslibs.ini") or die "failed : $!";
 
-copy($epoc . "data/z/ecom/syslib-ecom-publicapi.script",	"temp/syslibstest/general/ecom/syslib-ecom-publicapi.script") or die "failed : $!";
-copy($epoc . "data/z/ecom/syslib-ecom-publicapi.ini",		"temp/syslibstest/general/ecom/syslib-ecom-publicapi.ini") or die "failed : $!";
+copy($epoc . "winscw/c/ecom/syslib-ecom-publicapi.script",	"temp/syslibstest/general/ecom/syslib-ecom-publicapi.script") or die "failed : $!";
+copy($epoc . "winscw/c/ecom/syslib-ecom-publicapi.ini",		"temp/syslibstest/general/ecom/syslib-ecom-publicapi.ini") or die "failed : $!";
 copy($epoc . "data/z/ecom/testproduct_plugin.rsc",			"temp/syslibstest/general/ecom/testproduct_plugin.rsc") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/testproduct_plugin.dll",	"temp/syslibstest/general/ecom/testproduct_plugin.dll") or die "failed : $!";
 
diff -r 3effbd6728d4 -r 84fc7d5ec18f sf-package/symbian3_props.ant.xml
--- a/sf-package/symbian3_props.ant.xml	Fri Oct 09 17:01:52 2009 +0100
+++ b/sf-package/symbian3_props.ant.xml	Fri Oct 09 17:03:29 2009 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
 <project name="SYMBIAN3-PROPS">
-  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.a"/>
+  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.a_alpha_FCL.120"/>
 </project>