--- a/common/tools/ats/bctest/package_definition.xml	Wed Oct 14 14:44:10 2009 +0100
+++ b/common/tools/ats/bctest/package_definition.xml	Thu Oct 15 10:03:51 2009 +0100
@@ -3,20 +3,21 @@
 <!ENTITY codeline.oss.fcl						"//v800008/builds01/mercurial_development/oss/FCL" >
 <!ENTITY codeline.sfl.fcl						"//v800008/builds01/mercurial_development/sfl/FCL" >
 <!ENTITY codeline.sfl.mcl						"//v800008/builds01/Mercurial_master_prod/sfl/MCL" >
-<!ENTITY param.updatebranch						"RCL_1" >
+<!ENTITY param.updatebranch						"-r RCL_1" >
 <!ENTITY cmd.clone								"metacmd.py mcclone" >
 <!ENTITY cmd.copy								"metacmd.py mccopy" >
 <!ENTITY cmd.makedirs							"metacmd.py mcmakedirs" >
 <!ENTITY cmd.perl								"perl" >
 <!ENTITY cmd.sisbld								"makesis" >
 <!ENTITY cmd.unzip								"7z -y x" >
-<!ENTITY cmd.update								"hg update &param.updatebranch;" >
-<!ENTITY cmd.wget								"wget" >
+<!ENTITY cmd.update								"hg update -C" >
+<!ENTITY cmd.wget								"wget -N" >
 <!ENTITY dir.50_asp_connection					"sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/sis" >
 <!ENTITY dir.50_asp_hostconn					"sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/sis" >
 <!ENTITY dir.50_asp_newsoapclasses				"sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/sis" >
 <!ENTITY dir.50_Browser_DownloadMgr				"sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/DownloadMgrBCTest/sis" >
 <!ENTITY dir.50_Browser_Favourites				"sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/FavouritesBCTest/sis" >
+<!ENTITY dir.50_Loc_Blid						"sf/mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_Api" >
 <!ENTITY dir.50_loc_landmarks					"sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_api/sis" >
 <!ENTITY dir.50_loc_LmkDBMgmt					"sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_database_management_api/sis" >
 <!ENTITY dir.50_loc_LmkSearch					"sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_search_api/sis" >
@@ -153,165 +154,187 @@
 				<command cmd="&cmd.makedirs;	sf/os" />
 				<command cmd="&cmd.makedirs;	sftools/ana" />
 				<command cmd="&cmd.clone;		&codeline.oss.fcl;/interim/fbf/configs/default	interim/fbf/configs/default" />
-				<command cmd="&cmd.update;"		dir="interim/fbf/configs/default" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="interim/fbf/configs/default" />
 				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/app/contacts				sf/app/contacts" />
-				<command cmd="&cmd.update;"		dir="sf/app/contacts" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/app/contacts" />
 				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/app/messaging				sf/app/messaging" />
-				<command cmd="&cmd.update;"		dir="sf/app/messaging" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/app/messaging" />
+				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/app/location				sf/app/location" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/app/location" />
+				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/mw/appinstall				sf/mw/appinstall" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/appinstall" />
 				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/mw/appsupport				sf/mw/appsupport" />
-				<command cmd="&cmd.update;"		dir="sf/mw/appsupport" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/appsupport" />
+				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/mw/classicui				sf/mw/classicui" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/classicui" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/mw/drm					sf/mw/drm" />
-				<command cmd="&cmd.update;"		dir="sf/mw/drm" />
-				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/mw/locationsrv			sf/mw/locationsrv" />
-				<command cmd="&cmd.update;"		dir="sf/mw/locationsrv" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/drm" />
+				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/mw/locationsrv			sf/mw/locationsrv" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/locationsrv" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/mw/messagingmw			sf/mw/messagingmw" />
-				<command cmd="&cmd.update;"		dir="sf/mw/messagingmw" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/messagingmw" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/mw/mmmw					sf/mw/mmmw" />
-				<command cmd="&cmd.update;"		dir="sf/mw/mmmw" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/mmmw" />
 				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/mw/websrv					sf/mw/websrv" />
-				<command cmd="&cmd.update;"		dir="sf/mw/websrv" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/mw/websrv" />
 				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sf/os/devicesrv				sf/os/devicesrv" />
-				<command cmd="&cmd.update;"		dir="sf/os/devicesrv" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/os/devicesrv" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/os/graphics				sf/os/graphics" />
-				<command cmd="&cmd.update;"		dir="sf/os/graphics" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/os/graphics" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/os/kernelhwsrv			sf/os/kernelhwsrv" />
-				<command cmd="&cmd.update;"		dir="sf/os/kernelhwsrv" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/os/kernelhwsrv" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/os/mm						sf/os/mm" />
-				<command cmd="&cmd.update;"		dir="sf/os/mm" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/os/mm" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/os/ossrv					sf/os/ossrv" />
-				<command cmd="&cmd.update;"		dir="sf/os/ossrv" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/os/ossrv" />
 				<command cmd="&cmd.clone;		&codeline.sfl.mcl;/sf/os/shortlinksrv			sf/os/shortlinksrv" />
-				<command cmd="&cmd.update;"		dir="sf/os/shortlinksrv" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sf/os/shortlinksrv" />
 				<command cmd="&cmd.clone;		&codeline.sfl.fcl;/sftools/ana/compatanamdw		sftools/ana/compatanamdw" />
-				<command cmd="&cmd.update;"		dir="sftools/ana/compatanamdw" />
+				<command cmd="&cmd.update;		&param.updatebranch;"							dir="sftools/ana/compatanamdw" />
 				<command cmd="&cmd.wget;		http://developer.symbian.org/wiki/images/e/e7/Xvid.zip" />
 				<command cmd="&cmd.unzip;		xvid.zip" />
 				<command cmd="&cmd.perl;		sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/group/SetEnv.pl" />
 			</meta>
 		</layer>
 		<layer name="bld_production" long-name="Binary Compatability Production code build" levels="generic specific">
-			<collection name="aspconnectionsis" long-name="50_asp_connection.sis">
-				<component id="aspconnection" name="ASP Connection Test">
-					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/>
+			<collection name="multimediasvs" long-name="SVS Multimedia API Tests">
+				<component id="mmtestenv" name="Multimedia Test Framework Server">
+					<unit bldFile="sf/os/mm/mmtestenv/mmtestfw/group" />
 				</component>
 			</collection>
-			<collection name="hostconnsis" long-name="50_asp_hostconn.sis">
-				<component id="hostconn" name="Hostlet Connection Test">
-					<unit bldFile="sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/>
-				</component>
-			</collection>
-			<collection name="newsoapclassessis" long-name="50_asp_newsoapclasses.sis">
-				<component id="newsoapclasses" name="New SOAP Classes Test">
-					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group"/>
-				</component>
-			</collection>
-			<collection name="favouritesbctestsis" long-name="50_Browser_Favourites.SIS">
-				<component id="favouritesbctest" name="Browser Favourites BC Test">
-					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/FavouritesBCTest/group"/>
+			<collection name="appinstall" long-name="Application Install Middleware">
+				<component id="appinstall_pub" name="Application Install Middleware Puplic">
+					<unit bldFile="sf/mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/BC/StartupListManagementAPI/SelfSignedStartupApp/group" />
+					<unit bldFile="sf/mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/BC/StartupListManagementAPI/StartupApp/group" />
 				</component>
 			</collection>
-			<collection name="downloadmgrbctestsis" long-name="50_Browser_DownloadMgr.SIS">
-				<component id="downloadmgrbctest" name="Download Manager BC Test">
-					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/DownloadMgrBCTest/group"/>
-				</component>	
-			</collection>
-
-			<component id="lmksearch" name="Landmark Search Test">
-				<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_search_api/group"/>
-			</component>
-			<component id="lmkdbmgmt" name="Landmark Database Management Test">
-				<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_database_management_api/group"/>
-			</component>
-			<component id="landmarks" name="Landmarks API Test">
-				<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_api/group"/>
-			</component>
-
-			<collection name="mmsclientmtmsis" long-name="50_Messaging_MMSClientMTM.SIS">
-				<component id="mmsclientmtm" name="Messaging MMS Client MTM BC Test">
-					<unit bldFile="sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/>
+			<collection name="appsupport" long-name="Application Support Middleware">
+				<component id="appsupport_pub" name="Application Support Middleware Puplic">
+					<unit bldFile="sf/mw/appsupport/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group" />
+					<unit bldFile="sf/mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group" />
 				</component>
 			</collection>
-			<collection name="senduiapisis" long-name="50_msg_sendui.sis">
-				<component id="sendui" name="Messaging Send UI API BC Test">
-					<unit bldFile="sf/mw/messagingmw/msgfw_pub/send_ui_api/tsrc/bc/group"/>
+			<collection name="drm" long-name="DRM Middleware">
+				<component id="drm_pub" name="DRM Middleware Public">
+					<unit bldFile="sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group" />
+				</component>
+			</collection>
+			<collection name="locationsrv" long-name="Location Server Middleware">
+				<component id="locsrv_pub" name="Location Server Middleware Public">
+					<unit bldFile="sf/mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_Api/group" />
+				</component>
+			</collection>
+			<collection name="messagingmw" long-name="Messaging Middleware">
+				<component id="msgfw_pub" name="Messaging Middleware Public">
+					<unit bldFile="sf/mw/messagingmw/msgfw_pub/send_ui_api/tsrc/bc/group" />
 				</component>
 			</collection>
-			<collection name="pluginbiosis" long-name="50_Messaging_PluginBio.sis">
-				<component id="pluginbio" name="Messaging Plugin BIO BC Test">
-					<unit bldFile="sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/>
+			<collection name="websrv" long-name="Web Services Middleware">
+				<component id="websrv_pub" name="Web Services Middleware Public">
+					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group" />
+					<unit bldFile="sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group" />
+					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group" />
+					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_description_api/tsrc/bc/senservdesc/group" />
+					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/group" />
+					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutils/group" />
 				</component>
 			</collection>
-
-			<component id="drmcaf" name="DRM CAF BC Test">
-				<unit bldFile="sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/>
-			</component>
-
-			<collection name="pbkdataaddeditsis" long-name="50_PIM_PbkDataAddEdit.SIS">
-				<component id="pbkdataaddedit" name="Phonebook Data Add Edit BC Test">
-					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/>
-				</component>
-			</collection>
-
-			<collection name="pbkdatamanagementsis" long-name="50_PIM_PbkDataMgmt.SIS">
-				<component id="pbkdatamgmt" name="Phonebook Data Management BC Test">
-					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/>
+			<collection name="contacts" long-name="Contacts Application">
+				<component id="contacts_pub" name="Contacts Application Public">
+					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group" />
+					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group" />
+					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group" />
+					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group" />
+					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group" />
+					<unit bldFile="sf/app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group" />
 				</component>
 			</collection>
-
-			<collection name="pbkfetchuisis" long-name="50_PIM_PbkFetchAPI.SIS">
-				<component id="pbkfetchui" name="Phonebook Fetch UI BC Test">
-					<unit bldFile="sf/app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/>
+			<collection name="location" long-name="Location Application">
+				<component id="loc_pub" name="Location Application Public">
+					<unit bldFile="sf/app/location/loc_pub/landmarks_ui_addedit_api/tsrc/bc/bcapplmkeditor/group" />
+					<unit bldFile="sf/app/location/loc_pub/landmarks_ui_selector_api/tsrc/bc/bcapplmkitemiddbcombiinfo/group" />
+					<unit bldFile="sf/app/location/loc_pub/landmarks_ui_selector_api/tsrc/bc/bcapplmkselector/group" />
+				</component>
+			</collection>
+			<collection name="messaging" long-name="Messaging Application">
+				<component id="msg_pub" name="Messaging Application Public">
+					<unit bldFile="sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group" />
+					<unit bldFile="sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group" />
 				</component>
 			</collection>
-
-			<component id="pbkuiutil" name="Phonebook UI Utils BC Test">
-				<unit bldFile="sf/app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group"/>
-			</component>
-			<component id="pbkvcard" name="Phonebook vCard Import Export BC Test">
-				<unit bldFile="sf/app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group"/>
-			</component>
-			<component id="pbkspeeddial" name="Phonebook Speed Dial BC Test">
-				<unit bldFile="sf/app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group"/>
-			</component>
-			<component id="proengwrap" name="Profiles Engine Wrapper Test">
-				<unit bldFile="sf/mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group"/>
-			</component>
-
-			<collection name="multimediasvs" long-name="SVS Multimedia API Tests">
-				<component id="testfwsrv" name="Multimedia Test Framework Server">
-					<unit bldFile="sf/os/mm/mmtestenv/mmtestfw/group"/>
-				</component>
-			</collection>
-
-			<collection name="proengwrapsis" long-name="50_SP_PROENG.SIS">
-				<component id="proeng" name="Profile Engine Wrapper">
-					<unit bldFile="sf/mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/bc/profilesenginewrapperapi/group"/>
+			<collection name="compatanamdw" long-name="Compatibilty Analysis">
+				<component id="apicompatanamdw" name="Compatibilty Analysis API Compatibility">
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/BrCtlBCTest/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/DownloadMgrBCTest/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/FavouritesBCTest/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_api/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_database_management_api/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_search_api/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LocationFW/LocAquisition/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/apps/mrt/apps/glib/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/apps/mrt/apps/ssl/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/multimedia/apps/BCAppContentManagement/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/networking/apps/ConnectionSettings/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/networking/apps/ConnectionSettingsUI/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/rtcct/apps/BCLogEngineTest/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/rtcct/apps/IsvTelephonyTest/group" />
+					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/systemsw/apps/cenrepnotifyhandler/group" />
 				</component>
 			</collection>
 		</layer>
 		<layer name="bld_test" long-name="Binary Compatability Test code build" levels="generic specific">
-			<collection name="basesvs" long-name="SVS Base API Tests">
-				<component id="basesvs" name="SVS Base API Tests" class="test">
-					<unit bldFile="sf/os/kernelhwsrv/baseapitest/basesvs/group"/>
+			<collection name="devicesrv" long-name="Device Services">
+				<component id="devicesrv_pub" name="Device Services Public">
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group" />
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group" />
+				</component>
+				<component id="resourcemgmt" name="Resource Management">
+					<unit bldFile="sf/os/devicesrv/resourcemgmt/tsrc/public/basic/group" />
 				</component>
 			</collection>
-
-			<collection name="graphicssvs" long-name="SVS Graphics API Tests">
-				<component id="graphicssvs" name="SVS Graphics API Tests" class="test">
-					<unit bldFile="sf/os/graphics/graphicsapitest/graphicssvs/group"/>
+			<collection name="graphics" long-name="Graphics">
+				<component id="graphicsapitest" name="SVS Graphics API Tests">
+					<unit bldFile="sf/os/graphics/graphicsapitest/graphicssvs/group" />
 				</component>
 			</collection>
-
-			<!-- OS Services SVS -->
-			<collection name="systemlibrariessvs" long-name="SVS System Libraries API Tests">
-				<component id="syslibssvs" name="SysLibs SVS Suite" class="test">
-					<unit bldFile="sf/os/ossrv/syslibsapitest/syslibssvs/group"/>
+			<collection name="kernelhwsrv" long-name="Kernal Hardware Services">
+				<component id="baseapitest" name="SVS Base API Tests">
+					<unit bldFile="sf/os/kernelhwsrv/baseapitest/basesvs/group" />
+				</component>
+			</collection>
+			<collection name="mm" long-name="Multimedia">
+				<component id="mmapitest" name="Multimedia SVS Suite">
+					<unit bldFile="sf/os/mm/mmapitest/mmsvs/suite/group" />
+				</component>
+			</collection>
+			<collection name="ossrv" long-name="OS Services">
+				<component id="syslibsapitest" name="SysLibs SVS Suite">
+					<unit bldFile="sf/os/ossrv/syslibsapitest/syslibssvs/group" />
 				</component>
 			</collection>
-
-			<collection name="multimediasvs" long-name="SVS Multimedia API Tests">
-				<component id="mmsvs" name="Multimedia SVS Suite" class="test">
-					<unit bldFile="sf/os/mm/mmapitest/mmsvs/suite/group"/>
+			<collection name="shortlinksrv" long-name="Short Link Services">
+				<component id="bluetoothapitest" name="SVS Bluetooth API Tests">
+					<unit bldFile="sf/os/shortlinksrv/bluetoothapitest/bluetoothsvs/group" />
+				</component>
+			</collection>
+			<collection name="appsupport" long-name="Application Support Middleware">
+				<component id="appsupport_pub" name="Application Support Middleware Puplic">
+					<unit bldFile="sf/mw/appsupport/appsupport_pub/network_status_api/tsrc/bc/networkstatus/group" />
+				</component>
+			</collection>
+			<collection name="websrv" long-name="Web Services Middleware">
+				<component id="websrv_pub" name="Web Services Middleware Public">
+					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutils/group" />
+					<unit bldFile="sf/mw/websrv/websrv_pub/xml_fragment_api/tsrc/senfragmentTester/group" />
 				</component>
 			</collection>
 		</layer>