# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1263236271 0
# Node ID 36ce831e166d4b21794612e6399591cd0aa871f0
# Parent  e55ca893a34470dcd971a5108e676ce24e1ac6ec# Parent  da7538fcaf033aa973eb257f41caaa601490662e
Merge

diff -r e55ca893a344 -r 36ce831e166d symbian3/split/sources_staging_fcl.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/split/sources_staging_fcl.csv	Mon Jan 11 18:57:51 2010 +0000
@@ -0,0 +1,126 @@
+source,dst,type,pattern,sysdef
+//v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
+//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/conversations/,/sf/app/conversations,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/files/,/sf/app/files,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/gallery/,/sf/app/gallery,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/helps/,/sf/app/helps,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/homescreen/,/sf/app/homescreen,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/im/,/sf/app/im,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/imgvieweruis/,/sf/app/imgvieweruis,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/java/,/sf/app/java,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/location/,/sf/app/location,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/organizer/,/sf/app/organizer,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/phone/,/sf/app/phone,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/poc/,/sf/app/poc,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/printing/,/sf/app/printing,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/profile/,/sf/app/profile,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/radio/,/sf/app/radio,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/techview/,/sf/app/techview,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/utils/,/sf/app/utils,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/videocenter/,/sf/app/videocenter,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/webuis/,/sf/app/webuis,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/helix/,/sf/mw/helix,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/mds/,/sf/mw/mds,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_staging/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/uitools/,/sf/mw/uitools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_staging/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/web/,/sf/mw/web,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/bt/,/sf/os/bt,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/usb/,/sf/os/usb,branch,default,
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml
diff -r e55ca893a344 -r 36ce831e166d symbian3/split/sysdefs/system_model_os.xml
--- a/symbian3/split/sysdefs/system_model_os.xml	Mon Jan 11 18:55:37 2010 +0000
+++ b/symbian3/split/sysdefs/system_model_os.xml	Mon Jan 11 18:57:51 2010 +0000
@@ -98,17 +98,12 @@
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
 <block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="baseintegtests" long-name="Base Integration Testing" level="test">
-<component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3" purpose="development">
-<unit bldFile="os\kernelhwsrv\baseintegtests\baseintegrationtest\group" mrp="os\kernelhwsrv\baseintegtests\baseintegrationtest\group\base_integration_test.mrp"/>
-</component>
-</collection>
 <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
 <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
 <unit mrp="os\kernelhwsrv\brdbootldr\ubootldr\base_ubootldr.mrp"/>
 </component>
 </collection>
-<collection name="bsptemplate" long-name="BSP Template" level="hw-if">
+<collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
 <component name="asspandvariant" long-name="Template ASSP and Variant" introduced="6.0" purpose="development">
 <unit bldFile="os\kernelhwsrv\bsptemplate\asspandvariant\template_variant" mrp="os\kernelhwsrv\bsptemplate\asspandvariant\base_template.mrp"/>
 </component>
@@ -155,6 +150,14 @@
 <component name="cameraldd" long-name="Camera Drivers" introduced="tb92" 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" plugin="N">
+<!-- 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="kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
+</component>
+<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional" plugin="N">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\usbc" mrp="kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+</component>
 </collection>
 <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
 <component name="mediadrivers" long-name="Media Drivers" purpose="optional">
@@ -273,12 +276,8 @@
 <component name="e32tools" long-name="E32 Tools" deprecated="tb91" purpose="development" class="PC">
 <unit bldFile="os\buildtools\toolsandutils\e32tools\group" mrp="os\buildtools\toolsandutils\e32tools\group\tools_e32tools.mrp"/>
 </component>
-<component name="wincredistribution" long-name="WinC Redistribution" purpose="development">
-<unit mrp="os\buildtools\dist_os\redistributionwinceka2\tools_redistribution_winc.mrp"/>
-</component>
-<component name="additionalredistribution" long-name="Additional Redistribution" purpose="development">
-<unit mrp="os\buildtools\perltoolsplat_os\redistribution\additional_tools.mrp"/>
-</component>
+
+
 <component name="statapi" long-name="STAT API" filter="gt" purpose="development">
 <unit bldFile="os\buildtools\toolsandutils\statapi\source\statapi\console" mrp="os\buildtools\toolsandutils\statapi\group\testtools_stat_device_gt.mrp"/>
 </component>
@@ -376,6 +375,11 @@
 </collection>
 </block>
 <block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
+<component name="authenticationserver" long-name="Authentication Server" introduced="^3" purpose="optional" plugin="N">
+<unit bldFile="os\security\authenticationservices\authenticationserver\group" mrp="security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+</component>
+</collection>
 <collection name="authorisation" long-name="Authorisation" level="utilities">
 <component name="userpromptservice" long-name="User Prompt Service" introduced="tb92" purpose="mandatory">
 <unit bldFile="os\security\authorisation\userpromptservice\group" mrp="os\security\authorisation\userpromptservice\group\security_ups.mrp"/>
@@ -587,6 +591,9 @@
 <component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="tb92" purpose="optional" plugin="Y">
 <unit bldFile="os\lbs\datasourcemodules\networkpositioningmodule\group" mrp="os\lbs\datasourcemodules\networkpositioningmodule\group\lbs_network_positioning_module.mrp"/>
 </component>
+<component name="npeintegmodule" long-name="NPE Integration Module" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os\lbs\datasourcemodules\npeintegmodule\group" mrp="lbs/datasourcemodules/npeintegmodule/group/lbs_npeintegrationmodule.mrp"/>
+</component>
 </collection>
 <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
 <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="tb91" purpose="optional" plugin="Y">
@@ -631,9 +638,7 @@
 <unit bldFile="os\lbs\networkprotocolmodules\privacyprotocolmodule\group" mrp="os\lbs\networkprotocolmodules\privacyprotocolmodule\group\lbs_privacyprotocolmodule.mrp"/>
 </component>
 <component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="tb92" purpose="optional" plugin="Y" class="placeholder">
-<!-- PLACEHOLDER="DS.1806"
-        <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/group" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-		-->
+<unit bldFile="os\lbs\networkprotocolmodules\suplproxyprotocolmodule\group" mrp="lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
 </component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
@@ -668,12 +673,7 @@
 <component name="esockserver" long-name="ESock Server" purpose="mandatory">
 <unit bldFile="os\commsfw\datacommsserver\esockserver\group" mrp="os\commsfw\datacommsserver\esockserver\group\comms-infras_esock.mrp" version="3"/>
 </component>
-<component name="esockserverconfig" long-name="ESock Server Config" introduced="9.1" purpose="mandatory" class="config">
-<unit mrp="os\commsfw\datacommsserver\esockserver\group\comms-infras_esock-config.mrp" version="3"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="os\commsfw\datacommsserver\networkinterfacemgr\group" mrp="os\commsfw\datacommsserver\networkinterfacemgr\group\comms-infras_nifman.mrp" version="2"/>
-</component>
+
 <component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
 <unit bldFile="os\commsfw\datacommsserver\networkingdialogapi\group" mrp="os\commsfw\datacommsserver\networkingdialogapi\group\networking_dialog.mrp"/>
 </component>
@@ -772,20 +772,19 @@
 <component name="mbmsparameters" long-name="MBMS Parameters" introduced="tb92" purpose="optional" plugin="Y">
 <unit bldFile="os\networkingsrv\linklayercontrol\mbmsparameters\group" mrp="os\networkingsrv\linklayercontrol\mbmsparameters\group\networking_mbmsparams.mrp"/>
 </component>
+<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory" plugin="N">
+<unit bldFile="os\networkingsrv\linklayercontrol\networkinterfacemgr\group" mrp="networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
+</component>
 </collection>
 <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
 <component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
 <unit bldFile="os\networkingsrv\linklayerprotocols\ethernetnif\group" mrp="os\networkingsrv\linklayerprotocols\ethernetnif\group\networking_ether802.mrp"/>
 </component>
-<component name="ethernetpacketdriver" long-name="Ethernet Packet Driver" introduced="7.0" purpose="optional" plugin="Y">
-<unit mrp="os\networkingsrv\linklayerprotocols\ethernetpacketdriver\group\networking_etherdrv_srconly.mrp"/>
-</component>
+
 <component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
 <unit bldFile="os\networkingsrv\linklayerprotocols\pppnif\group" mrp="os\networkingsrv\linklayerprotocols\pppnif\group\networking_ppp.mrp" version="2"/>
 </component>
-<component name="pppconfig" long-name="PPP Config" introduced="ER5" purpose="optional" class="config">
-<unit mrp="os\networkingsrv\linklayerprotocols\pppnif\group\networking_ppp-config.mrp" version="2"/>
-</component>
+
 <component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
 <unit bldFile="os\networkingsrv\linklayerprotocols\slipnif\group" mrp="os\networkingsrv\linklayerprotocols\slipnif\group\networking_slip.mrp"/>
 </component>
@@ -799,9 +798,7 @@
 </component>
 </collection>
 <collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config">
-<unit mrp="os\networkingsrv\networkcontrol\qosfwconfig\qos\group\networking_qos-config.mrp"/>
-</component>
+
 <component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
 <unit bldFile="os\networkingsrv\networkcontrol\qoslib\group" mrp="os\networkingsrv\networkcontrol\qoslib\group\networking_qoslib.mrp"/>
 </component>
@@ -1121,11 +1118,6 @@
 </collection>
 </block>
 <block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\usbc" mrp="os\kernelhwsrv\kernel\eka\drivers\usbc\base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
 <collection name="usbmgmt" long-name="USB Management" level="server">
 <component name="usbmgr" long-name="USB Manager" purpose="optional">
 <unit bldFile="os\usb\usbmgmt\usbmgr\group" mrp="os\usb\usbmgmt\usbmgr\group\usb_manager.mrp" version="2"/>
@@ -1163,17 +1155,12 @@
 </collection>
 <collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
 <component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<!-- PLACEHOLDER="DEF137894" START REMOVE -->
-<unit bldFile="mw\mmmw\mmmiddlewarefws\mmutilitylib\group" mrp="mw\mmmw\mmmiddlewarefws\mmutilitylib\group\multimedia_common.mrp"/>
-<!-- PLACEHOLDER="DEF137894" END REMOVE -->
-<!-- PLACEHOLDER="DEF137894"
-		<unit bldFile="mmlibs/mmutilitylib/group" mrp="mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-		-->
+<unit bldFile="os\mm\mmlibs\mmutilitylib\group" mrp="mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
 </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\imagingandcamerafws\imagingfws\plugins\group" mrp="os\mm\imagingandcamerafws\imagingfws\plugins\group\multimedia_icl_plugin.mrp"/>
+<unit bldFile="os\mm\mmplugins\imagingplugins\group" mrp="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"/>
@@ -1436,9 +1423,6 @@
 </component>
 </collection>
 <collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<component name="displayldd" long-name="Display Drivers" introduced="tb92" purpose="optional">
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\display" mrp="os\kernelhwsrv\kernel\eka\drivers\display\base_e32_drivers_display.mrp"/>
-</component>
 <component name="surfacemgr" long-name="Surface Manager" introduced="tb92" purpose="optional">
 <unit bldFile="os\graphics\graphicshwdrivers\surfacemgr\group" mrp="os\graphics\graphicshwdrivers\surfacemgr\group\graphics_surfacemanager.mrp"/>
 </component>
@@ -1558,7 +1542,7 @@
 <unit bldFile="os\textandloc\charconvfw\charconvplugins\group" mrp="os\textandloc\charconvfw\charconvplugins\group\syslibs_charconv_plugins.mrp"/>
 </component>
 <component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os\kernelhwsrv\userlibandfileserver\fatfilenameconversionplugins\group" mrp="os\kernelhwsrv\userlibandfileserver\fatfilenameconversionplugins\group\syslibs_FATCharsetConv.mrp"/>
+<unit bldFile="os\textandloc\charconvfw\fatfilenameconversionplugins\group" mrp="textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
 </component>
 </collection>
 <collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
@@ -1599,7 +1583,7 @@
 </collection>
 <collection name="localesupport" long-name="Locale Support" level="util">
 <component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os\kernelhwsrv\localisation\localesupport" mrp="os\kernelhwsrv\localisation\localesupport\mmpfiles\base_loce32.mrp"/>
+<unit bldFile="os\textandloc\localisation\localesupport" mrp="textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
 </component>
 <component name="initlocale" long-name="Initialise Locale" introduced="tb91" purpose="mandatory" class="placeholder">
 <!-- placeholder for split from bafl -->
@@ -1627,6 +1611,9 @@
 <component name="libxml2libs" long-name="Libxml2 Libraries" introduced="tb92" purpose="optional">
 <unit bldFile="os\xmlsrv\xml\libxml2libs\group" mrp="os\xmlsrv\xml\libxml2libs\group\syslibs_libxml2.mrp"/>
 </component>
+<component name="legacyminidomparser" introduced="7.0s" purpose="optional" plugin="N">
+<unit bldFile="os\xmlsrv\xml\legacyminidomparser\GROUP" mrp="xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
+</component>
 <component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="tb92" purpose="optional">
 <unit bldFile="os\xmlsrv\xml\xmldomandxpath\group" mrp="os\xmlsrv\xml\xmldomandxpath\group\syslibs_xmldom.mrp"/>
 </component>
@@ -1786,14 +1773,6 @@
 <component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
 <unit bldFile="mw\appsupport\tzpcside\tzcompiler\group" mrp="mw\appsupport\tzpcside\tzcompiler\group\app-services_tzcompiler.mrp"/>
 </component>
-<!--PLACEHOLDER="DS.1802" START REMOVE -->
-<component name="worlddatabasekit" long-name="World Database Kit" introduced="6.0" deprecated="9.1" purpose="development" class="config PC">
-<unit bldFile="mw\appsupport\tzpcside\worlddatabasekit\group" mrp="mw\appsupport\tzpcside\worlddatabasekit\group\app-services_wlddatabasekit_cedar.mrp"/>
-</component>
-<component name="worldtools" long-name="World Tools" introduced="ER5" deprecated="9.1" purpose="development" class="config PC">
-<unit bldFile="mw\appsupport\tzpcside\worldtools\group" mrp="mw\appsupport\tzpcside\worldtools\group\app-services_wldtools.mrp"/>
-</component>
-<!--PLACEHOLDER="DS.1802" END REMOVE -->
 </collection>
 <collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
 <component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="tb91" purpose="development" class="config PC">
@@ -1833,6 +1812,9 @@
 <component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
 <unit bldFile="mw\netprotocols\applayerprotocols\telnetengine\group" mrp="mw\netprotocols\applayerprotocols\telnetengine\group\networking_telnet_e.mrp"/>
 </component>
+<component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional" plugin="N">
+<unit bldFile="mw\netprotocols\applayerprotocols\httpservice\group" mrp="netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
+</component>
 </collection>
 <collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
 <component name="uripermissionservices" long-name="URI Permission Services" introduced="tb91" purpose="optional">
@@ -1946,9 +1928,6 @@
 </component>
 </collection>
 <collection name="usbfunctiondrivers" long-name="USB Function Drivers" level="server">
-<component name="massstoragemgr" long-name="Mass Storage Manager" introduced="tb92" purpose="optional">
-<unit bldFile="mw\remoteconn\usbfunctiondrivers\massstoragemgr\group" mrp="mw\remoteconn\usbfunctiondrivers\massstoragemgr\group\connectivity_usbms.mrp"/>
-</component>
 </collection>
 <collection name="connectivitytransports" long-name="Connectivity Transports" level="plugin">
 <component name="plpremotelink" long-name="PLP Remote Link" deprecated="9.0" purpose="optional">
@@ -1965,22 +1944,19 @@
 <component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="tb92" purpose="optional" plugin="Y">
 <unit bldFile="mw\remoteconn\mtptransports\mtpptpiptransport\group" mrp="mw\remoteconn\mtptransports\mtpptpiptransport\group\mtp_ptpip.mrp"/>
 </component>
+<component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="mw\remoteconn\mtptransports\mtpcontroller\group" mrp="remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
+</component>
 </collection>
 <collection name="mtpfws" long-name="MTP Frameworks" level="framework">
 <component name="mtpfw" long-name="MTP Framework" introduced="tb91" purpose="optional">
 <unit bldFile="mw\remoteconn\mtpfws\mtpfw\group" mrp="mw\remoteconn\mtpfws\mtpfw\group\mtp_framework.mrp"/>
 </component>
-<component name="mtpintegrationtest" long-name="MTP Integration Test" introduced="tb91" purpose="development">
-<unit bldFile="mw\remoteconn\mtpfws\mtpintegrationtest\group" mrp="mw\remoteconn\mtpfws\mtpintegrationtest\group\mtp_test.mrp"/>
-</component>
 </collection>
 <collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
 <component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="tb91" purpose="optional" plugin="Y">
 <unit bldFile="mw\remoteconn\mtpdataproviders\mtpfileandfolderdp\group" mrp="mw\remoteconn\mtpdataproviders\mtpfileandfolderdp\group\mtp_filedp.mrp"/>
 </component>
-<component name="mtpbackupandrestoredp" long-name="Backup and Restore Provider" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="mw\remoteconn\mtpdataproviders\mtpbackupandrestoredp\group" mrp="mw\remoteconn\mtpdataproviders\mtpbackupandrestoredp\group\mtp_backupnrestoredp.mrp"/>
-</component>
 </collection>
 <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
 <component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
@@ -1990,19 +1966,6 @@
 <unit bldFile="mw\remoteconn\backupandrestore\backuptest\group" mrp="mw\remoteconn\backupandrestore\backuptest\group\connectivity_backuptest.mrp"/>
 </component>
 </collection>
-<collection name="connectivitypcside" long-name="Connectivity PC Side" level="generic">
-<component name="chatscripts" long-name="Chat Scripts" purpose="development">
-<unit bldFile="mw\remoteconn\connectivitypcside\chatscripts\group" mrp="mw\remoteconn\connectivitypcside\chatscripts\group\testtools_chatscripts.mrp"/>
-</component>
-</collection>
-<collection name="connectivitydevicefws" long-name="Connectivity Device Frameworks" level="framework">
-<component name="connectivityfw" long-name="Connectivity Framework" introduced="7.0s" deprecated="tb91" purpose="optional">
-<unit bldFile="mw\remoteconn\connectivitydevicefws\connectivityfw\group" mrp="mw\remoteconn\connectivitydevicefws\connectivityfw\group\connectivity_framework.mrp"/>
-</component>
-<component name="connectivityservices" long-name="Connectivity Services" introduced="7.0s" deprecated="tb91" purpose="optional">
-<unit bldFile="mw\remoteconn\connectivitydevicefws\connectivityservices\group" mrp="mw\remoteconn\connectivitydevicefws\connectivityservices\group\connectivity_services.mrp"/>
-</component>
-</collection>
 <collection name="obex" long-name="OBEX" level="generic">
 <component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
 <unit bldFile="mw\remoteconn\obex\obexprotocol\group" mrp="mw\remoteconn\obex\obexprotocol\group\obex.mrp"/>
@@ -2042,11 +2005,6 @@
 <unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\group" mrp="mw\mmmw\mmmiddlewarefws\mmfw\group\multimedia_mmf.mrp"/>
 </component>
 </collection>
-<collection name="mmmiddlewareplugins" long-name="Multimedia Middleware Plugins" level="framework">
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\group_plugin" mrp="mw\mmmw\mmmiddlewarefws\mmfw\group_plugin\multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
 <collection name="mmfwtest" long-name="Multimedia Framework Test" level="server">
 <component name="mmfunittest" long-name="MMF Unit Tests" introduced="7.0s" purpose="development">
 <unit mrp="mw\mmmw\mmfwtest\mmfunittest\group\multimedia_unittest_mmf_source.mrp"/>
@@ -2054,14 +2012,8 @@
 <component name="mmfintegrationtest" long-name="MMF Integration Tests" introduced="7.0s" purpose="development">
 <unit mrp="mw\mmmw\mmfwtest\mmfintegrationtest\group\multimedia_inttest_mmf_source.mrp"/>
 </component>
-<component name="mmfcharacterisationvalidation" long-name="MMF Characterisation Validation" introduced="9.3" purpose="development">
-<unit bldFile="mw\mmmw\mmfwtest\mmfcharacterisationvalidation\group" mrp="mw\mmmw\mmfwtest\mmfcharacterisationvalidation\group\multimedia_mmf_char.mrp"/>
-</component>
 </collection>
 <collection name="mmvalidationsuite" long-name="Multimedia Validation Suite" level="specific">
-<component name="mmvalidationsuiteapp" long-name="Multimedia Validation Suite Application" introduced="tb91" purpose="development">
-<unit bldFile="mw\mmmw\mmvalidationsuite\mmvalidationsuiteapp\group" mrp="mw\mmmw\mmvalidationsuite\mmvalidationsuiteapp\group\multimedia_mvs_app.mrp"/>
-</component>
 <component name="mmvalidationsuiteagents" long-name="Multimedia Validation Suite Agents" introduced="tb91" purpose="development">
 <unit bldFile="mw\mmmw\mmvalidationsuite\mmvalidationsuiteagents\group" mrp="mw\mmmw\mmvalidationsuite\mmvalidationsuiteagents\group\multimedia_mvs_agents.mrp"/>
 </component>
diff -r e55ca893a344 -r 36ce831e166d symbian3/split/sysdefs/system_model_s60.xml
--- a/symbian3/split/sysdefs/system_model_s60.xml	Mon Jan 11 18:55:37 2010 +0000
+++ b/symbian3/split/sysdefs/system_model_s60.xml	Mon Jan 11 18:57:51 2010 +0000
@@ -91,11 +91,11 @@
   cwd CDATA #REQUIRED
   command CDATA #REQUIRED>
 ]>
-<SystemDefinition name="S60_SystemBuild + sysdef_dtd_1_4_0_xml + QuickOffice + adobereader + tfxserver + webvideo + wmdrmkeystorage_dist + wmdrmpd_dist + zipviewer + oemrndtools + swconfigapps + toolsextensions + avdomain + btaudioadaptation_stub + drm_stub + ocrsrv_stub + omasuplasnconverterstubimpl + posmsgpluginreferenceimpl + power_save_display_mode_stub + srsfenginestub + systemswstubs + tactileclickplugin_stub + wlanhwinit_stub + camera + commonemail + conntools + contacts + contentcontrol + conversations + devicecontrol + systemswextensions + files + gallery + graphicsuis + helps + homescreen + im + imgvieweruis + iptelephony + java + location + messaging + mmsharinguis + avdomain + organizer + phone + photos + printing + profile + radio + rndtools + screensaver + settingsuis + speechsrv + utils + video + videotelephony + avdomain + webuis + accesssec + appinstall + appsupport + btservices + camerasrv + classicui + dlnasrv + drm + gsprofilesrv + hapticsservices + avdomain + homescreensrv + imghandling + imsrv + inputmethods + ipappprotocols + ipappservices + ipconnmgmt + legacypresence + locationsrv + mds + messagingmw + metadatasrv + avdomain + avdomain + mmuifw + netprotocols + networkingdm + opensrv + phonesrv + platformtools + remoteconn + remotemgmt + remotestorage + securitysrv + serviceapi + serviceapifw + shortlinkconn + ossrv + svgt + uiaccelerator + uiresources + uitools + usbservices + videoutils + vpnclient + web + websrv + wirelessacc + cellularsrv + S60Extras + devicesrv + graphics + imagingext + lbs + avdomainosext + networkingsrv + osrndtools + ossrv + systemswextensions + wlan + xmlsrv + buildplatforms + homescreentools + swconfigtools" schema="1.4.0">
+<SystemDefinition name="S60_SystemBuild + sysdef_dtd_1_4_0_xml + QuickOffice + adobereader + webvideo + wmdrmkeystorage_dist + wmdrmpd_dist + zipviewer + s60platformrelease + oemrndtools + swconfigapps + avdomain + btaudioadaptation_stub + drm_stub + ocrsrv_stub + omasuplasnconverterstubimpl + posmsgpluginreferenceimpl + power_save_display_mode_stub + srsfenginestub + systemswstubs + tactileclickplugin_stub + wlanhwinit_stub + camera + commonemail + conntools + contacts + contentcontrol + conversations + devicecontrol + systemswextensions + files + gallery + graphicsuis + helps + homescreen + im + imgvieweruis + iptelephony + java + location + messaging + mmsharinguis + avdomain + organizer + phone + photos + printing + profile + radio + rndtools + screensaver + settingsuis + speechsrv + graphics + utils + video + videotelephony + avdomain + webuis + accesssec + appinstall + appsupport + btservices + camerasrv + classicui + dlnasrv + drm + gsprofilesrv + hapticsservices + avdomain + homescreensrv + imghandling + imsrv + inputmethods + ipappprotocols + ipappservices + ipconnmgmt + legacypresence + locationsrv + mds + messagingmw + metadatasrv + avdomain + avdomain + mmuifw + netprotocols + networkingdm + opensrv + phonesrv + platformtools + remoteconn + remotemgmt + remotestorage + securitysrv + serviceapi + serviceapifw + shortlinkconn + ossrv + svgt + uiaccelerator + uiresources + uitools + usbservices + videoutils + vpnclient + web + websrv + wirelessacc + bt + cellularsrv + deviceplatformrelease + devicesrv + graphics + imagingext + lbs + avdomainosext + networkingsrv + osrndtools + ossrv + systemswextensions + usb + wlan + xmlsrv + buildplatforms + homescreentools + swconfigtools" schema="1.4.0">
 <systemModel>
 	<layer name="os_layer">
-<module name="toolsextensions">
-        <unit unitID="tools.toolsextensions" mrp="" bldFile="ext/tools/toolsextensions/group" name="toolsextensions"/>
+<module name="bt">
+        <unit unitID="lcdo.bt" mrp="" bldFile="sf/os/bt/group" name="bt"/>
       </module>
 <module name="cellularsrv">
 				<unit name="cellularsrv" unitID="tsydo.cellularsrv" bldFile="sf/os/cellularsrv/group" mrp=""/>       
@@ -103,8 +103,14 @@
 <module name="S60Extras">
         <unit unitID="platform.S60Extras" mrp="" bldFile="sf/os/deviceplatformrelease/S60Extras/group" name="S60Extras"/>
       </module>
-<module name="S60LocFiles">
-        <unit unitID="platform.S60LocFiles" mrp="" bldFile="sf/os/deviceplatformrelease/S60LocFiles/group" filter="sf_build" name="S60LocFiles"/>
+<module name="locfiles">
+				<unit unitID="platform.locfiles" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group" filter="" name="locfiles"/>
+				<unit unitID="platform.locfiles.set1" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set1" filter="" name="locfiles_set1"/>
+				<unit unitID="platform.locfiles.set2" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set2" filter="" name="locfiles_set2"/>
+				<unit unitID="platform.locfiles.set3" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set3" filter="" name="locfiles_set3"/>
+				<unit unitID="platform.locfiles.set4" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set4" filter="" name="locfiles_set4"/>
+				<unit unitID="platform.locfiles.set5" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set5" filter="" name="locfiles_set5"/>
+				<unit unitID="platform.locfiles.set6" mrp="" bldFile="sf/os/deviceplatformrelease/locfiles/group/set6" filter="" name="locfiles_set6"/>
       </module>
 <module name="version">
         <unit unitID="platform.version" mrp="" bldFile="sf/os/deviceplatformrelease/Version/group" name="version"/>
@@ -141,6 +147,9 @@
 <module name="ossrv">                             
 <unit name="ossrv" unitID="mrtdo.ossrv" bldFile="sf/os/ossrv/group" mrp=""/>
 </module>
+<module name="usb">
+        <unit unitID="lcdo.usb" mrp="" bldFile="sf/os/usb/group" name="usb"/>
+      </module>
 <module name="wlan">
         <unit unitID="netdo.wlan" mrp="" bldFile="sf/os/wlan/group" name="wlan"/>
       </module>
@@ -149,7 +158,7 @@
       </module>
 <module name="sf_common_tsy">
 			<component name="sf_common_tsy">
-				<unit unitID="symbian.common_tsy" name="sf_common_tsy" bldFile="\sf\os\cellularsrv\telephonyserverplugins\common_tsy\group" mrp="" filter=""/>
+				<unit unitID="symbian.common_tsy" name="sf_common_tsy" bldFile="sf/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="" filter=""/>
 			</component>
 		</module>
 <module name="sf_openvg11">
@@ -179,7 +188,7 @@
 <unit unitID="sedo.securitysrv.pkiutilities.Certificates" bldFile="sf/mw/securitysrv/pkiutilities/Certificates/group" mrp="" filter="sf_build" name="sedo_securitysrv_pkiutilities_Certificates"/>
 </module>
 <module name="btservices">
-        <unit unitID="lcdo.btservices" mrp="" bldFile="\sf\mw\btservices\group" name="btservices"/>
+        <unit unitID="lcdo.btservices" mrp="" bldFile="sf/mw/btservices/group" name="btservices"/>
       </module>
 <module name="camerasrv">
         <unit unitID="imm.camerasrv" mrp="" bldFile="sf/mw/camerasrv/group" name="camerasrv"/>
@@ -219,10 +228,10 @@
         <unit unitID="abs.inputmethods" mrp="" bldFile="sf/mw/inputmethods/group" name="inputmethods"/>
       </module>
 <module name="ipappprotocols">
-  		<unit unitID="ipappprotocol" name="ipappprotocol" bldFile="\sf\mw\ipappprotocols\group" mrp=""/> 
+  		<unit unitID="ipapdo.ipappprotocols" name="ipappprotocols" bldFile="sf/mw/ipappprotocols/group" mrp=""/> 
       </module>
 <module name="ipappsrv">
-  		<unit unitID="ipappsrv" name="ipappservice" bldFile="\sf\mw\ipappsrv\group" mrp=""/> 
+  		<unit unitID="ipasdo.ipappsrv" name="ipappsrv" bldFile="sf/mw/ipappsrv/group" mrp=""/> 
       </module>
 <module name="ipconnmgmt">
         <unit unitID="netdo.ipconnmgmt" mrp="" bldFile="sf/mw/ipconnmgmt/group" name="ipconnmgmt"/>
@@ -307,7 +316,7 @@
 <unit name="serviceapifw" unitID="sapido.serviceapifw" bldFile="sf/mw/serviceapifw/group" mrp=""/>
 </module>
 <module name="shortlinkconn">
-        <unit unitID="lcdo.shortlinkconn" mrp="" bldFile="\sf\mw\shortlinkconn\group" name="shortlinkconn"/>
+        <unit unitID="lcdo.shortlinkconn" mrp="" bldFile="sf/mw/shortlinkconn/group" name="shortlinkconn"/>
       </module>
 <module name="upnp">                             
 <unit name="upnp" unitID="mrtdo.upnp" bldFile="sf/mw/srvdiscovery/upnp/group" mrp=""/>
@@ -326,7 +335,6 @@
         <unit unitID="lcdo.usbservices" mrp="" bldFile="sf/mw/usbservices/group" name="usbservices"/>
         <!-- MattD: I really need to FCL the component to Add in a couple of null bld.inf files, but I'll push it a bit further by doing this -->
         <unit unitID="more.usbservices" mrp="" bldFile="sf/mw/usbservices/usbservices_plat/group" name="usbservices_API"/>
-
       </module>
 <module name="videoutils">
         <unit unitID="vado.videoutils" mrp="" bldFile="sf/mw/videoutils/group" name="videoutils"/>
@@ -355,12 +363,7 @@
         <unit unitID="tools.oemrndtools" mrp="" bldFile="ext/tools/oemrndtools/group" name="oemrndtools"/>
       </module>
 <module name="">
-<unit unitID="java.java.java_plat" mrp="" bldFile="sf/app/java/java_plat/group" filter="sf_build" name="java_java_plat"/>
-<unit unitID="java.java.java_stubs" mrp="" bldFile="sf/app/java/java_stubs/group" filter="sf_build" name="java_java_stubs"/>
 <unit unitID="tools.rndtools.htiui" mrp="" bldFile="sf/app/rndtools/htiui/group" filter="sf_build" name="tools_rndtools_htiui"/></module>
-<module name="swconfigapps">
-        <unit unitID="tools.swconfigapps" mrp="" bldFile="ext/tools/swconfigapps/group" name="swconfigapps"/>
-      </module>
 <module name="camera">
         <unit unitID="imm.camera" mrp="" bldFile="sf/app/camera/group" name="camera"/>
         <unit unitID="imm.camera.help" mrp="" bldFile="sf/app/camera/camerauis/cameraapp/help/group" name="camera_help"/>
@@ -407,6 +410,9 @@
 <module name="iptelephony">
         <unit name="iptelephony" unitID="te.iptelephony" bldFile="sf/app/iptelephony/group" mrp=""/>
       </module>
+<module name="java">
+<unit unitID="java.java.java_plat" mrp="" bldFile="sf/app/java/java_plat/group" filter="sf_build" name="java_java_plat"/>
+<unit unitID="java.java.java_stubs" mrp="" bldFile="sf/app/java/java_stubs/group" filter="sf_build" name="java_java_stubs"/></module>
 <module name="location">
         <unit unitID="lodo.location" mrp="" bldFile="sf/app/location/group" name="location"/>
       </module>
@@ -414,7 +420,7 @@
         <unit unitID="Medo.messaging" mrp="" bldFile="sf/app/messaging/group" name="messaging"/>
       </module>
 <module name="mmsharinguis">
-  		<unit unitID="msdo.mmsharinguis" name="mmsharinguis" bldFile="\sf\app\mmsharinguis\group" mrp=""/> 
+  		<unit unitID="msdo.mmsharinguis" name="mmsharinguis" bldFile="sf/app/mmsharinguis/group" mrp=""/> 
       </module>
 <module name="musicplayer">
 				<unit unitID="musicplayer" mrp="" bldFile="sf/app/musicplayer/group" name="musicplayer"/>
@@ -469,17 +475,22 @@
 			</module>
 <module name="webuis">
 	    <unit unitID="browsing_domain.webuis" mrp="" bldFile="sf/app/webuis/group" name="webuis"/>
-      </module></layer>
+      </module>
+<module name="helps_loc2">
+        <unit unitID="platform.helps_loc2" mrp="" bldFile="sf/os/deviceplatformrelease/helps_loc2/group" name="helps_loc2"/>
+      </module>
+    </layer>
 	<layer name="tools_layer">
 <module name="uitools">
         <unit unitID="abs.uitools" mrp="" bldFile="sf/mw/uitools/group" name="uitools"/>
       </module>
 <module name="homescreentools">
-        <unit unitID="abs.homescreentools" mrp="" bldFile="sf/tools/homescreentools/group" name="homescreentools"/>
+        <unit unitID="hsdo.themeinstaller" mrp="" bldFile="sf/tools/homescreentools/themeinstaller/group" name="themeinstaller"/>
+<unit unitID="abs.homescreentools" mrp="" bldFile="sf/tools/homescreentools/group" name="homescreentools"/>
+        <unit unitID="hsdo.widgettools" mrp="" bldFile="sf/tools/homescreentools/widgettools/group" name="widgettools"/>
       </module>
-      
 <module name="buildplatforms">
-<unit unitID="sf_tools_buildplatforms" name="buildplatforms" bldFile="\sf\tools\buildplatforms\group" mrp=""/>
+    <unit unitID="sf_tools_buildplatforms" name="buildplatforms" bldFile="\sf\tools\buildplatforms\group" mrp=""/>
 </module>
 <module name="swconfigtools">
         <unit name="swconfigtools" unitID="sydo.swconfigtools" bldFile="sf/tools/swconfigtools/group" mrp=""/>
@@ -514,7 +525,7 @@
       </module>
 <module name="sf_licenseetsystub">
 			<component name="sf_licenseetsystub">
-				<unit unitID="symbian.licenseetsystub" name="sf_licenseetsystub" bldFile="\sf\os\cellularsrv\telephonyserverplugins\licenseetsystub\group" mrp="" filter=""/>
+				<unit unitID="symbian.licenseetsystub" name="sf_licenseetsystub" bldFile="sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group" mrp="" filter=""/>
 			</component>
 		</module></layer>
 <layer name="unit_test_layer">
@@ -558,14 +569,14 @@
     <targetList name="tools_rel" description="tools Release Targets" target="TOOLS_REL"/>
     <targetList name="cwtools" description="cwtools Targets" target="CWTOOLS"/>
     <targetList name="cwtools_rel" description="cwtools Release Targets" target="CWTOOLS_REL"/>
-		<configuration name="S60_sf" description="S60 sf build" filter="sf_build">
-<layerRef layerName="os_layer"/>
-<layerRef layerName="bldfirst_mw_layer"/>
-<layerRef layerName="mw_layer"/>
-<layerRef layerName="bldfirst_app_layer"/>
-<layerRef layerName="app_layer"/>
-<layerRef layerName="tools_layer"/>
-<layerRef layerName="stubs_layer"/>
+		<configuration name="S60_sf" description="S60 sf build" filter="raptor_S60_sf,sf_build">
+			<layerRef layerName="os_layer"/>
+			<layerRef layerName="bldfirst_mw_layer"/>
+			<layerRef layerName="mw_layer"/>
+			<layerRef layerName="bldfirst_app_layer"/>
+			<layerRef layerName="app_layer"/>
+			<layerRef layerName="tools_layer"/>
+			<layerRef layerName="stubs_layer"/>
       <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
       <task><buildLayer command="abld export" unitParallel="Y"/></task>
       <task><buildLayer command="abld makefile" targetList="default_tools" unitParallel="Y" targetParallel="Y"/></task>
@@ -591,4 +602,4 @@
 -->
 <!--  OS Extension build configurations start  -->
   </build>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file