diff -r 4e2dcfb86393 -r f2ae537e6340 common/tools/ats/bctest/package_definition.xml
--- a/common/tools/ats/bctest/package_definition.xml	Tue Sep 22 16:09:37 2009 +0100
+++ b/common/tools/ats/bctest/package_definition.xml	Wed Sep 23 14:58:40 2009 +0100
@@ -1,81 +1,136 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition name="Foundation" schema="2.0.1">
- <systemModel>
-  <layer name="bc" long-name="Binary Compatability" levels="generic specific">
-   <block long-name="Dynamic BC Tests" level="specific" name="dynamicbctest" levels="fts">
-    <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"/>
-      </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>
-	
-    <component id="favouritesbctest" name="Browser Favourites BC Test">
-      <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/FavouritesBCTest/group"/>
-    </component>
-    <component id="downloadmgrbctest" name="Download Manager BC Test">
-      <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/DownloadMgrBCTest/group"/>
-    </component>	  
-    <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>
-    <component id="mmsclientmtm" name="Messaging MMS Client MTM BC Test">
-      <unit bldFile="sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/>
-    </component>
-    <component id="pluginbio" name="Messaging Plugin BIO BC Test">
-      <unit bldFile="sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/>
-    </component>
-    <component id="drmcaf" name="DRM CAF BC Test">
-      <unit bldFile="sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/>
-    </component>
-    <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>
-    <component id="pbkdatamgmt" name="Phonebook Data Management BC Test">
-      <unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/>
-    </component>
-    <component id="pbkfetchui" name="Phonebook Fetch UI BC Test">
-      <unit bldFile="sf/app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/>
-    </component>
-    <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>
-	
-    <component id="basesvs" name="SVS Base API Tests" class="test">
-      <unit bldFile="sf/os/kernelhwsrv/baseapitest/basesvs/group"/>
-    </component>
-    <component id="graphicssvs" name="SVS Graphics API Tests" class="test">
-      <unit bldFile="sf/os/graphics/graphicsapitest/graphicssvs/group"/>
-    </component>
-	  
-	<collection name="graphicssvs" long-name="SVS Graphics API Tests">
-	</collection>
-	  
-    </block>
-  </layer>
- </systemModel>
+	<systemModel>
+		<layer name="bc" long-name="Binary Compatability" levels="generic specific">
+			<block long-name="Dynamic BC Tests" level="specific" name="dynamicbctest" levels="fts">
+				<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"/>
+					</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>
+				
+				<component id="favouritesbctest" name="Browser Favourites BC Test">
+				  <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/FavouritesBCTest/group"/>
+				</component>
+				<component id="downloadmgrbctest" name="Download Manager BC Test">
+				  <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/DownloadMgrBCTest/group"/>
+				</component>	  
+				<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>
+				<component id="mmsclientmtm" name="Messaging MMS Client MTM BC Test">
+				  <unit bldFile="sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/>
+				</component>
+				<component id="pluginbio" name="Messaging Plugin BIO BC Test">
+				  <unit bldFile="sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/>
+				</component>
+				<component id="drmcaf" name="DRM CAF BC Test">
+				  <unit bldFile="sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/>
+				</component>
+				<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>
+				<component id="pbkdatamgmt" name="Phonebook Data Management BC Test">
+				  <unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/>
+				</component>
+				<component id="pbkfetchui" name="Phonebook Fetch UI BC Test">
+				  <unit bldFile="sf/app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/>
+				</component>
+				<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>
+				
+				<component id="basesvs" name="SVS Base API Tests" class="test">
+				  <unit bldFile="sf/os/kernelhwsrv/baseapitest/basesvs/group"/>
+				</component>
+				<component id="graphicssvs" name="SVS Graphics API Tests" class="test">
+				  <unit bldFile="sf/os/graphics/graphicsapitest/graphicssvs/group"/>
+				</component>
+				  
+				<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"/>
+				  </component>
+				  <component id="ecamplugin" name="ECam Test Plugin" class="plugin">
+					<unit bldFile="sf/os/mm/mmplugins/cameraplugins/group"/>
+				  </component>
+				  <component id="testfwsrv" name="Multimedia Test Framework Server">
+					<unit bldFile="sf/os/mm/mmtestenv/mmtestfw/group"/>
+				  </component>
+				  <component id="ts_tmiditstcntrl" name="MIDI Test Controller">
+					<unit bldFile="sf/mw/mmmw/mmfwtest/mmfunittest/midiclnt/miditestcntrl/group"/>
+				  </component>
+				  <!-- Commented out these because they need to be built beforehand for now
+				  <component id="xvidpu" name="XVid PU">
+					<unit bldFile="xvid\xvidpu\group"/>
+				  </component>
+				  <component id="xvidhwdevice" name="XVid Hardware Device">
+					<unit bldFile="xvid\xvidhwdevice\group"/>
+				  </component>
+				  -->
+				</collection>
+				
+				<collection name="systemswsis" long-name="50_systemsw.sis">
+				  <component id="featurediscovery" name="Feature Discovery API">
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/>
+				  </component>
+				  <component id="finditem" name="Find Item API">
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/>
+				  </component>
+				  <component id="light" name="Light API">
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/>
+				  </component>
+				  <component id="phoneparser" name="Phone Parser API">
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/>
+				  </component>
+				  <component id="platformenv" name="Platform Environment API">
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/>
+				  </component>
+				  <component id="powerstate" name="HW Resource Management Power State API">
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/>
+				  </component>
+				  <component id="sysutil" name="System Utilities API">
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/>
+				  </component>
+				  <component id="textresolver" name="Text Resolver API">
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/>
+				  </component>
+				  <component id="vibra" name="Vibra API">
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/>
+				  </component>
+				  <component id="platformvertest" name="Platform Version Test">
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/>
+				  </component>
+				  <component id="accmonapibctests" name="Accessory Monitoring API BC Test">
+					<unit bldFile="sf/os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/>
+				  </component>
+				</collection>
+			</block>
+		</layer>
+	</systemModel>
 </SystemDefinition>
\ No newline at end of file