# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1266498285 0
# Node ID e07166a29d4d6b6ea9a4721740d36b4b9f7f47a8
# Parent  f01da794df62a422d0328c54bd9714582749a4e4# Parent  e754af35c291bd6622eefaf37a2f8b25968e5e0b
Integration

diff -r e754af35c291 -r e07166a29d4d symbian3/adaptation/beagleboard/package_definition_3.0.xml
--- a/symbian3/adaptation/beagleboard/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/adaptation/beagleboard/package_definition_3.0.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -2,13 +2,13 @@
 <SystemDefinition schema="3.0.0">
   <package id="beagleboard" name="Beagle Board" levels="hw-if">
     <collection id="omap3530" name="OMAP 3530" level="hw-if">
-      <component id="omap3530" name="Beagle Board common" introduced="symbian^3" purpose="optional">
+      <component id="omap3530" name="Beagle Board common" introduced="^3" purpose="optional">
         <unit bldFile="omap3530" mrp="omap3530/base_beagle.mrp"/>
       </component>
-      <component id="kernel" name="Beagle Board kernel" introduced="symbian^3" purpose="optional">
+      <component id="kernel" name="Beagle Board kernel" introduced="^3" purpose="optional">
         <unit bldFile="omap3530/kernel"/>
       </component>
-      <component id="beagleboard" name="Beagle Board baseport" introduced="symbian^3" purpose="optional">
+      <component id="beagleboard" name="Beagle Board baseport" introduced="^3" purpose="optional">
         <unit bldFile="omap3530/beagleboard"/>
       </component>
     </collection>
diff -r e754af35c291 -r e07166a29d4d symbian3/adaptation/qemu/package_definition_3.0.xml
--- a/symbian3/adaptation/qemu/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/adaptation/qemu/package_definition_3.0.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="qemu" name="QEMU" levels="hw-if">
+  <package id="qemu" name="QEMU and Baseport" levels="hw-if">
     <collection id="baseport" name="Baseport" level="hw-if">
-      <component id="syborg" name="Syborg" introduced="symbian^2" purpose="optional">
+      <component id="syborg" name="Syborg" introduced="^2" purpose="optional">
         <unit bldFile="baseport/syborg" mrp="baseport/syborg/syborg.mrp"/>
       </component>
     </collection>
diff -r e754af35c291 -r e07166a29d4d symbian3/adaptation/stubs/package_definition_3.0.xml
--- a/symbian3/adaptation/stubs/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/adaptation/stubs/package_definition_3.0.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="stubs" levels="stub">
+  <package id="stubs" name="Stubs" levels="stub">
     <collection id="s60_stubs" level="stub">
      <component id="audiostubs">
       <unit bldFile="/adaptation/stubs/audiostubs/group"/>
diff -r e754af35c291 -r e07166a29d4d symbian3/app/camera/package_definition.xml
--- a/symbian3/app/camera/package_definition.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/app/camera/package_definition.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -83,6 +83,7 @@
           </component>
           <component name="cameraapp" filter="s60" long-name="Camera Application">
             <unit bldFile="/sf/app/camera/camerauis/cameraapp/group"/>
+            <unit bldFile="/sf/app/camera/camerauis/cameraapp/help/group"/>
           </component>
         </collection>
         <collection name="camera_info" long-name="Camera Apps Info">
diff -r e754af35c291 -r e07166a29d4d symbian3/app/commonemail/package_definition.xml
--- a/symbian3/app/commonemail/package_definition.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/app/commonemail/package_definition.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -102,15 +102,6 @@
           <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,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"/>
-            <unit bldFile="/sf/app/commonemail/emailservices/emailserver/tsrc/group"/>
-            <unit bldFile="/sf/app/commonemail/emailservices/emailserver/cmailhandlerplugin/tsrc/group"/>
-            <unit bldFile="/sf/app/commonemail/emailservices/emailserver/mailserverautostart/tsrc/group"/>
-            <unit bldFile="/sf/app/commonemail/emailcontacts/contactactionservice/saveascontactplugin/tsrc/group"/>
-          </component>
         </collection>
         <collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
           <component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
diff -r e754af35c291 -r e07166a29d4d symbian3/app/commonemail/package_definition_3.0.xml
--- a/symbian3/app/commonemail/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/app/commonemail/package_definition_3.0.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -26,15 +26,6 @@
       <component id="emailinstallationinitiator" filter="s60" name="Email Installation Initiator" introduced="^2">
         <unit bldFile="emailservices/emailinstallationinitiator/group"/>
       </component>
-      <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" />
-		<unit bldFile="emailservices/emailserver/tsrc/group"  />
-		<unit bldFile="emailservices/emailserver/cmailhandlerplugin/tsrc/group"/>
-		<unit bldFile="emailservices/emailserver/mailserverautostart/tsrc/group"/>
-		<unit bldFile="emailcontacts/contactactionservice/saveascontactplugin/tsrc/group"/>
-      </component>
     </collection>
     <collection id="ipsservices" name="IMAP/POP/SMTP Services" level="service">
       <component id="ipssossettings" filter="s60" name="IPS SOS Settings" introduced="^2">
diff -r e754af35c291 -r e07166a29d4d symbian3/app/contacts/package_definition.xml
--- a/symbian3/app/contacts/package_definition.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/app/contacts/package_definition.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -98,24 +98,6 @@
           <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,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,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"/>
-            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/USIMExtension/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/xSPExtensionManager/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccacontactorservice/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccapp/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccamycardplugin/tsrc/group"/>
-          </component>
         </collection>
         <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
           <component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
@@ -130,19 +112,6 @@
           <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,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,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"/>
-            <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkEngUtils/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkSimStoreImpl/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkSimStoreService/tsrc/group"/>
-          </component>
         </collection>
         <collection name="pimprotocols" long-name="PIM Protocols" level="services">
           <component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
@@ -156,13 +125,6 @@
           <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,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"/>
-            <unit bldFile="/sf/app/contacts/ccservices/cmsservices/contactpresence/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/ccservices/cmsservices/presencetrafficlights/tsrc/group"/>
-          </component>
         </collection>
         <collection name="presencecache" long-name="Presence Cache" level="support">
           <component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
@@ -178,10 +140,6 @@
             <!-- 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,unit_test" long-name="Presence Cache Tests">
-            <!-- can this be #included from presencecacheutils?  -->
-            <unit bldFile="/sf/app/contacts/presencecache/presencecacheutils/tsrc/group"/>
-          </component>
         </collection>
         <collection name="predictivesearch" long-name="Predictive Search" level="support">
           <component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
@@ -209,7 +167,7 @@
             <unit bldFile="/sf/app/contacts/contacts_plat/group"/>
           </component>
           <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"/>
+            <!-- can only have one unit. Use common bld.inf? -->
             <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"/>
             <unit bldFile="/sf/app/contacts/contacts_plat/contactpresence_api/tsrc/group"/>
@@ -223,7 +181,6 @@
             <unit bldFile="/sf/app/contacts/contacts_plat/predictivesearch_client_api/tsrc/group"/>
             <unit bldFile="/sf/app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group"/>
             <unit bldFile="/sf/app/contacts/contacts_plat/phonebook_2_rcl_api/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/contacts_plat/phonebook_2_icon_api/tsrc/ut_CPbk2IconArray/group"/>
           </component>
           <component name="contacts_pub" filter="s60" long-name="Contacts Apps Public Interfaces" class="api">
             <unit bldFile="/sf/app/contacts/contacts_pub/group"/>
diff -r e754af35c291 -r e07166a29d4d symbian3/app/contacts/package_definition_3.0.xml
--- a/symbian3/app/contacts/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/app/contacts/package_definition_3.0.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -22,24 +22,6 @@
       <component id="phonebook2" filter="s60" name="Phone Book 2">
         <unit bldFile="phonebookui/phonebook2/group"/>
       </component>
-      <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,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" />
-         <unit bldFile="phonebookui/Phonebook2/USIMExtension/tsrc/group" />
-         <unit bldFile="phonebookui/Phonebook2/xSPExtensionManager/tsrc/group" />
-         <unit bldFile="phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/tsrc/group" />
-         <unit bldFile="phonebookui/Phonebook2/ccapplication/ccacontactorservice/tsrc/group" />
-         <unit bldFile="phonebookui/Phonebook2/ccapplication/ccapp/tsrc/group" />
-         <unit bldFile="phonebookui/Phonebook2/ccapplication/ccamycardplugin/tsrc/group" />
-       </component>
     </collection>
     <collection id="phonebookengines" name="Phonebook Engines" level="engine">
       <component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
@@ -54,19 +36,6 @@
       <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,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,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" />
-        <unit bldFile="phonebookengines/VirtualPhonebook/VPbkEngUtils/tsrc/group" />
-        <unit bldFile="phonebookengines/VirtualPhonebook/VPbkSimStoreImpl/tsrc/group" />
-        <unit bldFile="phonebookengines/VirtualPhonebook/VPbkSimStoreService/tsrc/group" />
-      </component>      
     </collection>
     <collection id="pimprotocols" name="PIM Protocols" level="services">
       <component id="phonebooksync" name="Phonebook Sync" purpose="optional" class="plugin">
@@ -80,13 +49,6 @@
       <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,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" />
-        <unit bldFile="ccservices/cmsservices/contactpresence/tsrc/group" />
-        <unit bldFile="ccservices/cmsservices/presencetrafficlights/tsrc/group" />
-      </component>           
     </collection>
     <collection id="presencecache" name="Presence Cache" level="support">
       <component id="presencecacheutils" filter="s60" name="Presence Cache Utils" introduced="^2">
@@ -102,10 +64,6 @@
 		<!-- 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,unit_test" name="Presence Cache Tests">
-      	<!-- can this be #included from presencecacheutils?  -->
-        <unit bldFile="presencecache/presencecacheutils/tsrc/group" />
-      </component>
     </collection>
     <collection id="predictivesearch" name="Predictive Search" level="support">
       <component id="pcsutils" filter="s60" name="PCS Utils" introduced="^2">
@@ -133,7 +91,7 @@
         <unit bldFile="contacts_plat/group"/>
       </component>
      <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" />
+		<!-- can only have one unit. Use common bld.inf? -->
        <unit bldFile="contacts_plat/cca_launch_api/tsrc/group" />
        <unit bldFile="contacts_plat/cca_view_plugin_api/tsrc/group" />
        <unit bldFile="contacts_plat/contactpresence_api/tsrc/group" />
@@ -147,7 +105,6 @@
        <unit bldFile="contacts_plat/predictivesearch_client_api/tsrc/group" />        
        <unit bldFile="contacts_plat/predictivesearch_utils_api/tsrc/group" />     
        <unit bldFile="contacts_plat/phonebook_2_rcl_api/tsrc/group" />     
-       <unit bldFile="contacts_plat/phonebook_2_icon_api/tsrc/ut_CPbk2IconArray/group" />  
      </component>
       <component id="contacts_pub" filter="s60" name="Contacts Apps Public Interfaces" class="api">
         <unit bldFile="contacts_pub/group"/>
diff -r e754af35c291 -r e07166a29d4d symbian3/app/files/package_definition.xml
--- a/symbian3/app/files/package_definition.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/app/files/package_definition.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -80,19 +80,19 @@
         <collection name="deviceencryption" long-name="Device Encryption" level="support">
           <!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
           <component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/app/files/devencnotifplugin/group"/>
+            <unit bldFile="/sf/app/files/deviceencryption/devencnotifplugin/group"/>
           </component>
           <component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
-            <unit bldFile="/sf/app/files/devencui/group"/>
+            <unit bldFile="/sf/app/files/deviceencryption/devencui/group"/>
           </component>
           <component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/app/files/devencdmadapter/group"/>
+            <unit bldFile="/sf/app/files/deviceencryption/devencdmadapter/group"/>
           </component>
           <component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/app/files/devencgsplugin/group"/>
+            <unit bldFile="/sf/app/files/deviceencryption/devencgsplugin/group"/>
           </component>
           <component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
-            <unit bldFile="/sf/app/files/help/group"/>
+            <unit bldFile="/sf/app/files/deviceencryption/help/group"/>
           </component>
           <component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
             <unit bldFile="/sf/app/files/deviceencryption/group"/>
diff -r e754af35c291 -r e07166a29d4d symbian3/app/files/package_definition_3.0.xml
--- a/symbian3/app/files/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/app/files/package_definition_3.0.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -4,19 +4,19 @@
     <collection id="deviceencryption" name="Device Encryption" level="support">
 		<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->		
       <component id="devencnotifplugin" filter="s60" name="Device Encryption Notifier Plugin" class="plugin" introduced="^3">
-        <unit bldFile="devencnotifplugin/group"/>
+        <unit bldFile="deviceencryption/devencnotifplugin/group"/>
       </component>
       <component id="devencui" filter="s60" name="Device Encryption UI" introduced="^3">
-        <unit bldFile="devencui/group"/>
+        <unit bldFile="deviceencryption/devencui/group"/>
       </component>
       <component id="devencdmadapter" filter="s60" name="Device Encryption DM Adapter" class="plugin" introduced="^3">
-        <unit bldFile="devencdmadapter/group"/>
+        <unit bldFile="deviceencryption/devencdmadapter/group"/>
       </component>
       <component id="devencgsplugin" filter="s60" name="Device Encryption GS Plugin" class="plugin" introduced="^3">
-        <unit bldFile="devencgsplugin/group"/>
+        <unit bldFile="deviceencryption/devencgsplugin/group"/>
       </component>
       <component id="deviceencryption_help" filter="s60" name="Device Encryption Help" introduced="^3">
-        <unit bldFile="help/group"/>
+        <unit bldFile="deviceencryption/help/group"/>
       </component>
       <component id="deviceencryption_build" filter="s60" name="Device Encryption Build" introduced="^3">
         <unit bldFile="deviceencryption/group"/>
diff -r e754af35c291 -r e07166a29d4d symbian3/app/imgeditor/package_definition.xml
--- a/symbian3/app/imgeditor/package_definition.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/app/imgeditor/package_definition.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -164,9 +164,6 @@
             <!-- should distribute this to the other components -->
             <unit bldFile="/sf/app/imgeditor/imageeditorengine/group"/>
           </component>
-          <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>
         <collection name="imgeditor_info" long-name="Image Editor Apps Info" level="ui">
           <component name="imgeditor_plat" filter="s60" long-name="Image Editor Apps Platform Interfaces" class="api">
diff -r e754af35c291 -r e07166a29d4d symbian3/app/imgeditor/package_definition_3.0.xml
--- a/symbian3/app/imgeditor/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/app/imgeditor/package_definition_3.0.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -88,9 +88,6 @@
       	<!-- should distribute this to the other components -->
         <unit bldFile="imageeditorengine/group"/>
       </component>
-		<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>
     <collection id="imgeditor_info" name="Image Editor Apps Info" level="ui">
       <component id="imgeditor_plat" filter="s60" name="Image Editor Apps Platform Interfaces" class="api">
diff -r e754af35c291 -r e07166a29d4d symbian3/app/videoeditor/package_definition.xml
--- a/symbian3/app/videoeditor/package_definition.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/app/videoeditor/package_definition.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -128,9 +128,6 @@
             <!-- 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,test,api_test" long-name="Video Editor Engine API Tests" purpose="development">
-            <unit bldFile="/sf/app/videoeditor/videoeditorengine/tsrc/public/basic/group"/>
-          </component>
         </collection>
         <collection name="videoeditor_info" long-name="Video Editor Apps Info" level="ui">
           <component name="videoeditor_plat" filter="s60" long-name="Video Editor Apps Platform Interfaces" introduced="^2" class="api">
diff -r e754af35c291 -r e07166a29d4d symbian3/app/videoeditor/package_definition_3.0.xml
--- a/symbian3/app/videoeditor/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/app/videoeditor/package_definition_3.0.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -52,9 +52,6 @@
 		<!-- 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,test,api_test" name="Video Editor Engine API Tests" purpose="development">
-			<unit bldFile="videoeditorengine/tsrc/public/basic/group"/>
-		</component>                    
     </collection>
     <collection id="videoeditor_info" name="Video Editor Apps Info" level="ui">
       <component id="videoeditor_plat" filter="s60" name="Video Editor Apps Platform Interfaces" class="api" introduced="^2">
diff -r e754af35c291 -r e07166a29d4d symbian3/app/videotelephony/package_definition.xml
--- a/symbian3/app/videotelephony/package_definition.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/app/videotelephony/package_definition.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -79,7 +79,7 @@
       <block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
         <collection name="vtengines" long-name="Video Telephony Engines" level="engine">
           <component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-            <unit bldFile="/sf/app/videotelephony/vtengines/videoteleng/group"/>
+            <unit bldFile="/sf/app/videotelephony/vtengines/videoteleng/Group"/>
           </component>
           <component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
             <unit bldFile="/sf/app/videotelephony/vtengines/vtmediatorplugin/group"/>
@@ -92,10 +92,10 @@
         </collection>
         <collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
           <component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-            <unit bldFile="/sf/app/videotelephony/vtprotocolplugins/displaysink/group"/>
+            <unit bldFile="/sf/app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
           </component>
           <component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-            <unit bldFile="/sf/app/videotelephony/vtprotocolplugins/videosource/group"/>
+            <unit bldFile="/sf/app/videotelephony/vtprotocolplugins/VideoSource/group"/>
           </component>
         </collection>
         <collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
diff -r e754af35c291 -r e07166a29d4d symbian3/mw/mmmw/package_definition_3.0.xml
--- a/symbian3/mw/mmmw/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/mw/mmmw/package_definition_3.0.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -41,9 +41,6 @@
       <component id="metadatautility" filter="s60" name="Metadata Utility">
         <unit bldFile="mmserv/metadatautility/group"/>
       </component>
-      <component id="3gpextparserstub" filter="sf_build" name="3GPExt Parser Stub">
-        <unit bldFile="mmserv/metadatautility/3GPExtParserLib_stub/group"/>
-      </component>
       <component id="radioutility" filter="s60" name="Radio Utility">
         <unit bldFile="mmserv/radioutility/group"/>
       </component>
diff -r e754af35c291 -r e07166a29d4d symbian3/mw/securitysrv/package_definition.xml
--- a/symbian3/mw/securitysrv/package_definition.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/mw/securitysrv/package_definition.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -106,7 +106,7 @@
             <unit bldFile="/sf/mw/securitysrv/pkiutilities/devicetoken/group"/>
           </component>
           <component name="certificates" filter="s60" long-name="Certificates">
-            <unit bldFile="/sf/mw/securitysrv/pkiutilities/certificates/group" filter="sf_build"/>
+            <unit bldFile="/sf/mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
           </component>
           <component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
             <!-- need to split this into the above components -->
diff -r e754af35c291 -r e07166a29d4d symbian3/mw/uiresources/package_definition.xml
--- a/symbian3/mw/uiresources/package_definition.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -119,6 +119,9 @@
           <component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
             <unit bldFile="/sf/mw/uiresources/uigraphics/aknicon/group"/>
           </component>
+          <component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
+            <unit bldFile="/sf/mw/uiresources/uigraphics/nvgrenderstage/group"/>
+          </component>
         </collection>
         <collection name="layouts" long-name="Layouts" level="plugin">
           <component name="cdl" filter="s60" long-name="Customization Definition Language">
diff -r e754af35c291 -r e07166a29d4d symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -101,9 +101,9 @@
 <SystemDefinition schema="3.0.0">
   <systemModel name="Symbian^3">
     <layer id="adaptation" name="Adaptation" levels="hw-if">
-      <package id="qemu" level="hw-if" href="../../../../adaptation/qemu/package_definition_3.0.xml"/>
-      <package id="beagleboard" level="hw-if" href="../../../../adaptation/beagleboard/package_definition_3.0.xml"/>
-      <package id="stubs" level="hw-if" href="../../../../adaptation/stubs/package_definition_3.0.xml"/>
+      <package id="stubs" tech-domain="hb" level="high" href="../../../../adaptation/stubs/package_definition_3.0.xml"/>
+      <package id="beagleboard" tech-domain="hb" level="low" href="../../../../adaptation/beagleboard/package_definition_3.0.xml"/>
+      <package id="qemu" tech-domain="hb" level="low" href="../../../../adaptation/qemu/package_definition_3.0.xml"/>
     </layer>
     <layer id="os" name="OS" levels="hw services">
       <package id="kernelhwsrv" level="hw" tech-domain="hb" href="../../../../os/kernelhwsrv/package_definition_3.0.xml"/>
diff -r e754af35c291 -r e07166a29d4d symbian3/os/deviceplatformrelease/package_definition_3.0.xml
--- a/symbian3/os/deviceplatformrelease/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/package_definition_3.0.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -80,7 +80,7 @@
       <component id="config" filter="s60" name="Config" class="config" purpose="development">
         <unit base="sf_config/config"/>
       </component>
-      <component id="sf_cenrep" filter="sf_build" name="ConE cenrep config" class="config" purpose="development">
+      <component id="cenrep" filter="sf_build" name="ConE Central Repository Config" class="config" purpose="development">
         <unit bldFile="sf_config/cenrep/group"/>
       </component>
     </collection>