# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1266436306 0
# Node ID d7aa110911c4f1da92a8e2d39478dba6727f07d0
# Parent  3142324011cfe060023540cbef7b910ad1991952
Add "test" filter to all xxx_test filters

diff -r 3142324011cf -r d7aa110911c4 symbian3/app/camera/package_definition.xml
--- a/symbian3/app/camera/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/camera/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -86,7 +86,7 @@
           </component>
         </collection>
         <collection name="camera_info" long-name="Camera Apps Info">
-          <component name="camera_plat" filter="s60,api_test" long-name="Camera Apps Platform Interfaces" class="api">
+          <component name="camera_plat" filter="s60,test,api_test" long-name="Camera Apps Platform Interfaces" class="api">
             <unit bldFile="/sf/app/camera/camera_plat/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/camera/package_definition_3.0.xml
--- a/symbian3/app/camera/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/camera/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -10,7 +10,7 @@
       </component>
     </collection>
     <collection id="camera_info" name="Camera Apps Info">
-      <component id="camera_plat" filter="s60,api_test" name="Camera Apps Platform Interfaces" class="api">
+      <component id="camera_plat" filter="s60,test,api_test" name="Camera Apps Platform Interfaces" class="api">
         <unit bldFile="camera_plat/group"/>
       </component>
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/commonemail/package_definition.xml
--- a/symbian3/app/commonemail/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/commonemail/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -102,7 +102,7 @@
           <component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
             <unit bldFile="/sf/app/commonemail/emailservices/emailinstallationinitiator/group"/>
           </component>
-          <component name="emailservices_test" filter="s60,test" long-name="Email Services Tests">
+          <component name="emailservices_test" filter="s60,test,unit_test" long-name="Email Services Tests">
             <!--  can these be #included in their relevant components or a single test bld.inf? 
       		Can only have one unit -->
             <unit bldFile="/sf/app/commonemail/emailservices/emailframework/tsrc/group"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/commonemail/package_definition_3.0.xml
--- a/symbian3/app/commonemail/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/commonemail/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -26,7 +26,7 @@
       <component id="emailinstallationinitiator" filter="s60" name="Email Installation Initiator" introduced="^2">
         <unit bldFile="emailservices/emailinstallationinitiator/group"/>
       </component>
-      <component id="emailservices_test" filter="s60,test" name="Email Services Tests">
+      <component id="emailservices_test" filter="s60,test,unit_test" name="Email Services Tests">
       	<!--  can these be #included in their relevant components or a single test bld.inf? 
       		Can only have one unit -->
 		<unit bldFile="emailservices/emailframework/tsrc/group" />
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/contacts/package_definition.xml
--- a/symbian3/app/contacts/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/contacts/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -98,14 +98,14 @@
           <component name="phonebook2" filter="s60" long-name="Phone Book 2">
             <unit bldFile="/sf/app/contacts/phonebookui/phonebook2/group"/>
           </component>
-          <component name="phonebook2_test" filter="s60,test" long-name="Phonebook 2 Tests">
+          <component name="phonebook2_test" filter="s60,test,unit_test" long-name="Phonebook 2 Tests">
             <!-- can only have one unit, consider #including from phonebook2 or a common bld.inf  -->
             <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/tsrc/group"/>
             <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/saveascontactplugin/tsrc/group"/>
             <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/spbcontentprovider/tsrc/ut_contentprovider/group"/>
             <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/NamesListExtension/tsrc/group"/>
           </component>
-          <component name="phonebook2_other_test" filter="s60,test" long-name="Phonebook 2 Other Tests">
+          <component name="phonebook2_other_test" filter="s60,test,unit_test" long-name="Phonebook 2 Other Tests">
             <!-- can only have one unit. Why is this separate from the other tests? -->
             <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/UIControls/tsrc/group"/>
             <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/Presentation/tsrc/group"/>
@@ -130,12 +130,12 @@
           <component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
             <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/groupsql" mrp="/sf/app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
           </component>
-          <component name="virtualphonebook_test" long-name="Virtual Phonebook Tests" filter="s60,test">
+          <component name="virtualphonebook_test" long-name="Virtual Phonebook Tests" filter="s60,test,unit_test">
             <!-- can only have one bld.inf, #include the latter from the former, or #include both from virtualphonebook-->
             <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/tsrc/group"/>
             <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkCntModel/tsrc/group"/>
           </component>
-          <component name="vpbk_test" filter="s60,test" long-name="Virtual Phonebook Other Tests">
+          <component name="vpbk_test" filter="s60,test,unit_test" long-name="Virtual Phonebook Other Tests">
             <!-- can only have one bld.inf, #include from the first, or #include both from virtualphonebook
       		Why is this separate from virtualphonebook_test?-->
             <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkEng/tsrc/group"/>
@@ -156,7 +156,7 @@
           <component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
             <unit bldFile="/sf/app/contacts/ccservices/cmsservices/group"/>
           </component>
-          <component name="cms_test" filter="s60,test" long-name="Contact Method Selector Tests">
+          <component name="cms_test" filter="s60,test,unit_test" long-name="Contact Method Selector Tests">
             <!-- can only have one unit, #include from the first, or #include from cmsservices  -->
             <unit bldFile="/sf/app/contacts/ccservices/cmsservices/bpas/tsrc/group"/>
             <unit bldFile="/sf/app/contacts/ccservices/cmsservices/cmsengine/tsrc/group"/>
@@ -178,7 +178,7 @@
             <!-- should divide this bld.inf into the other components, or collapse them into a single component -->
             <unit bldFile="/sf/app/contacts/presencecache/group"/>
           </component>
-          <component name="presencecache_test" filter="s60,test" long-name="Presence Cache Tests">
+          <component name="presencecache_test" filter="s60,test,unit_test" long-name="Presence Cache Tests">
             <!-- can this be #included from presencecacheutils?  -->
             <unit bldFile="/sf/app/contacts/presencecache/presencecacheutils/tsrc/group"/>
           </component>
@@ -208,7 +208,7 @@
           <component name="contacts_plat" filter="s60" long-name="Contacts Apps Platform Interfaces" class="api">
             <unit bldFile="/sf/app/contacts/contacts_plat/group"/>
           </component>
-          <component name="contacts_plat_test" filter="s60,api_test" long-name="Contacts Apps Platform API Test">
+          <component name="contacts_plat_test" filter="s60,test,api_test" long-name="Contacts Apps Platform API Test">
             <unit bldFile="/sf/app/contacts/contacts_plat/cms_contactor_api/tsrc/group"/>
             <unit bldFile="/sf/app/contacts/contacts_plat/cca_launch_api/tsrc/group"/>
             <unit bldFile="/sf/app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/contacts/package_definition_3.0.xml
--- a/symbian3/app/contacts/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/contacts/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -22,14 +22,14 @@
       <component id="phonebook2" filter="s60" name="Phone Book 2">
         <unit bldFile="phonebookui/phonebook2/group"/>
       </component>
-      <component id="phonebook2_test" filter="s60,test" name="Phonebook 2 Tests">
+      <component id="phonebook2_test" filter="s60,test,unit_test" name="Phonebook 2 Tests">
        	<!-- can only have one unit, consider #including from phonebook2 or a common bld.inf  -->
           <unit bldFile="phonebookui/Phonebook2/tsrc/group" />
           <unit bldFile="phonebookui/Phonebook2/remotecontactlookup/contactactionservice/saveascontactplugin/tsrc/group" />
           <unit bldFile="phonebookui/Phonebook2/spbcontentprovider/tsrc/ut_contentprovider/group" />      
           <unit bldFile="phonebookui/Phonebook2/NamesListExtension/tsrc/group" />      
       </component>
-      <component id="phonebook2_other_test" filter="s60,test" name="Phonebook 2 Other Tests">
+      <component id="phonebook2_other_test" filter="s60,test,unit_test" name="Phonebook 2 Other Tests">
       	<!-- can only have one unit. Why is this separate from the other tests? -->
          <unit bldFile="phonebookui/Phonebook2/UIControls/tsrc/group" />
          <unit bldFile="phonebookui/Phonebook2/Presentation/tsrc/group" />
@@ -54,12 +54,12 @@
       <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
         <unit version="2" bldFile="phonebookengines/contactsmodel/groupsql" mrp="phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
       </component>
-      <component id="virtualphonebook_test" name="Virtual Phonebook Tests" filter="s60,test">
+      <component id="virtualphonebook_test" name="Virtual Phonebook Tests" filter="s60,test,unit_test">
       	<!-- can only have one bld.inf, #include the latter from the former, or #include both from virtualphonebook-->
           <unit bldFile="phonebookengines/VirtualPhonebook/tsrc/group" />
           <unit bldFile="phonebookengines/VirtualPhonebook/VPbkCntModel/tsrc/group" />
       </component>
-      <component id="vpbk_test" filter="s60,test" name="Virtual Phonebook Other Tests">
+      <component id="vpbk_test" filter="s60,test,unit_test" name="Virtual Phonebook Other Tests">
       	<!-- can only have one bld.inf, #include from the first, or #include both from virtualphonebook
       		Why is this separate from virtualphonebook_test?-->
         <unit bldFile="phonebookengines/VirtualPhonebook/VPbkEng/tsrc/group" />
@@ -80,7 +80,7 @@
       <component id="cmsservices" filter="s60" name="Contact Method Selector Services" introduced="^2">
         <unit bldFile="ccservices/cmsservices/group"/>
       </component>
-      <component id="cms_test" filter="s60,test" name="Contact Method Selector Tests">
+      <component id="cms_test" filter="s60,test,unit_test" name="Contact Method Selector Tests">
      	<!-- can only have one unit, #include from the first, or #include from cmsservices  -->
         <unit bldFile="ccservices/cmsservices/bpas/tsrc/group" />
         <unit bldFile="ccservices/cmsservices/cmsengine/tsrc/group" />
@@ -102,7 +102,7 @@
 		<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
         <unit bldFile="presencecache/group"/>
       </component>
-      <component id="presencecache_test"  filter="s60,test" name="Presence Cache Tests">
+      <component id="presencecache_test" filter="s60,test,unit_test" name="Presence Cache Tests">
       	<!-- can this be #included from presencecacheutils?  -->
         <unit bldFile="presencecache/presencecacheutils/tsrc/group" />
       </component>
@@ -132,7 +132,7 @@
       <component id="contacts_plat" filter="s60" name="Contacts Apps Platform Interfaces" class="api">
         <unit bldFile="contacts_plat/group"/>
       </component>
-     <component id="contacts_plat_test" filter="s60,api_test" name="Contacts Apps Platform API Test">
+     <component id="contacts_plat_test" filter="s60,test,api_test" name="Contacts Apps Platform API Test">
        <unit bldFile="contacts_plat/cms_contactor_api/tsrc/group" />
        <unit bldFile="contacts_plat/cca_launch_api/tsrc/group" />
        <unit bldFile="contacts_plat/cca_view_plugin_api/tsrc/group" />
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/homescreen/package_definition.xml
--- a/symbian3/app/homescreen/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/homescreen/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -112,7 +112,7 @@
             <!-- can the loc file be moved to another comopnent and this one removed? -->
             <unit bldFile="/sf/app/homescreen/idlehomescreen/group"/>
           </component>
-          <component name="homescreen_test" filter="s60,test" purpose="development" long-name="Home Screen Apps Test">
+          <component name="homescreen_test" filter="s60,test,unit_test" purpose="development" long-name="Home Screen Apps Test">
             <unit bldFile="/sf/app/homescreen/idlehomescreen/widgetmanager/tsrc/wmunittest/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/homescreen/package_definition_3.0.xml
--- a/symbian3/app/homescreen/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/homescreen/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -40,7 +40,7 @@
       	<!-- can the loc file be moved to another comopnent and this one removed? -->
         <unit bldFile="idlehomescreen/group"/>
       </component>
-      <component id="homescreen_test" filter="s60,test" purpose="development" name="Home Screen Apps Test">
+      <component id="homescreen_test" filter="s60,test,unit_test" purpose="development" name="Home Screen Apps Test">
         <unit bldFile="idlehomescreen/widgetmanager/tsrc/wmunittest/group"/>
       </component>      
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/imgeditor/package_definition.xml
--- a/symbian3/app/imgeditor/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/imgeditor/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -164,7 +164,7 @@
             <!-- should distribute this to the other components -->
             <unit bldFile="/sf/app/imgeditor/imageeditorengine/group"/>
           </component>
-          <component name="imgeditor_api_tests" filter="s60,api_test" long-name="Image Editor Engine API Tests" purpose="development">
+          <component name="imgeditor_api_tests" filter="s60,test,api_test" long-name="Image Editor Engine API Tests" purpose="development">
             <unit bldFile="/sf/app/imgeditor/imageeditorengine/tsrc/public/basic/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/imgeditor/package_definition_3.0.xml
--- a/symbian3/app/imgeditor/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/imgeditor/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -88,7 +88,7 @@
       	<!-- should distribute this to the other components -->
         <unit bldFile="imageeditorengine/group"/>
       </component>
-		<component id="imgeditor_api_tests" filter="s60,api_test" name="Image Editor Engine API Tests" purpose="development">
+		<component id="imgeditor_api_tests" filter="s60,test,api_test" name="Image Editor Engine API Tests" purpose="development">
 			<unit bldFile="imageeditorengine/tsrc/public/basic/group"/>
 		</component>            
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/mmsharinguis/package_definition.xml
--- a/symbian3/app/mmsharinguis/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/mmsharinguis/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -128,7 +128,7 @@
           <component name="mmsharinguis_plat" filter="s60" long-name="Multimedia Sharing UIs Platform Interfaces" class="api">
             <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/group"/>
           </component>
-          <component name="mmsharinguis_plat" filter="s60,api_test" long-name="Multimedia Sharing UIs API Tests" class="api">
+          <component name="mmsharinguis_plat" filter="s60,test,api_test" long-name="Multimedia Sharing UIs API Tests" class="api">
             <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/mmsharinguis/package_definition_3.0.xml
--- a/symbian3/app/mmsharinguis/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/mmsharinguis/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -52,7 +52,7 @@
       <component id="mmsharinguis_plat" filter="s60" name="Multimedia Sharing UIs Platform Interfaces" class="api">
         <unit bldFile="mmsharinguis_plat/group"/>
       </component>
-      <component id="mmsharinguis_plat" filter="s60,api_test" name="Multimedia Sharing UIs API Tests" class="api">
+      <component id="mmsharinguis_plat" filter="s60,test,api_test" name="Multimedia Sharing UIs API Tests" class="api">
         <unit bldFile="mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/>
       </component>
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/musicplayer/package_definition.xml
--- a/symbian3/app/musicplayer/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/musicplayer/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -143,7 +143,7 @@
           <component name="musicplayer_plat" filter="s60" long-name="Music Player Apps Platform Interfaces" class="api">
             <unit bldFile="/sf/app/musicplayer/musicplayer_plat/group"/>
           </component>
-          <component name="musicplayer_test" filter="s60,pref_test,api_test" purpose="development" long-name="Music Player Apps Test">
+          <component name="musicplayer_test" filter="s60,test,pref_test,api_test" purpose="development" long-name="Music Player Apps Test">
             <unit bldFile="/sf/app/musicplayer/tsrc/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/musicplayer/package_definition_3.0.xml
--- a/symbian3/app/musicplayer/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/musicplayer/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -70,7 +70,7 @@
       <component id="musicplayer_plat" filter="s60" name="Music Player Apps Platform Interfaces" class="api">
         <unit bldFile="musicplayer_plat/group"/>
       </component>
-      <component id="musicplayer_test" filter="s60,pref_test,api_test" purpose="development" name="Music Player Apps Test">
+      <component id="musicplayer_test" filter="s60,test,pref_test,api_test" purpose="development" name="Music Player Apps Test">
 		<unit bldFile="tsrc/group"/>
       </component>
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/phone/package_definition.xml
--- a/symbian3/app/phone/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/phone/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -105,7 +105,7 @@
           <component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
             <unit bldFile="/sf/app/phone/phoneapp/phonemediatorcenter/group"/>
           </component>
-          <component name="phoneapp_api_test" filter="s60,api_test" long-name="Phone App API Tests">
+          <component name="phoneapp_api_test" filter="s60,test,api_test" long-name="Phone App API Tests">
             <unit bldFile="/sf/app/phone/phoneapp/phoneui/tsrc/public/basic/group"/>
           </component>
         </collection>
@@ -162,7 +162,7 @@
           <component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
             <unit bldFile="/sf/app/phone/phoneuis/telephonydevicemode/group"/>
           </component>
-          <component name="phoneuis_api_test" filter="s60,api_test" long-name="Phone UIs API Tests">
+          <component name="phoneuis_api_test" filter="s60,test,api_test" long-name="Phone UIs API Tests">
             <unit bldFile="/sf/app/phone/phoneuis/dialer/tsrc/public/basic/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/phone/package_definition_3.0.xml
--- a/symbian3/app/phone/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/phone/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -29,7 +29,7 @@
       <component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
         <unit bldFile="phoneapp/phonemediatorcenter/group"/>
       </component>
-      <component id="phoneapp_api_test" filter="s60,api_test" name="Phone App API Tests">
+      <component id="phoneapp_api_test" filter="s60,test,api_test" name="Phone App API Tests">
 		<unit bldFile="phoneapp/phoneui/tsrc/public/basic/group"/>
       </component>      
     </collection>
@@ -86,7 +86,7 @@
       <component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
         <unit bldFile="phoneuis/telephonydevicemode/group"/>
       </component>
-      <component id="phoneuis_api_test" filter="s60,api_test" name="Phone UIs API Tests">
+      <component id="phoneuis_api_test" filter="s60,test,api_test" name="Phone UIs API Tests">
         <unit bldFile="phoneuis/dialer/tsrc/public/basic/group"/>
       </component>
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/profile/package_definition.xml
--- a/symbian3/app/profile/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/profile/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -81,7 +81,7 @@
           <component name="profiles" filter="s60" long-name="Profiles">
             <unit bldFile="/sf/app/profile/profilesapplication/profiles/group"/>
           </component>
-          <component name="profilesapplication_test" filter="s60,api_test" purpose="development" long-name="Profiles Application Test">
+          <component name="profilesapplication_test" filter="s60,test,api_test" purpose="development" long-name="Profiles Application Test">
             <unit bldFile="/sf/app/profile/profilesapplication/tsrc/public/basic/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/profile/package_definition_3.0.xml
--- a/symbian3/app/profile/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/profile/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -5,7 +5,7 @@
       <component id="profiles" filter="s60" name="Profiles">
         <unit bldFile="profilesapplication/profiles/group"/>
       </component>
-      <component id="profilesapplication_test" filter="s60,api_test" purpose="development" name="Profiles Application Test">
+      <component id="profilesapplication_test" filter="s60,test,api_test" purpose="development" name="Profiles Application Test">
         <unit bldFile="profilesapplication/tsrc/public/basic/group"/>
       </component>
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/settingsuis/package_definition.xml
--- a/symbian3/app/settingsuis/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/settingsuis/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -107,7 +107,7 @@
           <component name="devmngt_pub" filter="s60" long-name="Settings UIs Public Interfaces" introduced="^1" class="api">
             <unit bldFile="/sf/app/settingsuis/devmngt_pub/group"/>
           </component>
-          <component name="settingsuis_test" filter="s60,test" purpose="development" long-name="Settings UIs Test" introduced="^1">
+          <component name="settingsuis_test" filter="s60,test,unit_test" purpose="development" long-name="Settings UIs Test" introduced="^1">
             <unit bldFile="/sf/app/settingsuis/devmngt_plat/services_db_api/tsrc/ServicesDbApiTest/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/settingsuis/package_definition_3.0.xml
--- a/symbian3/app/settingsuis/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/settingsuis/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -31,7 +31,7 @@
       <component id="devmngt_pub" filter="s60" class="api" name="Settings UIs Public Interfaces" introduced="^1">
         <unit bldFile="devmngt_pub/group"/>
       </component>
-      <component id="settingsuis_test" filter="s60,test" purpose="development" name="Settings UIs Test" introduced="^1">
+      <component id="settingsuis_test" filter="s60,test,unit_test" purpose="development" name="Settings UIs Test" introduced="^1">
           <unit bldFile="devmngt_plat/services_db_api/tsrc/ServicesDbApiTest/group" introduced="^1"/>
       </component>
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/speechsrv/package_definition.xml
--- a/symbian3/app/speechsrv/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/speechsrv/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -168,7 +168,7 @@
           </component>
         </collection>
         <collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui">
-          <component name="speechsrv_test" filter="s60,test" purpose="development" long-name="Speech Recognition UIs Test">
+          <component name="speechsrv_test" filter="s60,test,unit_test" purpose="development" long-name="Speech Recognition UIs Test">
             <unit bldFile="/sf/app/speechsrv/tsrc/group"/>
           </component>
           <component name="speechsrv_plat" filter="s60" long-name="Speech Recognition UIs Platform Interfaces" class="api">
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/speechsrv/package_definition_3.0.xml
--- a/symbian3/app/speechsrv/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/speechsrv/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -95,7 +95,7 @@
       </component>
     </collection>
     <collection id="speechsrv_info" name="Speech Recognition UIs Info" level="ui">
-      <component id="speechsrv_test" filter="s60,test" purpose="development" name="Speech Recognition UIs Test">
+      <component id="speechsrv_test" filter="s60,test,unit_test" purpose="development" name="Speech Recognition UIs Test">
         <unit bldFile="tsrc/group"/>
       </component>
       <component id="speechsrv_plat" filter="s60" name="Speech Recognition UIs Platform Interfaces" class="api">
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/videoeditor/package_definition.xml
--- a/symbian3/app/videoeditor/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/videoeditor/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -128,7 +128,7 @@
             <!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
             <unit bldFile="/sf/app/videoeditor/videoeditorengine/group"/>
           </component>
-          <component name="videoeditorengine_api" filter="s60,api_test" long-name="Video Editor Engine API Tests" purpose="development">
+          <component name="videoeditorengine_api" filter="s60,test,api_test" long-name="Video Editor Engine API Tests" purpose="development">
             <unit bldFile="/sf/app/videoeditor/videoeditorengine/tsrc/public/basic/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/videoeditor/package_definition_3.0.xml
--- a/symbian3/app/videoeditor/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/videoeditor/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -52,7 +52,7 @@
 		<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
         <unit bldFile="videoeditorengine/group"/>
       </component>
-		<component id="videoeditorengine_api" filter="s60,api_test" name="Video Editor Engine API Tests" purpose="development">
+		<component id="videoeditorengine_api" filter="s60,test,api_test" name="Video Editor Engine API Tests" purpose="development">
 			<unit bldFile="videoeditorengine/tsrc/public/basic/group"/>
 		</component>                    
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/videoplayer/package_definition.xml
--- a/symbian3/app/videoplayer/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/videoplayer/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -102,6 +102,13 @@
           <component name="videofeeds_server" long-name="Server" filter="s60" introduced="^3">
             <unit bldFile="/sf/app/videoplayer/videofeeds/server/group"/>
           </component>
+          <component name="videofeeds_server_tsrc" long-name="Video Feeds Server Tests" introduced="^3" filter="s60,test,unit_test">
+            <!--  can only have one unit. Can these be #included from videofeeds_server or a common bld.inf?-->
+            <unit bldFile="/sf/app/videoplayer/videofeeds/server/tsrc/IptvTestUtility/group"/>
+            <unit bldFile="/sf/app/videoplayer/videofeeds/server/tsrc/VCXProvisioningTest/group"/>
+            <unit bldFile="/sf/app/videoplayer/videofeeds/server/tsrc/VCXServiceManagementApiTest/group"/>
+            <unit bldFile="/sf/app/videoplayer/videofeeds/server/tsrc/VCXVodContentApiTest/group"/>
+          </component>
           <component name="livetvutils" long-name="LiveTV Utils" filter="s60" introduced="^3">
             <unit bldFile="/sf/app/videoplayer/videofeeds/livetvutils/group"/>
           </component>
@@ -132,21 +139,20 @@
           <component name="scheduleddlplugin" long-name="Scheduled download plugin" filter="s60" introduced="^3">
             <unit bldFile="/sf/app/videoplayer/videofeeds/scheduleddlplugin/group"/>
           </component>
-          <component name="videofeeds_tsrc" long-name="Video Feeds Tests" introduced="^3" filter="test">
+          <component name="videofeeds_tsrc" long-name="Video Feeds Tests" introduced="^3" filter="s60,test,unit_test">
             <!--  can only have one unit. Can thes be #included from any of the above or a common bld.inf?-->
             <unit bldFile="/sf/app/videoplayer/tsrc/VCXTestCommon/group"/>
             <unit bldFile="/sf/app/videoplayer/tsrc/VCXTestUtilModule/group"/>
-            <unit bldFile="/sf/app/videoplayer/videofeeds/server/tsrc/IptvTestUtility/group"/>
             <unit bldFile="/sf/app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
-            <unit bldFile="/sf/app/videoplayer/videofeeds/server/tsrc/VCXProvisioningTest/group"/>
-            <unit bldFile="/sf/app/videoplayer/videofeeds/server/tsrc/VCXServiceManagementApiTest/group"/>
-            <unit bldFile="/sf/app/videoplayer/videofeeds/server/tsrc/VCXVodContentApiTest/group"/>
           </component>
         </collection>
         <collection name="videocollection" long-name="Video Collection" level="apps">
           <component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
             <unit bldFile="/sf/app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
           </component>
+          <component name="mpxmyvideoscollection_test" filter="s60,test,unit_test" long-name="MPX My Videos Collection Tests" introduced="^3" purpose="development">
+            <unit bldFile="/sf/app/videoplayer/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/group"/>
+          </component>
           <component name="myvideosindicatorplugin" filter="s60" long-name="My Videos Indicator Plugin" introduced="^3" plugin="Y">
             <unit bldFile="/sf/app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
           </component>
@@ -156,12 +162,11 @@
           <component name="hgmyvideosplugin" filter="s60" long-name="Huriganes My VideosPlugin" introduced="^3" plugin="Y">
             <unit bldFile="/sf/app/videoplayer/videocollection/hgmyvideosplugin/group"/>
           </component>
-          <component name="mpxmyvideoscollection_tsrc" long-name="MPX My Videos Collection Tests" filter="s60,test" introduced="^3">
+          <component name="mpxmyvideoscollection_tsrc" long-name="MPX My Videos Collection Tests" filter="s60,test,unit_test" introduced="^3" purpose="development">
             <!--  can only have one unit. Can thes be #included from any of the above or a common bld.inf?-->
             <unit bldFile="/sf/app/videoplayer/tsrc/VCXTestCommon/group"/>
             <unit bldFile="/sf/app/videoplayer/tsrc/VCXTestUtilModule/group"/>
             <unit bldFile="/sf/app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/group"/>
           </component>
         </collection>
         <collection name="videoplayer_homescreenplugins" long-name="Videoplayer Homescreen Plugins" level="support">
@@ -224,8 +229,8 @@
           <component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
             <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackviews/group"/>
           </component>
-          <component name="videoplayer_tsrc" long-name="Video Player Tests" filter="s60,test" introduced="^3">
-            <!--  can only have one unit. Can thes be #included from any of the above. Why is a videoplayerapp test in here?-->
+          <component name="videoplayer_tsrc" long-name="Video Player Tests" filter="s60,test,unit_test" introduced="^3" purpose="development">
+            <!--  can only have one unit. Can these be #included from any of the above. Why is a videoplayerapp test in here?-->
             <unit bldFile="/sf/app/videoplayer/videoplayback/videohelix/tsrc/ut_videohelixtest/group"/>
             <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group"/>
             <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackviews/tsrc/ut_userinputhandlertest/group"/>
@@ -236,7 +241,7 @@
           <component name="videoplayer_plat" filter="s60" long-name="Video Player Apps Platform Interfaces" class="api">
             <unit bldFile="/sf/app/videoplayer/videoplayer_plat/group"/>
           </component>
-          <component name="videoplayer_api_test" filter="s60,apit_test" purpose="development" long-name="Video Player API Test">
+          <component name="videoplayer_api_test" filter="s60,test,api_test" purpose="development" long-name="Video Player API Test">
             <!--  can only have one unit, #include from a common bld.inf? -->
             <unit bldFile="/sf/app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/tsrc/group"/>
             <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videoplayer_startup_api/tsrc/group"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/videoplayer/package_definition_3.0.xml
--- a/symbian3/app/videoplayer/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/videoplayer/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -26,6 +26,13 @@
 		<component id="videofeeds_server" name="Server" filter="s60" introduced="^3">
 			<unit bldFile="videofeeds/server/group"/>
 		</component>
+		<component id="videofeeds_server_tsrc" name="Video Feeds Server Tests" introduced="^3" filter="s60,test,unit_test">
+      	<!--  can only have one unit. Can these be #included from videofeeds_server or a common bld.inf?-->
+         <unit bldFile="videofeeds/server/tsrc/IptvTestUtility/group"/>
+         <unit bldFile="videofeeds/server/tsrc/VCXProvisioningTest/group"/>
+         <unit bldFile="videofeeds/server/tsrc/VCXServiceManagementApiTest/group"/>
+         <unit bldFile="videofeeds/server/tsrc/VCXVodContentApiTest/group"/>
+       </component>
 		<component id="livetvutils" name="LiveTV Utils" filter="s60" introduced="^3">
 			<unit bldFile="videofeeds/livetvutils/group"/>
 		</component>
@@ -56,21 +63,20 @@
 	<component id="scheduleddlplugin" name="Scheduled download plugin" filter="s60" introduced="^3">
 		<unit bldFile="videofeeds/scheduleddlplugin/group"/>
 	</component>
-    <component id="videofeeds_tsrc" name="Video Feeds Tests" introduced="^3" filter="test">
+    <component id="videofeeds_tsrc" name="Video Feeds Tests" introduced="^3" filter="s60,test,unit_test">
       	<!--  can only have one unit. Can thes be #included from any of the above or a common bld.inf?-->
          <unit bldFile="tsrc/VCXTestCommon/group"/>
          <unit bldFile="tsrc/VCXTestUtilModule/group"/>
-         <unit bldFile="videofeeds/server/tsrc/IptvTestUtility/group"/>
          <unit bldFile="tsrc/VCXTestMyVideosCollectionClient/group"/>
-         <unit bldFile="videofeeds/server/tsrc/VCXProvisioningTest/group"/>
-         <unit bldFile="videofeeds/server/tsrc/VCXServiceManagementApiTest/group"/>
-         <unit bldFile="videofeeds/server/tsrc/VCXVodContentApiTest/group"/>
        </component>
     </collection>
     <collection id="videocollection" name="Video Collection" level="apps">
       <component id="mpxmyvideoscollection" filter="s60" name="MPX My Videos Collection" introduced="^3">
         <unit bldFile="videocollection/mpxmyvideoscollection/group"/>
       </component>
+      <component id="mpxmyvideoscollection_test" filter="s60,test,unit_test" name="MPX My Videos Collection Tests" introduced="^3" purpose="development">
+            <unit bldFile="videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/group"/>
+      </component>
       <component id="myvideosindicatorplugin" filter="s60" name="My Videos Indicator Plugin" introduced="^3" class="plugin">
         <unit bldFile="videocollection/myvideosindicatorplugin/group"/>
       </component>
@@ -80,12 +86,11 @@
       <component id="hgmyvideosplugin" filter="s60" name="Huriganes My VideosPlugin" introduced="^3" class="plugin">
         <unit bldFile="videocollection/hgmyvideosplugin/group"/>
       </component>
-      <component id="mpxmyvideoscollection_tsrc" name="MPX My Videos Collection Tests" filter="s60,test" introduced="^3">
+      <component id="mpxmyvideoscollection_tsrc" name="MPX My Videos Collection Tests" filter="s60,test,unit_test" introduced="^3" purpose="development">
       	<!--  can only have one unit. Can thes be #included from any of the above or a common bld.inf?-->
             <unit bldFile="tsrc/VCXTestCommon/group"/>
             <unit bldFile="tsrc/VCXTestUtilModule/group"/>
             <unit bldFile="tsrc/VCXTestMyVideosCollectionClient/group"/>
-            <unit bldFile="videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/group"/>
     </component>
     </collection>
     <collection id="videoplayer_homescreenplugins" name="Videoplayer Homescreen Plugins" level="support">
@@ -148,8 +153,8 @@
       <component id="videoplaybackviews" filter="s60" name="Video Playback Views" class="plugin" introduced="^3">
         <unit bldFile="videoplayback/videoplaybackviews/group"/>
       </component>
-      <component id="videoplayer_tsrc" name="Video Player Tests" filter="s60,test" introduced="^3">
-      	<!--  can only have one unit. Can thes be #included from any of the above. Why is a videoplayerapp test in here?-->
+      <component id="videoplayer_tsrc" name="Video Player Tests" filter="s60,test,unit_test" introduced="^3" purpose="development">
+      	<!--  can only have one unit. Can these be #included from any of the above. Why is a videoplayerapp test in here?-->
           <unit bldFile="videoplayback/videohelix/tsrc/ut_videohelixtest/group"/>
           <unit bldFile="videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group"/>
           <unit bldFile="videoplayback/videoplaybackviews/tsrc/ut_userinputhandlertest/group"/>
@@ -160,7 +165,7 @@
       <component id="videoplayer_plat" filter="s60" name="Video Player Apps Platform Interfaces" class="api">
         <unit bldFile="videoplayer_plat/group"/>
       </component>
-      <component id="videoplayer_api_test" filter="s60,apit_test" purpose="development" name="Video Player API Test">
+      <component id="videoplayer_api_test" filter="s60,test,api_test" purpose="development" name="Video Player API Test">
      		<!--  can only have one unit, #include from a common bld.inf? -->
 	      <unit bldFile="videoplayer_plat/video_player_file_details_dialog_api/tsrc/group"/>
 	      <unit bldFile="videoplayer_plat/videoplayer_startup_api/tsrc/group"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/videotelephony/package_definition.xml
--- a/symbian3/app/videotelephony/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/videotelephony/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -101,7 +101,7 @@
         <collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
           <!--  this collection is really a component, move down a directory -->
           <component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-            <unit bldFile="/sf/app/videotelephony/vtprotocolsstub/group" filter="sf"/>
+            <unit bldFile="/sf/app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
           </component>
         </collection>
         <collection name="videotelephony_info" long-name="VT Apps Info" level="ui">
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/videotelephony/package_definition_3.0.xml
--- a/symbian3/app/videotelephony/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/videotelephony/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -25,7 +25,7 @@
     <collection id="vtprotocolsstub" name="VT Protocols Stub" level="prot">
     	<!--  this collection is really a component, move down a directory -->
       <component id="videotelproto" filter="s60" name="Video Telephony Protocol">
-        <unit bldFile="vtprotocolsstub/group" filter="sf"/>
+        <unit bldFile="vtprotocolsstub/group" filter="sf_build"/>
       </component>
     </collection>
     <collection id="videotelephony_info" name="VT Apps Info" level="ui">
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/voicerec/package_definition.xml
--- a/symbian3/app/voicerec/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/voicerec/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -85,7 +85,7 @@
           </component>
         </collection>
         <collection name="voicerec_info" long-name="Voice Recorder Apps Info">
-          <component name="voicerec_api_test" filter="s60,api_test,pref_test" purpose="development" long-name="Voice Recorder Apps Test">
+          <component name="voicerec_api_test" filter="s60,test,api_test,pref_test" purpose="development" long-name="Voice Recorder Apps Test">
             <unit bldFile="/sf/app/voicerec/tsrc/group"/>
           </component>
           <component name="voicerec_plat" filter="s60" long-name="Voice Recorder Apps Platform Interfaces" class="api">
diff -r 3142324011cf -r d7aa110911c4 symbian3/app/voicerec/package_definition_3.0.xml
--- a/symbian3/app/voicerec/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/app/voicerec/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -9,7 +9,7 @@
       </component>
     </collection>
     <collection id="voicerec_info" name="Voice Recorder Apps Info">
-      <component id="voicerec_api_test" filter="s60,api_test,pref_test" purpose="development" name="Voice Recorder Apps Test">
+      <component id="voicerec_api_test" filter="s60,test,api_test,pref_test" purpose="development" name="Voice Recorder Apps Test">
         <unit bldFile="tsrc/group"/>
       </component>
       <component id="voicerec_plat" filter="s60" name="Voice Recorder Apps Platform Interfaces" class="api">
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/appinstall/package_definition.xml
--- a/symbian3/mw/appinstall/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/appinstall/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -150,7 +150,7 @@
           <component name="appinstall_plat" filter="s60" long-name="Application Installation Platform Interfaces" class="api">
             <unit bldFile="/sf/mw/appinstall/appinstall_plat/group"/>
           </component>
-          <component name="appinstall_test" filter="s60,api_test" long-name="Application Installation Test" purpose="development">
+          <component name="appinstall_test" filter="s60,test,api_test" long-name="Application Installation Test" purpose="development">
             <unit bldFile="/sf/mw/appinstall/tsrc/group"/>
           </component>
           <component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/appinstall/package_definition_3.0.xml
--- a/symbian3/mw/appinstall/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/appinstall/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -74,7 +74,7 @@
       <component id="appinstall_plat" filter="s60" name="Application Installation Platform Interfaces" class="api">
         <unit bldFile="appinstall_plat/group"/>
       </component>
-      <component id="appinstall_test" filter="s60,api_test" name="Application Installation Test" purpose="development">
+      <component id="appinstall_test" filter="s60,test,api_test" name="Application Installation Test" purpose="development">
         <unit bldFile="tsrc/group"/>
       </component>
       <component id="appinstall_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/btservices/package_definition.xml
--- a/symbian3/mw/btservices/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/btservices/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -127,7 +127,7 @@
           <component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
             <unit mrp="/sf/mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
           </component>
-          <component name="btservices_api_test" long-name="BT Services API Tests" purpose="development" filter="s60,api_test">
+          <component name="btservices_api_test" long-name="BT Services API Tests" purpose="development" filter="s60,test,api_test">
             <unit/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/btservices/package_definition_3.0.xml
--- a/symbian3/mw/btservices/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/btservices/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -51,7 +51,7 @@
       <component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
         <unit mrp="btservices_info/btservices_metadata/btservices_metadata.mrp"/>
       </component>
-      <component id="btservices_api_test" name="BT Services API Tests" purpose="development" filter="s60,api_test">
+      <component id="btservices_api_test" name="BT Services API Tests" purpose="development" filter="s60,test,api_test">
         <unit bldFiile="tsrc/group"/>
       </component>
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/camerasrv/package_definition.xml
--- a/symbian3/mw/camerasrv/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/camerasrv/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -109,7 +109,7 @@
           <component name="camerasrv_plat" filter="s60" long-name="Camera Services Platform Interfaces" class="api">
             <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/group"/>
           </component>
-          <component name="camerasrv_test" filter="s60,api_test" long-name="Camera Services API Test" purpose="development">
+          <component name="camerasrv_test" filter="s60,test,api_test" long-name="Camera Services API Test" purpose="development">
             <!-- #include from a single bld.inf or split into mutliple componens -->
             <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/>
             <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/camerasrv/package_definition_3.0.xml
--- a/symbian3/mw/camerasrv/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/camerasrv/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -33,7 +33,7 @@
       <component id="camerasrv_plat" filter="s60" name="Camera Services Platform Interfaces" class="api">
         <unit bldFile="camerasrv_plat/group"/>
       </component>
-      <component id="camerasrv_test" filter="s60,api_test" name="Camera Services API Test" purpose="development">
+      <component id="camerasrv_test" filter="s60,test,api_test" name="Camera Services API Test" purpose="development">
         <!-- #include from a single bld.inf or split into mutliple componens -->
 		<unit bldFile="camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/>
       	<unit  bldFile="camerasrv_plat/camera_application_engine_api/tsrc/group"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/classicui/package_definition.xml
--- a/symbian3/mw/classicui/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/classicui/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -196,7 +196,7 @@
             <unit bldFile="/sf/mw/classicui/classicui_plat/group"/>
           </component>
           <!-- the multiple units in the API test components need to be resolved -->
-          <component name="classicui_plat_api_test" filter="s60,api_test" long-name="Classic UI Platform API Tests" purpose="development">
+          <component name="classicui_plat_api_test" filter="s60,test,api_test" long-name="Classic UI Platform API Tests" purpose="development">
             <!-- can only have one unit. Need to #include from a single bld.inf -->
             <unit bldFile="/sf/mw/classicui/tsrc/group"/>
             <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_provider_utility_api/tsrc/group"/>
@@ -258,7 +258,7 @@
             <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_utilities_api/tsrc/group"/>
             <unit bldFile="/sf/mw/classicui/classicui_plat/volume_popup_api/tsrc/group"/>
           </component>
-          <component name="classicui_pub_api_test" filter="s60,api_test" long-name="Classic UI Public API Tests" purpose="development">
+          <component name="classicui_pub_api_test" filter="s60,test,api_test" long-name="Classic UI Public API Tests" purpose="development">
             <!-- can only have one unit. Need to #include from a single bld.inf -->
             <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_criteria_api/tsrc/group"/>
             <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_generic_parameter_api/tsrc/group"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/classicui/package_definition_3.0.xml
--- a/symbian3/mw/classicui/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/classicui/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -120,7 +120,7 @@
         <unit bldFile="classicui_plat/group"/>
       </component>
        <!-- the multiple units in the API test components need to be resolved -->
-	<component id="classicui_plat_api_test" filter="s60,api_test" name="Classic UI Platform API Tests" purpose="development">
+	<component id="classicui_plat_api_test" filter="s60,test,api_test" name="Classic UI Platform API Tests" purpose="development">
 		<!-- can only have one unit. Need to #include from a single bld.inf -->
 		<unit bldFile="tsrc/group" name="classicui_tsrc_all"/>
 		<unit bldFile="classicui_plat/aiw_provider_utility_api/tsrc/group"/>
@@ -182,7 +182,7 @@
 		<unit bldFile="classicui_plat/transition_effect_utilities_api/tsrc/group"/>
 		<unit bldFile="classicui_plat/volume_popup_api/tsrc/group"/>
 	</component>
-	<component id="classicui_pub_api_test" filter="s60,api_test" name="Classic UI Public API Tests" purpose="development">
+	<component id="classicui_pub_api_test" filter="s60,test,api_test" name="Classic UI Public API Tests" purpose="development">
 		<!-- can only have one unit. Need to #include from a single bld.inf -->
 		<unit bldFile="classicui_pub/aiw_criteria_api/tsrc/group"/>
 		<unit bldFile="classicui_pub/aiw_generic_parameter_api/tsrc/group"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/dlnasrv/package_definition.xml
--- a/symbian3/mw/dlnasrv/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/dlnasrv/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -243,7 +243,7 @@
             <!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed  -->
             <unit bldFile="/sf/mw/dlnasrv/group"/>
           </component>
-          <component name="dlnasrv_api_test" filter="s60,api_test" long-name="DLNA Services API Tests" purpose="development">
+          <component name="dlnasrv_api_test" filter="s60,test,api_test" long-name="DLNA Services API Tests" purpose="development">
             <unit bldFile="/sf/mw/dlnasrv/tsrc/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/dlnasrv/package_definition_3.0.xml
--- a/symbian3/mw/dlnasrv/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/dlnasrv/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -199,7 +199,7 @@
       	<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed  -->
         <unit bldFile="group"/>
       </component>
-	  <component id="dlnasrv_api_test" filter="s60,api_test" name="DLNA Services API Tests" purpose="development">
+	  <component id="dlnasrv_api_test" filter="s60,test,api_test" name="DLNA Services API Tests" purpose="development">
         <unit bldFile="tsrc/group"/>
       </component>
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/drm/package_definition.xml
--- a/symbian3/mw/drm/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/drm/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -122,7 +122,7 @@
           <component name="drm_plat" filter="s60" long-name="DRM Platform Interfaces" class="api">
             <unit bldFile="/sf/mw/drm/drm_plat/group"/>
           </component>
-          <component name="drm_api_test" filter="s60,api_test" long-name="DRM Build" purpose="development">
+          <component name="drm_api_test" filter="s60,test,api_test" long-name="DRM Build" purpose="development">
             <unit bldFile="/sf/mw/drm/tsrc/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/drm/package_definition_3.0.xml
--- a/symbian3/mw/drm/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/drm/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -49,7 +49,7 @@
       <component id="drm_plat" filter="s60" name="DRM Platform Interfaces" class="api">
         <unit bldFile="drm_plat/group"/>
       </component>
-      <component id="drm_api_test" filter="s60,api_test" name="DRM Build" purpose="development">
+      <component id="drm_api_test" filter="s60,test,api_test" name="DRM Build" purpose="development">
         <unit bldFile="tsrc/group"/>
       </component>
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/homescreensrv/package_definition.xml
--- a/symbian3/mw/homescreensrv/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/homescreensrv/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -117,6 +117,7 @@
           </component>
         </collection>
         <collection name="idlefw" long-name="Idle Framework" level="framework">
+          <!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
           <component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
             <!--<unit bldFile="idlefw/plugins/group"/>-->
           </component>
@@ -196,7 +197,7 @@
           <component name="homescreensrv_plat" filter="s60" long-name="Home Screen Services Platform Interfaces" class="api">
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/group"/>
           </component>
-          <component name="homescreensrv_api_tests" filter="s60,api_test" long-name="Home Screen Services Platform API Tests" purpose="developement">
+          <component name="homescreensrv_api_tests" filter="s60,test,api_test" long-name="Home Screen Services Platform API Tests" purpose="developement">
             <!--  split into components or #include from common bld.inf -->
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group"/>
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/homescreensrv/package_definition_3.0.xml
--- a/symbian3/mw/homescreensrv/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/homescreensrv/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -47,6 +47,7 @@
       	<meta rel="config">
       		<defined condition="RD_CUSTOMIZABLE_AI"/>
       	</meta>
+		<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
       <component id="idlefw_plugins" filter="s60" name="Idle Framework Plugins" class="plugin">
         <!--<unit bldFile="idlefw/plugins/group"/>-->
       </component>
@@ -129,7 +130,7 @@
       <component id="homescreensrv_plat" filter="s60" name="Home Screen Services Platform Interfaces" class="api">
         <unit bldFile="homescreensrv_plat/group"/>
 	 </component>
-	<component id="homescreensrv_api_tests" filter="s60,api_test" name="Home Screen Services Platform API Tests" purpose="developement">
+	<component id="homescreensrv_api_tests" filter="s60,test,api_test" name="Home Screen Services Platform API Tests" purpose="developement">
 		<!--  split into components or #include from common bld.inf -->
 		<unit bldFile="homescreensrv_plat/content_harvester_plugin_api/tsrc/group" />
 		<unit bldFile="homescreensrv_plat/menu_content_service_api/tsrc/group" />
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/imghandling/package_definition.xml
--- a/symbian3/mw/imghandling/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/imghandling/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -82,7 +82,7 @@
           <component name="ihl" filter="s60" long-name="IHL">
             <unit bldFile="/sf/mw/imghandling/imagehandlinglib/group"/>
           </component>
-          <component name="imagehandlinglib_api" filter="s60,api_test" long-name="Image Handling Library API Test" purpose="development">
+          <component name="imagehandlinglib_api" filter="s60,test,api_test" long-name="Image Handling Library API Test" purpose="development">
             <unit bldFile="/sf/mw/imghandling/imagehandlinglib/tsrc/public/basic/group"/>
           </component>
         </collection>
@@ -95,7 +95,7 @@
           <component name="imagehandling_plat" filter="s60" long-name="Image Handling Platform Interfaces" class="api">
             <unit bldFile="/sf/mw/imghandling/imagehandling_plat/group"/>
           </component>
-          <component name="imagehandling_api_test" filter="s60,api_test" long-name="Image Handling Platform API Test" purpose="development">
+          <component name="imagehandling_api_test" filter="s60,test,api_test" long-name="Image Handling Platform API Test" purpose="development">
             <unit bldFile="/sf/mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/imghandling/package_definition_3.0.xml
--- a/symbian3/mw/imghandling/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/imghandling/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -6,7 +6,7 @@
       <component id="ihl" filter="s60" name="IHL">
         <unit bldFile="imagehandlinglib/group"/>
       </component>
-	    <component id="imagehandlinglib_api" filter="s60,api_test" name="Image Handling Library API Test" purpose="development">
+	    <component id="imagehandlinglib_api" filter="s60,test,api_test" name="Image Handling Library API Test" purpose="development">
 	     	<unit bldFile="imagehandlinglib/tsrc/public/basic/group"/>
 		</component>
     </collection>
@@ -19,7 +19,7 @@
       <component id="imagehandling_plat" filter="s60" name="Image Handling Platform Interfaces" class="api">
         <unit bldFile="imagehandling_plat/group"/>
       </component>
-      <component id="imagehandling_api_test" filter="s60,api_test" name="Image Handling Platform API Test" purpose="development">
+      <component id="imagehandling_api_test" filter="s60,test,api_test" name="Image Handling Platform API Test" purpose="development">
         <unit bldFile="imagehandling_plat/thumbnailmanager_api/tsrc/group"/>
       </component>
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/inputmethods/package_definition.xml
--- a/symbian3/mw/inputmethods/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/inputmethods/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -138,13 +138,13 @@
           <component name="inputmethods_pub" filter="s60" long-name="Input Methods Public Interfaces" class="api">
             <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/group"/>
           </component>
-          <component name="inputmethods_test" filter="s60,api_test" long-name="Input Methods Tests" introduced="^2" purpose="development">
+          <component name="inputmethods_test" filter="s60,test,api_test" long-name="Input Methods Tests" introduced="^2" purpose="development">
             <!-- can only have one unit, #include from a single bld.inf -->
             <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/>
             <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/>
             <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/>
           </component>
-          <component name="inputmethods_api_tests" filter="s60,api_test" long-name="Input Methods API Tests" introduced="^2" purpose="development">
+          <component name="inputmethods_api_tests" filter="s60,test,api_test" long-name="Input Methods API Tests" introduced="^2" purpose="development">
             <unit bldFile="/sf/mw/inputmethods/tsrc/group"/>
           </component>
           <component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/inputmethods/package_definition_3.0.xml
--- a/symbian3/mw/inputmethods/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/inputmethods/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -65,13 +65,13 @@
       <component id="inputmethods_pub" filter="s60" name="Input Methods Public Interfaces" class="api">
         <unit bldFile="inputmethods_pub/group"/>
       </component>
-      <component id="inputmethods_test" filter="s60,api_test" name="Input Methods Tests" introduced="^2" purpose="development">
+      <component id="inputmethods_test" filter="s60,test,api_test" name="Input Methods Tests" introduced="^2" purpose="development">
       	<!-- can only have one unit, #include from a single bld.inf -->
 	    <unit bldFile="inputmethods_plat/pen_input_server_api/tsrc/group"/>
 	    <unit bldFile="inputmethods_plat/ptiengine_hwr_api/tsrc/group"/>
 	    <unit bldFile="inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/>
       </component>
-      <component id="inputmethods_api_tests" filter="s60,api_test" name="Input Methods API Tests" introduced="^2" purpose="development">
+      <component id="inputmethods_api_tests" filter="s60,test,api_test" name="Input Methods API Tests" introduced="^2" purpose="development">
         <unit bldFile="tsrc/group"/>
       </component>
       <component id="inputmethods_metadata" name="Input Methods Metadata" class="config" introduced="^2" purpose="development" target="desktop">
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/mds/package_definition.xml
--- a/symbian3/mw/mds/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/mds/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -166,7 +166,7 @@
           <component name="mds_plat" filter="s60" long-name="Metadata Services Platform Interfaces" introduced="^2" class="api">
             <unit bldFile="/sf/mw/mds/mds_plat/group"/>
           </component>
-          <component name="mds_api_tests" filter="s60,api_test" long-name="Metadata Services API Tests" purpose="development" introduced="^2">
+          <component name="mds_api_tests" filter="s60,test,api_test" long-name="Metadata Services API Tests" purpose="development" introduced="^2">
             <unit bldFile="/sf/mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/>
             <unit bldFile="/sf/mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/>
             <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/mds/package_definition_3.0.xml
--- a/symbian3/mw/mds/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/mds/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -93,7 +93,7 @@
       <component id="mds_plat" filter="s60" name="Metadata Services Platform Interfaces" class="api" introduced="^2">
         <unit bldFile="mds_plat/group"/>
       </component>
-      <component id="mds_api_tests" filter="s60,api_test" name="Metadata Services API Tests" purpose="development" introduced="^2">
+      <component id="mds_api_tests" filter="s60,test,api_test" name="Metadata Services API Tests" purpose="development" introduced="^2">
         <unit bldFile="mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/>
         <unit bldFile="mds_plat/context_engine_plugin_api/tsrc/group"/>
         <unit bldFile="mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/mmappfw/package_definition.xml
--- a/symbian3/mw/mmappfw/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/mmappfw/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -139,7 +139,7 @@
             <!--  Move the export to another component or remove the #includes from this one -->
             <unit bldFile="/sf/mw/mmappfw/group"/>
           </component>
-          <component name="mmappfw_test" filter="s60,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1">
+          <component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1">
             <unit bldFile="/sf/mw/mmappfw/tsrc/group" filter="TA_MMAPPFW"/>
           </component>
           <component name="mmappfw_plat" filter="s60" long-name="Multimedia App Framework Platform Interfaces" introduced="^1" class="api">
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/mmappfw/package_definition_3.0.xml
--- a/symbian3/mw/mmappfw/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/mmappfw/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -69,7 +69,7 @@
       <!--  Move the export to another component or remove the #includes from this one -->
         <unit bldFile="group"/>
       </component>
-      <component id="mmappfw_test" filter="s60,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
+      <component id="mmappfw_test" filter="s60,test,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
         <unit bldFile="tsrc/group" filter="TA_MMAPPFW"/>
       </component>
       <component id="mmappfw_plat" filter="s60" name="Multimedia App Framework Platform Interfaces" class="api" introduced="^1">
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/mmmw/package_definition.xml
--- a/symbian3/mw/mmmw/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/mmmw/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -99,7 +99,7 @@
           <component name="progressivedownload" filter="s60" long-name="Progressive Download">
             <unit bldFile="/sf/mw/mmmw/mmfenh/progressivedownload/group"/>
           </component>
-          <component name="mmfenh_test" filter="s60,module_test,pref_test" long-name="MMF Enhancements Tests" purpose="development">
+          <component name="mmfenh_test" filter="s60,test,module_test,pref_test" long-name="MMF Enhancements Tests" purpose="development">
             <unit bldFile="/sf/mw/mmmw/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/>
           </component>
         </collection>
@@ -134,10 +134,10 @@
           </component>
         </collection>
         <collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-          <component name="mmmw_test" filter="s60,api_test,pref_test" long-name="Multimedia Middleware Tests" purpose="development">
+          <component name="mmmw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia Middleware Tests" purpose="development">
             <unit bldFile="/sf/mw/mmmw/tsrc/group"/>
           </component>
-          <component name="mmmw_api_test" filter="s60,api_test" long-name="Multimedia Middleware API Tests" purpose="development">
+          <component name="mmmw_api_test" filter="s60,test,api_test" long-name="Multimedia Middleware API Tests" purpose="development">
             <unit bldFile="/sf/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/tsrc/group"/>
           </component>
           <component name="mmmw_plat" filter="s60" long-name="Multimedia Middleware Platform Interfaces" class="api">
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/mmmw/package_definition_3.0.xml
--- a/symbian3/mw/mmmw/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/mmmw/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -23,7 +23,7 @@
       <component id="progressivedownload" filter="s60" name="Progressive Download">
         <unit bldFile="mmfenh/progressivedownload/group"/>
       </component>
-      <component id="mmfenh_test" filter="s60,module_test,pref_test" name="MMF Enhancements Tests" purpose="development">
+      <component id="mmfenh_test" filter="s60,test,module_test,pref_test" name="MMF Enhancements Tests" purpose="development">
         <unit bldFile="mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/>
       </component>      
     </collection>
@@ -58,10 +58,10 @@
       </component>
     </collection>    
     <collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
-      <component id="mmmw_test" filter="s60,api_test,pref_test" name="Multimedia Middleware Tests" purpose="development">
+      <component id="mmmw_test" filter="s60,test,api_test,pref_test" name="Multimedia Middleware Tests" purpose="development">
         <unit bldFile="tsrc/group"/>
       </component>
-      <component id="mmmw_api_test" filter="s60,api_test" name="Multimedia Middleware API Tests" purpose="development">
+      <component id="mmmw_api_test" filter="s60,test,api_test" name="Multimedia Middleware API Tests" purpose="development">
         <unit bldFile="mmmw_plat/telephony_multimedia_service_api/tsrc/group"/>
       </component>
       <component id="mmmw_plat" filter="s60" name="Multimedia Middleware Platform Interfaces" class="api">
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/phonesrv/package_definition.xml
--- a/symbian3/mw/phonesrv/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/phonesrv/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -106,7 +106,7 @@
           <component name="servicerequest" filter="s60" long-name="Service Request">
             <unit bldFile="/sf/mw/phonesrv/cellular/servicerequest/group"/>
           </component>
-          <component name="cellular_test" filter="s60,api_test" long-name="Cellular Tests" purpose="development">
+          <component name="cellular_test" filter="s60,test,api_test" long-name="Cellular Tests" purpose="development">
             <!-- can only have one unit. Need to #include from a single bld.inf  (cellular/tsrc/bld.inf?) -->
             <unit bldFile="/sf/mw/phonesrv/cellular/PsetNotesUi/tsrc/public/basic/group"/>
             <unit bldFile="/sf/mw/phonesrv/cellular/SSSettings/tsrc/public/basic/group"/>
@@ -133,7 +133,7 @@
             <!--  should spell out CS in name -->
             <unit bldFile="/sf/mw/phonesrv/convergedcallengine/csplugin/group"/>
           </component>
-          <component name="convergedcallengine_test" filter="s60,api_test" long-name="CCE Tests" purpose="development">
+          <component name="convergedcallengine_test" filter="s60,test,api_test" long-name="CCE Tests" purpose="development">
             <!-- can only have one unit. Need to #include from a single bld.inf  (convergedcallengine/tsrc/bld.inf?) -->
             <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cce/tsrc/public/basic/group"/>
             <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group"/>
@@ -168,7 +168,7 @@
           <component name="callui" filter="s60" long-name="Call UI">
             <unit bldFile="/sf/mw/phonesrv/phoneclientserver/callui/group"/>
           </component>
-          <component name="phoneclientserver_test" filter="s60,api_test" long-name="Phone Client/Server Tests" purpose="development">
+          <component name="phoneclientserver_test" filter="s60,test,api_test" long-name="Phone Client/Server Tests" purpose="development">
             <!-- can only have one unit. Need to #include from a single bld.inf  (phoneclientserver/tsrc/bld.inf?) -->
             <unit bldFile="/sf/mw/phonesrv/phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
             <unit bldFile="/sf/mw/phonesrv/phoneclientserver/dialutils/tsrc/public/basic/group"/>
@@ -200,7 +200,7 @@
           <component name="phonesrv_pub" filter="s60" long-name="Telephony and SIM Services Public Interfaces" class="api">
             <unit bldFile="/sf/mw/phonesrv/phonesrv_pub/group"/>
           </component>
-          <component name="phonesrv_test" filter="s60,api_test" long-name="Telephony and SIM Services Tests" purpose="development">
+          <component name="phonesrv_test" filter="s60,test,api_test" long-name="Telephony and SIM Services Tests" purpose="development">
             <!-- can only have one unit. Need to #include from a single bld.inf  (phonesrv_plat/tsrc/bld.inf?) -->
             <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/>
             <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/phonesrv/package_definition_3.0.xml
--- a/symbian3/mw/phonesrv/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/phonesrv/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -30,7 +30,7 @@
       <component id="servicerequest" filter="s60" name="Service Request">
         <unit bldFile="cellular/servicerequest/group"/>
       </component>
-      <component id="cellular_test" filter="s60,api_test" name="Cellular Tests" purpose="development">
+      <component id="cellular_test" filter="s60,test,api_test" name="Cellular Tests" purpose="development">
       	<!-- can only have one unit. Need to #include from a single bld.inf  (cellular/tsrc/bld.inf?) -->
         <unit unitID="tedo.PsetNotesUi.test" bldFile="cellular/PsetNotesUi/tsrc/public/basic/group"/>
         <unit unitID="tedo.SSSettings.test" bldFile="cellular/SSSettings/tsrc/public/basic/group"/>
@@ -57,7 +57,7 @@
       	<!--  should spell out CS in name -->
         <unit bldFile="convergedcallengine/csplugin/group"/>
       </component>
-      <component id="convergedcallengine_test" filter="s60,api_test" name="CCE Tests" purpose="development">
+      <component id="convergedcallengine_test" filter="s60,test,api_test" name="CCE Tests" purpose="development">
       	<!-- can only have one unit. Need to #include from a single bld.inf  (convergedcallengine/tsrc/bld.inf?) -->
         <unit unitID="tedo.cce.test" bldFile="convergedcallengine/cce/tsrc/public/basic/group"/>
         <unit unitID="tedo.spsettings.test" bldFile="convergedcallengine/spsettings/tsrc/public/basic/group"/>
@@ -92,7 +92,7 @@
       <component id="callui" filter="s60" name="Call UI">
         <unit bldFile="phoneclientserver/callui/group"/>
       </component>
-      <component id="phoneclientserver_test" filter="s60,api_test" name="Phone Client/Server Tests" purpose="development">
+      <component id="phoneclientserver_test" filter="s60,test,api_test" name="Phone Client/Server Tests" purpose="development">
       	<!-- can only have one unit. Need to #include from a single bld.inf  (phoneclientserver/tsrc/bld.inf?) -->
         <unit unitID="tedo.aiwdialdata.test" bldFile="phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
         <unit unitID="tedo.dialutils.test" bldFile="phoneclientserver/dialutils/tsrc/public/basic/group"/>
@@ -124,7 +124,7 @@
       <component id="phonesrv_pub" filter="s60" name="Telephony and SIM Services Public Interfaces" class="api">
         <unit bldFile="phonesrv_pub/group"/>
       </component>
-      <component id="phonesrv_test" filter="s60,api_test" name="Telephony and SIM Services Tests" purpose="development">
+      <component id="phonesrv_test" filter="s60,test,api_test" name="Telephony and SIM Services Tests" purpose="development">
       	<!-- can only have one unit. Need to #include from a single bld.inf  (phonesrv_plat/tsrc/bld.inf?) -->
         <unit unitID="tedo.call_information_api.test" bldFile="phonesrv_plat/call_information_api/tsrc/group"/>
 		<unit unitID="tedo.sat_client_api.test" bldFile="phonesrv_plat/sat_client_api/tsrc/group"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/securitysrv/package_definition.xml
--- a/symbian3/mw/securitysrv/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/securitysrv/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -197,7 +197,7 @@
           <component name="secsrv_plat" long-name="Security Services Platform Interfaces" filter="s60" class="api">
             <unit bldFile="/sf/mw/securitysrv/secsrv_plat/group"/>
           </component>
-          <component name="securitysrv_test" filter="s60,api_test" purpose="development" long-name="Security Services Test">
+          <component name="securitysrv_test" filter="s60,test,api_test" purpose="development" long-name="Security Services Test">
             <unit bldFile="/sf/mw/securitysrv/tsrc/group"/>
           </component>
           <component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/securitysrv/package_definition_3.0.xml
--- a/symbian3/mw/securitysrv/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/securitysrv/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -121,7 +121,7 @@
       <component id="secsrv_plat" name="Security Services Platform Interfaces" filter="s60" class="api">
         <unit bldFile="secsrv_plat/group"/>
       </component>
-      <component id="securitysrv_test" filter="s60,api_test" purpose="development" name="Security Services Test">
+      <component id="securitysrv_test" filter="s60,test,api_test" purpose="development" name="Security Services Test">
         <unit bldFile="tsrc/group"/>
       </component>
       <component id="securitysrv_metadata" name="Security Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/uiresources/package_definition.xml
--- a/symbian3/mw/uiresources/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -84,11 +84,11 @@
           <component name="uiresources_pub" filter="s60" long-name="UI Resources Public Interfaces" class="api">
             <unit bldFile="/sf/mw/uiresources/uiresources_pub/group"/>
           </component>
-          <component name="uiresources_test" filter="s60,api_test" long-name="UI Resources Tests" purpose="development">
+          <component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development">
             <unit bldFile="/sf/mw/uiresources/tsrc/group" filter="uiresources_api_all"/>
           </component>
           <!-- are these custom filters needed? -->
-          <component name="uiresources_test_pat" filter="s60,api_test" long-name="UI Resources Platform API Tests" purpose="development">
+          <component name="uiresources_test_pat" filter="s60,test,api_test" long-name="UI Resources Platform API Tests" purpose="development">
             <!-- can only have one unit. Need to #include from a common one -->
             <unit bldFile="/sf/mw/uiresources/uiresources_plat/cdl_api/tsrc/group" filter="cdl_api"/>
             <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_fonts_api/tsrc/group" filter="extended_fonts_api"/>
@@ -97,7 +97,7 @@
             <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_data_api/tsrc/group" filter="layout_data_api"/>
             <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_system_private_api/tsrc/group" filter="layout_system_private_api"/>
           </component>
-          <component name="uiresources_test_pat" filter="s60,api_test" long-name="UI Resources Public API Tests" purpose="development">
+          <component name="uiresources_test_pat" filter="s60,test,api_test" long-name="UI Resources Public API Tests" purpose="development">
             <!-- can only have one unit. Need to #include from a common one -->
             <unit bldFile="/sf/mw/uiresources/uiresources_plat/skins_image_attributes_api/tsrc/group" filter="skins_image_attributes_api"/>
             <unit bldFile="/sf/mw/uiresources/uiresources_pub/font_definition_api/tsrc/group" filter="font_definition_api"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/uiresources/package_definition_3.0.xml
--- a/symbian3/mw/uiresources/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -8,11 +8,11 @@
       <component id="uiresources_pub" filter="s60" name="UI Resources Public Interfaces" class="api">
         <unit bldFile="uiresources_pub/group"/>
       </component>
-	  <component id="uiresources_test" filter="s60,api_test" name="UI Resources Tests" purpose="development">
+	  <component id="uiresources_test" filter="s60,test,api_test" name="UI Resources Tests" purpose="development">
 	  	<unit bldFile="tsrc/group" filter="uiresources_api_all" />
 	  </component>
 	  <!-- are these custom filters needed? -->
-	  <component id="uiresources_test_pat" filter="s60,api_test" name="UI Resources Platform API Tests" purpose="development">
+	  <component id="uiresources_test_pat" filter="s60,test,api_test" name="UI Resources Platform API Tests" purpose="development">
 		<!-- can only have one unit. Need to #include from a common one -->
 		<unit bldFile="uiresources_plat/cdl_api/tsrc/group" filter="cdl_api" />
 		<unit bldFile="uiresources_plat/extended_fonts_api/tsrc/group" filter="extended_fonts_api" />
@@ -21,7 +21,7 @@
 		<unit bldFile="uiresources_plat/layout_data_api/tsrc/group" filter="layout_data_api" />
 		<unit bldFile="uiresources_plat/layout_system_private_api/tsrc/group" filter="layout_system_private_api" />
 	  </component>
-	  <component id="uiresources_test_pat" filter="s60,api_test" name="UI Resources Public API Tests" purpose="development">
+	  <component id="uiresources_test_pat" filter="s60,test,api_test" name="UI Resources Public API Tests" purpose="development">
 		<!-- can only have one unit. Need to #include from a common one -->
 		<unit bldFile="uiresources_plat/skins_image_attributes_api/tsrc/group" filter="skins_image_attributes_api" />
 		<unit bldFile="uiresources_pub/font_definition_api/tsrc/group" filter="font_definition_api" />
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/usbservices/package_definition.xml
--- a/symbian3/mw/usbservices/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/usbservices/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -81,7 +81,7 @@
           <component name="usbservices_plat" filter="s60" long-name="USB Services Platform Interfaces" class="api">
             <unit bldFile="/sf/mw/usbservices/usbservices_plat/group"/>
           </component>
-          <component name="usbservices_test" filter="s60,api_test" long-name="USB Services Tests">
+          <component name="usbservices_test" filter="s60,test,api_test" long-name="USB Services Tests">
             <unit bldFile="/sf/mw/usbservices/tsrc/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/usbservices/package_definition_3.0.xml
--- a/symbian3/mw/usbservices/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/usbservices/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -5,7 +5,7 @@
       <component id="usbservices_plat" filter="s60" name="USB Services Platform Interfaces" class="api">
         <unit bldFile="usbservices_plat/group"/>
       </component>
-      <component id="usbservices_test" filter="s60,api_test" name="USB Services Tests">
+      <component id="usbservices_test" filter="s60,test,api_test" name="USB Services Tests">
         <unit bldFile="tsrc/group"/>
       </component>
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/videoutils/package_definition.xml
--- a/symbian3/mw/videoutils/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/videoutils/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -97,7 +97,7 @@
           <component name="videoutils_plat" filter="s60" long-name="Video Utils Platform Interfaces" class="api">
             <unit bldFile="/sf/mw/videoutils/videoutils_plat/group"/>
           </component>
-          <component name="videoutils_test" filter="s60,api_test" long-name="Video Utils Tests">
+          <component name="videoutils_test" filter="s60,test,api_test" long-name="Video Utils Tests">
             <unit bldFile="/sf/mw/videoutils/tsrc/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/mw/videoutils/package_definition_3.0.xml
--- a/symbian3/mw/videoutils/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/mw/videoutils/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -21,7 +21,7 @@
       <component id="videoutils_plat" filter="s60" name="Video Utils Platform Interfaces" class="api">
         <unit bldFile="videoutils_plat/group"/>
       </component>
-      <component id="videoutils_test" filter="s60,api_test" name="Video Utils Tests">
+      <component id="videoutils_test" filter="s60,test,api_test" name="Video Utils Tests">
         <unit bldFile="tsrc/group"/>
       </component>
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/os/deviceplatformrelease/package_definition.xml
--- a/symbian3/os/deviceplatformrelease/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -166,6 +166,9 @@
           <component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
             <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
           </component>
+          <component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
+            <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
+          </component>
         </collection>
         <collection name="foundation_system" long-name="Foundation System" level="top">
           <component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
diff -r 3142324011cf -r d7aa110911c4 symbian3/os/deviceplatformrelease/package_definition_3.0.xml
--- a/symbian3/os/deviceplatformrelease/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -94,6 +94,9 @@
       <component id="productionbldcbrconfig" name="Production Build CBR Config" filter="gt" purpose="development" class="config">
         <unit mrp="symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
       </component>
+      <component id="foundation_s60_packages" name="Foundation S60 Packages" class="config" introduced="^3" deprecated="^3" purpose="development" target="desktop">
+        <unit mrp="symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
+      </component>
     </collection>
     <collection id="foundation_system" name="Foundation System" level="top">
       <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
diff -r 3142324011cf -r d7aa110911c4 symbian3/os/imagingext/package_definition.xml
--- a/symbian3/os/imagingext/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/os/imagingext/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -101,10 +101,10 @@
           <component name="imagingext_pub" filter="s60" long-name="Imaging Extensions Public Interfaces" class="api">
             <unit bldFile="/sf/os/imagingext/imagingext_pub/group"/>
           </component>
-          <component name="imagingext_test" filter="s60,api_test" long-name="Imaging Extensions Platform API Tests" purpose="development">
+          <component name="imagingext_test" filter="s60,test,api_test" long-name="Imaging Extensions Platform API Tests" purpose="development">
             <unit bldFile="/sf/os/imagingext/imagingext_plat/extended_icl_jpeg_api/tsrc/group"/>
           </component>
-          <component name="imagingext_test" filter="s60,api_test" long-name="Imaging Extensions Public API Tests" purpose="development">
+          <component name="imagingext_test" filter="s60,test,api_test" long-name="Imaging Extensions Public API Tests" purpose="development">
             <unit bldFile="/sf/os/imagingext/imagingext_pub/exif_api/tsrc/group"/>
           </component>
         </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/os/imagingext/package_definition_3.0.xml
--- a/symbian3/os/imagingext/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/os/imagingext/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -25,10 +25,10 @@
       <component id="imagingext_pub" filter="s60" name="Imaging Extensions Public Interfaces" class="api">
         <unit bldFile="imagingext_pub/group"/>
       </component>
-      <component id="imagingext_test" filter="s60,api_test" name="Imaging Extensions Platform API Tests" purpose="development">
+      <component id="imagingext_test" filter="s60,test,api_test" name="Imaging Extensions Platform API Tests" purpose="development">
         <unit bldFile="imagingext_plat/extended_icl_jpeg_api/tsrc/group"/>
       </component>
-      <component id="imagingext_test" filter="s60,api_test" name="Imaging Extensions Public API Tests" purpose="development">
+      <component id="imagingext_test" filter="s60,test,api_test" name="Imaging Extensions Public API Tests" purpose="development">
         <unit bldFile="imagingext_pub/exif_api/tsrc/group"/>
       </component>
     </collection>
diff -r 3142324011cf -r d7aa110911c4 symbian3/os/mm/package_definition.xml
--- a/symbian3/os/mm/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/os/mm/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -123,7 +123,7 @@
           <component name="arm_mdf_postprocessor" filter="s60" long-name="ARM MDF Postprocessor">
             <unit bldFile="/sf/os/mm/mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
           </component>
-          <component name="nga_mdf_tsrc" long-name="NGA MDF Tests" purpose="development" filter="s60,pref_test,module_test">
+          <component name="nga_mdf_tsrc" long-name="NGA MDF Tests" purpose="development" filter="s60,test,pref_test,module_test">
             <unit bldFile="/sf/os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/tsrc/StifNgaMdfPoPTest/group"/>
           </component>
         </collection>
@@ -192,7 +192,7 @@
           <component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
             <unit mrp="/sf/os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
           </component>
-          <component name="mm_tsrc" long-name="Multimedia Tests" purpose="development" filter="s60,api_test,pref_test">
+          <component name="mm_tsrc" long-name="Multimedia Tests" purpose="development" filter="s60,test,api_test,pref_test">
             <unit bldFile="/sf/os/mm/tsrc/group"/>
           </component>
           <component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
diff -r 3142324011cf -r d7aa110911c4 symbian3/os/mm/package_definition_3.0.xml
--- a/symbian3/os/mm/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/os/mm/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -47,7 +47,7 @@
       <component id="arm_mdf_postprocessor" filter="s60" name="ARM MDF Postprocessor">
         <unit bldFile="mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
       </component>
-      <component id="nga_mdf_tsrc" name="NGA MDF Tests" purpose="development" filter="s60,pref_test,module_test">
+      <component id="nga_mdf_tsrc" name="NGA MDF Tests" purpose="development" filter="s60,test,pref_test,module_test">
         <unit bldFile="mdfdevvideoextensions/nga_mdf_postprocessor/tsrc/StifNgaMdfPoPTest/group"/>
       </component>
     </collection>
@@ -116,7 +116,7 @@
       <component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
         <unit mrp="mm_info/mmdocs/multimedia_documentation.mrp"/>
       </component>
-      <component id="mm_tsrc" name="Multimedia Tests" purpose="development" filter="s60,api_test,pref_test">
+      <component id="mm_tsrc" name="Multimedia Tests" purpose="development" filter="s60,test,api_test,pref_test">
         <unit bldFile="tsrc/group"/>
       </component>
       <component id="mm_metadata" name="Multimedia Metadata" class="config" introduced="^2" purpose="development" target="desktop">
diff -r 3142324011cf -r d7aa110911c4 symbian3/os/usb/package_definition.xml
--- a/symbian3/os/usb/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/os/usb/package_definition.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -80,11 +80,6 @@
         <collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
           <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
         </collection>
-        <collection name="usbextension" long-name="USB Extension" level="framework">
-          <component name="usbaudioclassdriver" long-name="USB Audi Class Driver" purpose="optional" filter="s60">
-            <unit bldFile="/sf/os/usb/usbextension/usbaudioclassdriver/group"/>
-          </component>
-        </collection>
         <collection name="usbmgmt" long-name="USB Management" level="server">
           <component name="usbmgr" long-name="USB Manager" purpose="optional">
             <unit bldFile="/sf/os/usb/usbmgmt/usbmgr/group" mrp="/sf/os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
diff -r 3142324011cf -r d7aa110911c4 symbian3/os/usb/package_definition_3.0.xml
--- a/symbian3/os/usb/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
+++ b/symbian3/os/usb/package_definition_3.0.xml	Wed Feb 17 19:51:46 2010 +0000
@@ -4,11 +4,6 @@
     <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
       <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
     </collection>
-    <collection id="usbextension" name="USB Extension" level="framework">
-      <component id="usbaudioclassdriver" name="USB Audi Class Driver" purpose="optional" filter="s60">
-        <unit  bldFile="usbextension/usbaudioclassdriver/group"/>
-      </component>
-    </collection>
     <collection id="usbmgmt" name="USB Management" level="server">
       <component id="usbmgr" name="USB Manager" purpose="optional">
         <unit version="2" bldFile="usbmgmt/usbmgr/group" mrp="usbmgmt/usbmgr/group/usb_manager.mrp"/>