# HG changeset patch
# User srilekhas<srilekhas@symbian.org>
# Date 1283771672 -3600
# Node ID dc02f08f223cbc4361a02d4579ecba69329b2e4e
# Parent  cffdeca15b48ec20060da1bdbd8db988cc9a267b# Parent  1c41ebac4cf0c571aa036accfec072526d28914e
Merge

diff -r 1c41ebac4cf0 -r dc02f08f223c symbian4/single/sources_bulk.csv
--- a/symbian4/single/sources_bulk.csv	Thu Sep 02 17:24:22 2010 +0100
+++ b/symbian4/single/sources_bulk.csv	Mon Sep 06 12:14:32 2010 +0100
@@ -2,10 +2,12 @@
 http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,NON-NOKIA
 http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,NON-NOKIA
 http://developer.symbian.org/oss/MCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,branch,default,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adaptation/openmaxil.nokia/,/sf/adaptation/openmaxil.nokia,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,NON-NOKIA
 http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/calendarwidget/,/sf/app/calendarwidget,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/commonemail/,/sf/app/commonemail,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/contacts/,/sf/app/contacts,tag,tip_bulk,layers.sysdef.xml
@@ -16,7 +18,7 @@
 http://developer.symbian.org/oss/FCL/sf/app/helps/,/sf/app/helps,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/homescreen/,/sf/app/homescreen,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/homescreentools/,/sf/app/homescreentools,tag,tip_bulk,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/jrt/,/sf/app/jrt,tag,S4_PDK_FIX,
+http://developer.symbian.org/oss/FCL/sf/app/jrt/,/sf/app/jrt,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/internetradio/,/sf/app/internetradio,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/location/,/sf/app/location,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/messaging/,/sf/app/messaging,tag,tip_bulk,layers.sysdef.xml
@@ -33,6 +35,7 @@
 http://developer.symbian.org/oss/FCL/sf/app/settingsuis/,/sf/app/settingsuis,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/search/,/sf/app/search,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/techview/,/sf/app/techview,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/testtools/,/sf/app/testtools,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/videoplayer/,/sf/app/videoplayer,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/videotelephony/,/sf/app/videotelephony,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/webuis/,/sf/app/webuis,tag,tip_bulk,layers.sysdef.xml
@@ -73,11 +76,11 @@
 http://developer.symbian.org/oss/FCL/sf/mw/phonesrv/,/sf/mw/phonesrv,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/qt/,/sf/mw/qt,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/qtextensions/,/sf/mw/qtextensions,tag,tip_bulk,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/qtmobility/,/sf/mw/qtmobility,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/qtmobility/,/sf/mw/qtmobility,tag,S4_PDK_FIX,
 http://developer.symbian.org/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/searchsrv/,/sf/mw/searchsrv,tag,tip_bulk,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/securitysrv/,/sf/mw/securitysrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/securitysrv/,/sf/mw/securitysrv,tag,S4_PDK_FIX,
 http://developer.symbian.org/oss/FCL/sf/mw/serviceapi/,/sf/mw/serviceapi,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,tag,tip_bulk,layers.sysdef.xml
@@ -98,7 +101,8 @@
 http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/commsfw/,/sf/os/commsfw,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,tag,S4_PDK_FIX,
-http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,tag,S4_PDK_FIX,
+http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/fshell/,/sf/os/fshell,branch,default,NON_NOKIA
 http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,tag,S4_PDK_FIX,
 http://developer.symbian.org/oss/FCL/sf/os/imagingext/,/sf/os/imagingext,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,tag,S4_PDK_FIX,
@@ -113,7 +117,7 @@
 http://developer.symbian.org/oss/FCL/sf/os/persistentdata/,/sf/os/persistentdata,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,tag,S4_PDK_FIX,
-http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,tag,tip_bulk,
+http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,tag,S4_PDK_FIX,
 http://developer.symbian.org/oss/FCL/sf/os/wlan/,/sf/os/wlan,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/xmlsrv/,/sf/os/xmlsrv,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,tag,tip_bulk,layers.sysdef.xml
diff -r 1c41ebac4cf0 -r dc02f08f223c symbian4/single/sysdefs/system_model.xml
--- a/symbian4/single/sysdefs/system_model.xml	Thu Sep 02 17:24:22 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Mon Sep 06 12:14:32 2010 +0100
@@ -304,9 +304,6 @@
 <component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
 </component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
 <component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
 <!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
 <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/display" mrp="os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
@@ -343,6 +340,9 @@
 <component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
 </component>
+<component name="automounter" long-name="Automounter" filter="gt" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/automounter" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/automounter/base_f32_automounter.mrp"/>
+</component>
 <component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
 <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
 </component>
@@ -2077,6 +2077,11 @@
 <unit bldFile="os/mm/eaacplusutil_stub/group"/>
 </component>
 </collection>
+<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
+<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
+<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+</component>
+</collection>
 <collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
 <component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
 <unit bldFile="os/mm/mmlibs/mmutilitylib/group" mrp="os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
@@ -2086,9 +2091,6 @@
 </component>
 </collection>
 <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/imagingplugins/group" mrp="os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-</component>
 <component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
 <unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
 </component>
@@ -2315,9 +2317,6 @@
 <component name="openwfc_ri_displaychannel" long-name="OpenWFC RI Display Channel" introduced="^4" purpose="optional">
 <unit bldFile="os/graphics/graphicscomposition/openwfc_ri_displaychannel/group" mrp="os/graphics/graphicscomposition/openwfc_ri_displaychannel/group/openwfc_ri_displaychannel.mrp"/>
 </component>
-<component name="openwfc_ri_displayupdater" long-name="OpenWFC RI Display Update" introduced="^4" purpose="optional">
-<unit bldFile="os/graphics/graphicscomposition/openwfc_ri_displayupdater/group" mrp="os/graphics/graphicscomposition/openwfc_ri_displayupdater/group/openwfc_ri_displayupdater.mrp"/>
-</component>
 </collection>
 <collection name="graphicstest" long-name="Graphics Test" level="app-if">
 <component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
@@ -2898,7 +2897,7 @@
 <unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
 </component>
 <component name="powersaveutilities" long-name="Power Save Utilities" filter="s60" purpose="optional">
-<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
+<unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities" proFile="powersaveutilities.pro"/>
 </component>
 <component name="gsserverenginestub" long-name="GS Server Engine Stub" deprecated="^4" filter="s60" purpose="optional">
 <unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
@@ -4467,7 +4466,7 @@
 </collection>
 <collection name="qcpix" long-name="Qt CPIX" level="engine">
 <component name="qcpix_build" long-name="Qt CPIX Build" introduced="^4" purpose="optional">
-<unit bldFile="mw/searchsrv/qcpix" proFile="qcpix.pro"/>
+<unit bldFile="mw/searchsrv/qcpix" proFile="cpix.pro"/>
 </component>
 </collection>
 <collection name="searchsrv_info" long-name="Search Services Info">
@@ -4502,9 +4501,6 @@
 <component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" purpose="optional" class="api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
 </component>
-<component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" purpose="optional" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-</component>
 <component name="syncml_client_api" long-name="SyncML Client API" filter="s60" purpose="optional" class="api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
 </component>
@@ -4565,9 +4561,6 @@
 <component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" purpose="optional" class="api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
 </component>
-<component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" purpose="optional" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-</component>
 <component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" purpose="optional" class="api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
 </component>
@@ -4661,7 +4654,7 @@
 </collection>
 <collection name="devicemgmtnotifications" long-name="Device Management Notifications" level="server">
 <component name="devicemgmtnotifications_rom" long-name="DM Notifications ROM" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="mw/remotemgmt/devicemgmtnotifications/rom"/>
+<unit bldFile="mw/remotemgmt/devicemgmtnotifications/group"/>
 </component>
 <component name="dmdevdialogclient" long-name="DM Device Dialog Client" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="mw/remotemgmt/devicemgmtnotifications/dmdevdialogclient/bld"/>
@@ -4750,9 +4743,6 @@
 <component name="backupengine" long-name="Backup Engine" introduced="9.0" filter="s60" purpose="optional">
 <unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
 </component>
-<component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-</component>
 </collection>
 <collection name="obex" long-name="OBEX" level="generic">
 <component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
@@ -5041,9 +5031,6 @@
 <component name="btindicator" long-name="Bluetooth Indicator" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="mw/btservices/bluetoothengine/btindicator" proFile="btindicator.pro"/>
 </component>
-<component name="bluetoothengine_conf" long-name="Bluetooth Engine Config" introduced="^4" filter="s60" purpose="optional" class="config">
-<unit bldFile="mw/btservices/bluetoothengine/conf"/>
-</component>
 </collection>
 <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
 <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
@@ -6270,9 +6257,6 @@
 <component name="aknglobalui" long-name="Avkon Global UI" filter="s60" purpose="optional">
 <unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
 </component>
-<component name="ganes" long-name="Ganes" filter="s60" purpose="optional">
-<unit bldFile="mw/classicui/uifw/ganes/group"/>
-</component>
 </collection>
 <collection name="commonuis" long-name="Common UIs" level="specific">
 <component name="commonui" long-name="Common UI" filter="s60" purpose="optional">
@@ -6287,18 +6271,6 @@
 <unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
 </component>
 </collection>
-<collection name="commonadapter" long-name="Common Adapter" level="support">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" long-name="Common Adapter Build" filter="s60" purpose="optional">
-<unit bldFile="mw/classicui/commonadapter/group"/>
-</component>
-</collection>
-<collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
-<!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" long-name="Avkon Touch Gesture Framework Build" introduced="^3" filter="s60" purpose="optional">
-<unit bldFile="mw/classicui/akntouchgesturefw/group"/>
-</component>
-</collection>
 <collection name="uiutils" long-name="UI Utils" level="specific">
 <component name="localizer" long-name="Directory Localizer" filter="s60" purpose="optional">
 <unit bldFile="mw/classicui/uiutils/localizer/group"/>
@@ -6306,12 +6278,6 @@
 <component name="findutil" long-name="Find Utility" filter="s60" purpose="optional">
 <unit bldFile="mw/classicui/uiutils/findutil/group"/>
 </component>
-<component name="gamerecognizer" long-name="Game Recognizer" filter="s60" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/uiutils/gamerecognizer/group"/>
-</component>
-<component name="aknjapanesereading" long-name="Avkon Japanese Reading" filter="s60" purpose="optional">
-<unit bldFile="mw/classicui/uiutils/aknjapanesereading/group"/>
-</component>
 <component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst" purpose="optional">
 <unit bldFile="mw/classicui/uiutils/hlplch/group"/>
 </component>
@@ -6377,9 +6343,6 @@
 <!-- component is at collection level. Needs to be moved down a directory -->
 <unit bldFile="mw/svgt/svgtopt/group"/>
 </component>
-<component name="svgtplugin" long-name="SVG Plugin" introduced="9.2" filter="s60" purpose="optional" plugin="Y">
-<unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
-</component>
 </collection>
 </block>
 <block name="uiaccelerator" level="generic" levels="plugin framework server ex if" long-name="UI Accelerator">
@@ -6777,7 +6740,10 @@
 </component>
 </collection>
 <collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<component name="ncdengine_build" long-name="NCD Engine" introduced="^1" filter="s60" purpose="optional">
+<component name="ncdengine_build" long-name="NCD API" introduced="^1" filter="s60" purpose="optional">
+<unit bldFile="mw/appinstall/ncdengine/group"/>
+</component>
+<component name="ncdengine_engine" long-name="NCD Engine" introduced="^1" filter="s60" purpose="optional">
 <unit bldFile="mw/appinstall/ncdengine/engine" proFile="engine.pro" qmakeArgs="-r"/>
 </component>
 </collection>
@@ -8258,11 +8224,11 @@
 </component>
 </collection>
 <collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="hbvideoplaybackview" long-name="HB Video Playback View" introduced="^4" filter="s60" purpose="optional" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
-</component>
-<component name="hbvideoplaybackviewplugin" long-name="HB Video Playback View Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
+<component name="videoplaybackview" long-name="HB Video Playback View" introduced="^4" filter="s60" purpose="optional" plugin="Y">
+<unit bldFile="app/videoplayer/videoplayback/videoplaybackview" proFile="videoplaybackview.pro" qmakeArgs="-r"/>
+</component>
+<component name="videoplaybackviewplugin" long-name="HB Video Playback View Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
+<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin" proFile="videoplaybackviewplugin.pro" qmakeArgs="-r"/>
 </component>
 <component name="videohelix" long-name="Video Helix" introduced="^3" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
@@ -8499,6 +8465,11 @@
 </block>
 <block name="homescreen" level="apps" levels="support task ss hs" long-name="Home Screen Apps">
 <collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
+<collection name="homescreen_plat" long-name="Home Screen Platform API" level="support">
+<component name="homescreen_plat_build" long-name="Home Screen Platform API Build" purpose="optional">
+<unit bldFile="app/homescreen/homescreen_plat" proFile="homescreen_plat.pro"/>
+</component>
+</collection>
 <collection name="homescreenapp" long-name="Home Screen Application" level="hs">
 <component name="hsutils" long-name="Home Screen Utils" introduced="^4" purpose="optional">
 <unit bldFile="app/homescreen/homescreenapp/hsutils" proFile="hsutils.pro" qmakeArgs="-r -config rom"/>
@@ -8506,9 +8477,6 @@
 <component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4" purpose="optional">
 <unit bldFile="app/homescreen/homescreenapp/hsdomainmodel" proFile="hsdomainmodel.pro" qmakeArgs="-r -config rom"/>
 </component>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" purpose="optional" plugin="Y">
-<unit bldFile="app/homescreen/homescreenapp/runtimeplugins" proFile="runtimeplugins.pro" qmakeArgs="-r -config rom"/>
-</component>
 <component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" purpose="optional" plugin="Y">
 <unit bldFile="app/homescreen/homescreenapp/serviceproviders" proFile="serviceproviders.pro" qmakeArgs="-r -config rom"/>
 </component>
@@ -8530,9 +8498,6 @@
 <component name="hswidgetuninstaller" long-name="HS Widget Uninstaller" introduced="^4" purpose="optional">
 <unit bldFile="app/homescreen/homescreenapp/hswidgetuninstaller" proFile="hswidgetuninstaller.pro" qmakeArgs="-r -config rom"/>
 </component>
-<component name="homescreenapp_rom" long-name="Home Screen App ROM" introduced="^4" purpose="optional">
-<unit bldFile="app/homescreen/homescreenapp" proFile="homescreenapp_exports_to_rom.pri" qmakeArgs="-r -config rom"/>
-</component>
 </collection>
 <collection name="screensaver" long-name="Screen Saver" level="ss">
 <!-- break collection into components, or move down a dir and make it a component -->
@@ -8699,14 +8664,6 @@
 </collection>
 </block>
 <block name="techview" level="apps" span="2" levels="services ui utils apps1 apps2 apps3" long-name="Techview">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" introduced="9.1" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</collection>
 <collection name="techviewplat" long-name="Techview Platform" level="services"/>
 <collection name="techviewui" long-name="Techview UI" level="ui"/>
 <collection name="tv_controlpanel" long-name="Control Panel" level="ui"/>
diff -r 1c41ebac4cf0 -r dc02f08f223c symbian4/single/sysdefs/system_model_3.0.xml
--- a/symbian4/single/sysdefs/system_model_3.0.xml	Thu Sep 02 17:24:22 2010 +0100
+++ b/symbian4/single/sysdefs/system_model_3.0.xml	Mon Sep 06 12:14:32 2010 +0100
@@ -243,9 +243,6 @@
       <component id="btrace" name="Kernel Trace Tool" purpose="mandatory" target="device">
         <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/trace" mrp="/os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
       </component>
-      <component id="cameraldd" name="Camera Drivers" introduced="^3" purpose="optional" target="device">
-        <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="/os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-      </component>
       <component id="displayldd" name="Display Drivers" introduced="^3" purpose="optional" target="device">
         <!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
         <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/display" mrp="/os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
@@ -282,6 +279,9 @@
       <component id="fileserver" name="File Server" filter="gt" purpose="mandatory" target="device">
         <unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
       </component>
+      <component id="automounter" name="Automounter" filter="gt" purpose="mandatory" target="device">
+        <unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/automounter" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/automounter/base_f32_automounter.mrp"/>
+      </component>
       <component id="estart" name="Base Starter" filter="gt" purpose="optional" target="device">
         <unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
       </component>
@@ -2278,6 +2278,12 @@
     <unit bldFile="/os/mm/eaacplusutil_stub/group"/>
    </component>
   </collection>
+  <collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
+   <component id="camerafw" name="Camera Framework" introduced="7.0s" purpose="optional" target="device">
+    <unit bldFile="/os/mm/imagingandcamerafws/camerafw/group" mrp="/os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+   </component>
+   
+  </collection>
   <collection id="mmlibs" name="Multimedia Libraries" level="middleware">
    <component id="mmutilitylib" name="Multimedia Utility Library" introduced="8.1" purpose="mandatory" target="device">
     <unit bldFile="/os/mm/mmlibs/mmutilitylib/group" mrp="/os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
@@ -2287,9 +2293,6 @@
    </component>
   </collection>
   <collection id="mmplugins" name="Multimedia Plugins" level="middleware">
-   <component id="imagingplugins" name="Imaging Plugins" introduced="7.0s" purpose="optional" class="plugin" target="device">
-    <unit bldFile="/os/mm/mmplugins/imagingplugins/group" mrp="/os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-   </component>
    <component id="cameraplugins" name="Camera Plugins" introduced="7.0s" purpose="optional" class="plugin" target="device">
     <unit bldFile="/os/mm/mmplugins/cameraplugins/group" mrp="/os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
    </component>
@@ -2547,9 +2550,6 @@
      <component id="openwfc_ri_displaychannel" name="OpenWFC RI Display Channel" introduced="^4" purpose="optional" target="device">
       <unit bldFile="/os/graphics/graphicscomposition/openwfc_ri_displaychannel/group" mrp="/os/graphics/graphicscomposition/openwfc_ri_displaychannel/group/openwfc_ri_displaychannel.mrp"/>
      </component>
-     <component id="openwfc_ri_displayupdater" name="OpenWFC RI Display Update" introduced="^4" purpose="optional" target="device">
-      <unit bldFile="/os/graphics/graphicscomposition/openwfc_ri_displayupdater/group" mrp="/os/graphics/graphicscomposition/openwfc_ri_displayupdater/group/openwfc_ri_displayupdater.mrp"/>
-     </component>
     </collection>
     <collection id="graphicstest" name="Graphics Test" level="app-if">
       
@@ -3216,7 +3216,7 @@
     <unit bldFile="/mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
    </component>
    <component id="powersaveutilities" name="Power Save Utilities" filter="s60" target="device" purpose="optional">
-    <unit bldFile="/mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
+    <unit bldFile="/mw/appsupport/coreapplicationuis/powersaveutilities" qt:proFile="powersaveutilities.pro"/>
    </component>
    <component id="gsserverenginestub" name="GS Server Engine Stub" deprecated="^4" filter="s60" target="device" purpose="optional">
     <unit bldFile="/mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
@@ -4981,7 +4981,7 @@
     </collection>
     <collection id="qcpix" name="Qt CPIX" level="engine">     
     <component id="qcpix_build" name="Qt CPIX Build" introduced="^4" target="device" purpose="optional">
-      <unit bldFile="/mw/searchsrv/qcpix" qt:proFile="qcpix.pro"/>
+      <unit bldFile="/mw/searchsrv/qcpix" qt:proFile="cpix.pro"/>
      </component>
     </collection>
     <collection id="searchsrv_info" name="Search Services Info">
@@ -5024,10 +5024,6 @@
     
     <unit bldFile="/mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
    </component>
-   <component id="syncml_notifier_api" name="SyncML Notifier API" filter="s60" class="api" target="device" purpose="optional">
-    
-    <unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-   </component>
    <component id="syncml_client_api" name="SyncML Client API" filter="s60" class="api" target="device" purpose="optional">
     
     <unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
@@ -5108,10 +5104,6 @@
     
     <unit bldFile="/mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
    </component>
-   <component id="syncml_notifier_roaming_api" name="SyncML Notifier Roaming API" filter="s60" class="api" target="device" purpose="optional">
-    
-    <unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-   </component>
    <component id="dcmo_adapter_api" name="DCMO Adapter API" filter="s60" class="api" target="device" purpose="optional">
     <unit bldFile="/mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
    </component>
@@ -5207,7 +5199,7 @@
   </collection>
   <collection id="devicemgmtnotifications" name="Device Management Notifications" level="server">
    <component id="devicemgmtnotifications_rom" name="DM Notifications ROM" introduced="^4" filter="s60" target="device" purpose="optional">
-    <unit bldFile="/mw/remotemgmt/devicemgmtnotifications/rom"/>
+    <unit bldFile="/mw/remotemgmt/devicemgmtnotifications/group"/>
    </component>
    <component id="dmdevdialogclient" name="DM Device Dialog Client" introduced="^4" filter="s60" target="device" purpose="optional">
     <unit bldFile="/mw/remotemgmt/devicemgmtnotifications/dmdevdialogclient/bld"/>
@@ -5299,9 +5291,7 @@
    <component id="backupengine" name="Backup Engine" introduced="9.0" filter="s60" purpose="optional" target="device">
     <unit bldFile="/mw/remoteconn/backupandrestore/backupengine/group" mrp="/mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
    </component>
-   <component id="backuptest" name="Backup Test" introduced="^2" purpose="development" target="device">
-    <unit bldFile="/mw/remoteconn/backupandrestore/backuptest/group" mrp="/mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-   </component>
+   
   </collection>
   <collection id="obex" name="OBEX" level="generic">
    <component id="obexprotocol" name="OBEX Protocol" introduced="9.1" purpose="optional" target="device">
@@ -5643,9 +5633,6 @@
    <component id="btindicator" name="Bluetooth Indicator" introduced="^4" filter="s60" target="device" purpose="optional">
     <unit bldFile="/mw/btservices/bluetoothengine/btindicator" qt:proFile="btindicator.pro"/>
    </component>
-   <component id="bluetoothengine_conf" name="Bluetooth Engine Config" introduced="^4" filter="s60" class="config" target="device" purpose="optional">
-    <unit bldFile="/mw/btservices/bluetoothengine/conf"/>
-   </component>
   </collection>
   <collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
    <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional" target="device">
@@ -7280,9 +7267,6 @@
    <component id="aknglobalui" name="Avkon Global UI" filter="s60" target="device" purpose="optional">
     <unit bldFile="/mw/classicui/uifw/aknglobalui/group"/>
    </component>
-   <component id="ganes" name="Ganes" filter="s60" target="device" purpose="optional">
-    <unit bldFile="/mw/classicui/uifw/ganes/group"/>
-   </component>
   </collection>
   <collection id="commonuis" name="Common UIs" level="specific">
    <component id="commonui" name="Common UI" filter="s60" target="device" purpose="optional">
@@ -7297,18 +7281,6 @@
     <unit bldFile="/mw/classicui/applicationinterworkingfw/servicehandler/group"/>
    </component>
   </collection>
-  <collection id="commonadapter" name="Common Adapter" level="support">
-   <!-- the collection is really a component. Move down a directory.-->
-   <component id="commonadapter_build" name="Common Adapter Build" filter="s60" target="device" purpose="optional">
-    <unit bldFile="/mw/classicui/commonadapter/group"/>
-   </component>
-  </collection>
-  <collection id="akntouchgesturefw" name="Avkon Touch Gesture Framework" level="generic">
-   <!-- the collection is really a component. Move down a directory.-->
-   <component id="akntouchgesturefw_build" name="Avkon Touch Gesture Framework Build" introduced="^3" filter="s60" target="device" purpose="optional">
-    <unit bldFile="/mw/classicui/akntouchgesturefw/group"/>
-   </component>
-  </collection>
   <collection id="uiutils" name="UI Utils" level="specific">
    <component id="localizer" name="Directory Localizer" filter="s60" target="device" purpose="optional">
     <unit bldFile="/mw/classicui/uiutils/localizer/group"/>
@@ -7316,12 +7288,6 @@
    <component id="findutil" name="Find Utility" filter="s60" target="device" purpose="optional">
     <unit bldFile="/mw/classicui/uiutils/findutil/group"/>
    </component>
-   <component id="gamerecognizer" name="Game Recognizer" filter="s60" class="plugin" target="device" purpose="optional">
-    <unit bldFile="/mw/classicui/uiutils/gamerecognizer/group"/>
-   </component>
-   <component id="aknjapanesereading" name="Avkon Japanese Reading" filter="s60" target="device" purpose="optional">
-    <unit bldFile="/mw/classicui/uiutils/aknjapanesereading/group"/>
-   </component>
    <component id="hlplch" name="Help Launcher" filter="s60,bldfirst" target="device" purpose="optional">
       <unit bldFile="/mw/classicui/uiutils/hlplch/group"/>
    </component>
@@ -7390,9 +7356,6 @@
     <!-- component is at collection level. Needs to be moved down a directory -->
     <unit bldFile="/mw/svgt/svgtopt/group"/>
    </component>
-   <component id="svgtplugin" name="SVG Plugin" introduced="9.2" filter="s60" class="plugin" target="device" purpose="optional">
-    <unit bldFile="/mw/svgt/svgtopt/svgtplugin/group"/>
-   </component>
   </collection>
  </package>
       <package id="uiaccelerator" level="generic" tech-domain="ui" levels="plugin framework server ex if" name="UI Accelerator">
@@ -7864,7 +7827,10 @@
    </component>
   </collection>
     <collection id="ncdengine" name="Nokia Content Discover" level="framework">
-      <component id="ncdengine_build" name="NCD Engine" introduced="^1" filter="s60" target="device" purpose="optional">
+      <component id="ncdengine_build" name="NCD API" introduced="^1" filter="s60" target="device" purpose="optional">
+        <unit bldFile="/mw/appinstall/ncdengine/group"/>
+      </component>
+      <component id="ncdengine_engine" name="NCD Engine" introduced="^1" filter="s60" target="device" purpose="optional">
         <unit bldFile="/mw/appinstall/ncdengine/engine" qt:proFile="engine.pro" qt:qmakeArgs="-r"/>
       </component>
     </collection>
@@ -9478,11 +9444,11 @@
    </component>
   </collection>
   <collection id="videoplayback" name="Video Playback Plugins" level="plugin">
-   <component id="hbvideoplaybackview" name="HB Video Playback View" introduced="^4" filter="s60" class="plugin" target="device" purpose="optional">
-    <unit bldFile="/app/videoplayer/videoplayback/hbvideoplaybackview" qt:proFile="hbvideoplaybackview.pro" qt:qmakeArgs="-r"/>
-   </component>
-   <component id="hbvideoplaybackviewplugin" name="HB Video Playback View Plugin" introduced="^4" filter="s60" class="plugin" target="device" purpose="optional">
-    <unit bldFile="/app/videoplayer/videoplayback/hbvideoplaybackviewplugin" qt:proFile="hbvideoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
+   <component id="videoplaybackview" name="HB Video Playback View" introduced="^4" filter="s60" class="plugin" target="device" purpose="optional">
+    <unit bldFile="/app/videoplayer/videoplayback/videoplaybackview" qt:proFile="videoplaybackview.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="videoplaybackviewplugin" name="HB Video Playback View Plugin" introduced="^4" filter="s60" class="plugin" target="device" purpose="optional">
+    <unit bldFile="/app/videoplayer/videoplayback/videoplaybackviewplugin" qt:proFile="videoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
    </component>
    <component id="videohelix" name="Video Helix" introduced="^3" filter="s60" class="plugin" target="device" purpose="optional">
 	  <meta rel="testbuild" type="auto">
@@ -9723,9 +9689,14 @@
     </collection>
   </package>
       <package id="homescreen" level="apps" tech-domain="ui" levels="support task ss hs" name="Home Screen Apps">
-    <collection id="homescreen_test" name="Home Screen Test" level="support">
-    
-    </collection>
+  <collection id="homescreen_test" name="Home Screen Test" level="support">
+    
+  </collection>
+  <collection id="homescreen_plat" name="Home Screen Platform API" level="support">
+    <component id="homescreen_plat_build" name="Home Screen Platform API Build" target="device" purpose="optional">
+      <unit bldFile="/app/homescreen/homescreen_plat" qt:proFile="homescreen_plat.pro"/>
+    </component>
+  </collection>
   <collection id="homescreenapp" name="Home Screen Application" level="hs">
 	<component id="hsutils" name="Home Screen Utils" introduced="^4" target="device" purpose="optional">
       <unit bldFile="/app/homescreen/homescreenapp/hsutils" qt:proFile="hsutils.pro" qt:qmakeArgs="-r -config rom"/>
@@ -9733,9 +9704,6 @@
 	<component id="hsdomainmodel" name="HS Domain Model" introduced="^4" target="device" purpose="optional">
       <unit bldFile="/app/homescreen/homescreenapp/hsdomainmodel" qt:proFile="hsdomainmodel.pro" qt:qmakeArgs="-r -config rom"/>
      </component>
-	<component id="hs_runtimeplugins" name="HS Runtime Plugins" introduced="^4" class="plugin" target="device" purpose="optional">
-      <unit bldFile="/app/homescreen/homescreenapp/runtimeplugins" qt:proFile="runtimeplugins.pro" qt:qmakeArgs="-r -config rom"/>
-     </component>
 	<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin" target="device" purpose="optional">
       <unit bldFile="/app/homescreen/homescreenapp/serviceproviders" qt:proFile="serviceproviders.pro" qt:qmakeArgs="-r -config rom"/>
      </component>
@@ -9757,10 +9725,7 @@
 	<component id="hswidgetuninstaller" name="HS Widget Uninstaller" introduced="^4" target="device" purpose="optional">
       <unit bldFile="/app/homescreen/homescreenapp/hswidgetuninstaller" qt:proFile="hswidgetuninstaller.pro" qt:qmakeArgs="-r -config rom"/>
      </component>
-	<component id="homescreenapp_rom" name="Home Screen App ROM" introduced="^4" target="device" purpose="optional">
-      <unit bldFile="/app/homescreen/homescreenapp" qt:proFile="homescreenapp_exports_to_rom.pri" qt:qmakeArgs="-r -config rom"/>
-     </component>
-    </collection>
+  </collection>
   <collection id="screensaver" name="Screen Saver" level="ss">
 	<!-- break collection into components, or move down a dir and make it a component -->
     <component id="screensaver_build" name="Screen Saver Build" target="device" purpose="optional">
@@ -9931,14 +9896,6 @@
     </collection>
   </package>
       <package id="techview" level="apps" span="2" tech-domain="ui" levels="services ui utils apps1 apps2 apps3" name="Techview">
-    <collection id="buildverification" name="Build Verification" level="services">
-     <component id="autosmoketest" name="Auto Smoke Test" introduced="9.1" filter="gt" purpose="development" target="device">
-        <unit bldFile="/app/techview/buildverification/autosmoketest/Group" mrp="/app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-      </component>
-      <component id="smoketest" name="Smoke Test" filter="gt" purpose="development" target="device">
-        <unit bldFile="/app/techview/buildverification/smoketest/Group" mrp="/app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-      </component>
-    </collection>
     <collection id="techviewplat" name="Techview Platform" level="services">