# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1259340564 0
# Node ID 6ea1b8b6cda9674561c2a1cf31773cecadf3fb46
# Parent  35423c29605eb6fc347957c1da6559684e630a8e
Updating package_definition files from 2.0.1 model plus some Bob's comments

diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/adaptation/qemu/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian2/adaptation/qemu/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition name="foundation" schema="2.0.1">
+<systemModel>
+<layer name="adaptation" long-name="Adaptation">
+<block name="qemu" level="hw-if" long-name="Syborg Adaptation" levels="hw-if">
+      <collection id="baseport" name="Baseport" level="hw-if"> 
+        <component id="syborg" name="Syborg" introduced="symbian^2" purpose="optional">
+          <unit bldFile="/sf/adaptation/qemu/baseport/syborg" mrp="/sf/adaptation/qemu/baseport/syborg/syborg.mrp"/>
+        </component>
+      </collection>
+    </block>
+</layer>
+</systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/adaptation/stubs/package_definition.xml
--- a/symbian2/adaptation/stubs/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/adaptation/stubs/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -130,4 +130,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/app/conntools/package_definition.xml
--- a/symbian2/app/conntools/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/app/conntools/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition name="foundation" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="conntools" long-name="Conn Tools" tech_domain="dc" level="services" levels="1 2">
+<systemModel>
+<layer name="app" long-name="Applications" levels="services apps">
+<block name="conntools" long-name="Conn Tools" tech_domain="dc" level="services" levels="1 2">
     <collection name="nettools" long-name="Net Tools" level="2">
      <component name="conntest" long-name="Connection Test" origin-model="foundation">
       <unit bldFile="/sf/app/conntools/nettools/conntest/group"/>
@@ -22,6 +22,6 @@
      </component>
     </collection>
    </block>
-  </layer>
- </systemModel>
-</SystemDefinition>
+</layer>
+</systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/app/devicecontrol/package_definition.xml
--- a/symbian2/app/devicecontrol/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/app/devicecontrol/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -22,9 +22,9 @@
     </collection>
     <collection name="fotaapplication" long-name="FOTA Application" level="app">
      <component name="fotaserver" long-name="FOTA Server" origin-model="foundation">
-      <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fmsclient/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fmserver/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotarfsplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver/fmsclient/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver/fmserver/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver/fotarfsplugin/group"/> -->
       <unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver/fotastartupextplg/group"/>
       <unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver/group"/>
      </component>
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/app/helps/package_definition.xml
--- a/symbian2/app/helps/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/app/helps/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -14,15 +14,15 @@
    <collection name="n:symhelptools" long-name="Symbian Help Tools" level="tools">
      <component name="n:mbmcodec" long-name="MBM Codec" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/app/helps/symhelp/mbmcodec/group" mrp="app/helps/symhelp/mbmcodec/group/tools_sdk_eng_mbmcodec.mrp"/> -->
+      <!-- <unit bldFile="/sf/app/helps/symhelp/mbmcodec/group" mrp="/sf/app/helps/symhelp/mbmcodec/group/tools_sdk_eng_mbmcodec.mrp"/> -->
      </component>
      <component name="n:cshlpcmpgui" long-name="CSHelp Compiler GUI" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/app/helps/symhelp/cshlpcmpgui/group" mrp="app/helps/symhelp/cshlpcmpgui/group/tools_sdk_eng_cshlpcmp_gui.mrp" priority="1010"/> -->
+      <!-- <unit bldFile="/sf/app/helps/symhelp/cshlpcmpgui/group" mrp="/sf/app/helps/symhelp/cshlpcmpgui/group/tools_sdk_eng_cshlpcmp_gui.mrp" priority="1010"/> -->
      </component>
      <component name="n:cshlpcmpfrontend" long-name="CSHelp Compiler Frontend" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/app/helps/symhelp/cshlpcmpfrontend/group" mrp="app/helps/symhelp/cshlpcmpfrontend/group/tools_sdk_eng_cshlpcmp_frontend.mrp"/> -->
+      <!-- <unit bldFile="/sf/app/helps/symhelp/cshlpcmpfrontend/group" mrp="/sf/app/helps/symhelp/cshlpcmpfrontend/group/tools_sdk_eng_cshlpcmp_frontend.mrp"/> -->
      </component>
      <component name="n:cshlpcmpbackend" long-name="CSHelp Compiler Backend" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/app/helps/symhelp/cshlpcmpbackend/group/tools_sdk_eng_cshlpcmp_backend_srconly.mrp"/>
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/app/organizer/package_definition.xml
--- a/symbian2/app/organizer/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/app/organizer/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -202,7 +202,7 @@
      </component>
      <component name="n:chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/> -->
+      <!-- <unit bldFile="/sf/app/organizer/pimappsupport/chinesecalendaralg/group" mrp="/sf/app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/> -->
      </component>
     </collection>
     <collection name="organizer_info" long-name="Organizer Application Suite Info" level="ui">
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/app/radio/package_definition.xml
--- a/symbian2/app/radio/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/app/radio/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -16,7 +16,6 @@
      <component name="fmradiomcpplugin" long-name="FM Radio MCP Plugin" origin-model="foundation">
       <unit bldFile="/sf/app/radio/fmradio/fmradiomcpplugin/group"/>
      </component>
-     
      <component name="fmradio_help" long-name="Help" origin-model="foundation">
       <unit bldFile="/sf/app/radio/fmradio/help/group"/>
      </component>
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/app/screensaver/package_definition.xml
--- a/symbian2/app/screensaver/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/app/screensaver/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -11,7 +11,6 @@
       <unit bldFile="/sf/app/screensaver/scrsaver/screensaveraiwplugin/group"/>
      </component>
     </collection>
-    
     <collection name="screensaver_info" long-name="Screen Saver Apps Info" level="plugin">
      <component unofficial="yes" name="screensaver_build" long-name="Screen Saver Apps Build" origin-model="foundation">
       <unit bldFile="/sf/app/screensaver/group"/>
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/app/techview/package_definition.xml
--- a/symbian2/app/techview/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/app/techview/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -46,4 +46,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/mw/accesssec/package_definition.xml
--- a/symbian2/mw/accesssec/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/mw/accesssec/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -42,4 +42,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/mw/appinstall/package_definition.xml
--- a/symbian2/mw/appinstall/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/mw/appinstall/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -84,7 +84,7 @@
      </component>
      <component name="n:swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/> -->
      </component>
      <component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/mw/dlnasrv/package_definition.xml
--- a/symbian2/mw/dlnasrv/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/mw/dlnasrv/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -194,7 +194,6 @@
      <component name="homemedia_build" long-name="Home Media" origin-model="foundation">
       <unit bldFile="/sf/mw/dlnasrv/homemedia/group"/>
      </component>
-     
     </collection>
     <collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
      <component unofficial="yes" name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" class="api" origin-model="foundation">
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/mw/helix/package_definition.xml
--- a/symbian2/mw/helix/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/mw/helix/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition name="foundation" schema="2.0.1">
- <systemModel>
-  <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="helix" long-name="Helix" tech_domain="mm" level="generic" levels="plugin framework server generic specific">
+<systemModel>
+<layer name="mw" long-name="Middleware" levels="generic specific">
+<block name="helix" long-name="Helix" tech_domain="mm" level="generic" levels="plugin framework server generic specific">
     <collection name="helix_ren" long-name="Helix" level="framework">
-     <component name="helixrfsplugin" long-name="Helix RFS Plugin" origin-model="foundation"/>
+     <component name="helixrfsplugin" long-name="Helix RFS Plugin" origin-model="foundation">
+       <unit bldFile="/sf/mw/helix/helix_ren/helixrfsplugin/group"/>
+     </component>
      <component name="helix_binary" long-name="Helix Binary" origin-model="foundation"/>
      <component name="src" long-name="Src" origin-model="foundation"/>
     </collection>
    </block>
-  </layer>
- </systemModel>
-</SystemDefinition>
+</layer>
+</systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/mw/messagingmw/package_definition.xml
--- a/symbian2/mw/messagingmw/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/mw/messagingmw/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -152,11 +152,11 @@
      </component>
      <component name="n:suplsmshandler" long-name="SUPL SMS Handler" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/suplsmshandler/group" mrp="/sf/mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/> -->
      </component>
      <component name="n:suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="/sf/mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/> -->
      </component>
     </collection>
     <collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/mw/mmuifw/package_definition.xml
--- a/symbian2/mw/mmuifw/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/mw/mmuifw/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -44,7 +44,6 @@
      <component name="osncore_build" long-name="OSN Core" origin-model="foundation">
       <unit bldFile="/sf/mw/mmuifw/osncore/group"/>
      </component>
-     
     </collection>
     <collection name="resourcepool" long-name="Resource Pool" level="util">
      <component name="alfresourcepool" long-name="ALF Resource Pool" origin-model="foundation">
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/mw/netprotocols/package_definition.xml
--- a/symbian2/mw/netprotocols/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/mw/netprotocols/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -72,7 +72,7 @@
     <collection name="n:wapstack" long-name="WAP Stack" level="plugin">
      <component name="n:wapmessageapi" long-name="WAP Message API" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/netprotocols/wapstack/wapmessageapi/group" mrp="mw/netprotocols/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/netprotocols/wapstack/wapmessageapi/group" mrp="/sf/mw/netprotocols/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/> -->
      </component>
     </collection>
     <collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/mw/opensrv/package_definition.xml
--- a/symbian2/mw/opensrv/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/mw/opensrv/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -50,4 +50,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/mw/remoteconn/package_definition.xml
--- a/symbian2/mw/remoteconn/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/mw/remoteconn/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -28,7 +28,7 @@
    <collection name="connectivitytransports" long-name="Connectivity Transports" level="plugin">
      <component name="n:mrouter" long-name="m-Router" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remoteconn/connectivitytransports/mrouter/group" mrp="mw/remoteconn/connectivitytransports/mrouter/group/connectivity_mRouterSecure.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remoteconn/connectivitytransports/mrouter/group" mrp="/sf/mw/remoteconn/connectivitytransports/mrouter/group/connectivity_mRouterSecure.mrp"/> -->
      </component>
      <component name="plpremotelink" long-name="PLP Remote Link" deprecated="9.0" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/mw/remoteconn/connectivitytransports/plpremotelink/group" mrp="/sf/mw/remoteconn/connectivitytransports/plpremotelink/group/connectivity_legacy_plp_plpremotelink.mrp"/>
@@ -48,7 +48,7 @@
     <collection name="mtpfws" long-name="MTP Frameworks" level="framework">
      <component name="n:mtpfw" long-name="MTP Framework" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remoteconn/mtpfws/mtpfw/group" mrp="/sf/mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/> -->
      </component>
      <component name="mtpintegrationtest" long-name="MTP Integration Test" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/mw/remoteconn/mtpfws/mtpintegrationtest/group" mrp="/sf/mw/remoteconn/mtpfws/mtpintegrationtest/group/mtp_test.mrp"/>
@@ -60,7 +60,7 @@
      </component>
      <component name="n:mtpwmpextndp" long-name="WMP Extension Data Provider" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remoteconn/mtpdataproviders/mtpwmpextndp/group" mrp="mw/remoteconn/mtpdataproviders/mtpwmpextndp/group/mtp_wmpextndp.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remoteconn/mtpdataproviders/mtpwmpextndp/group" mrp="/sf/mw/remoteconn/mtpdataproviders/mtpwmpextndp/group/mtp_wmpextndp.mrp"/> -->
      </component>
     </collection>
     <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/mw/remotemgmt/package_definition.xml
--- a/symbian2/mw/remotemgmt/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/mw/remotemgmt/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -139,51 +139,51 @@
     <collection name="n:remotemgmttest" long-name="Remote Management Test" level="specific">
      <component name="n:omasyncmlintegrationtest" long-name="OMA SyncML Integration Test" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group/oma_syncml_integtest.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group" mrp="/sf/mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group/oma_syncml_integtest.mrp"/> -->
      </component>
      <component name="n:omadevicemgmtintegrationtest" long-name="OMA Device Management Integration Test" introduced="9.1" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group/devprov_integtest.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group" mrp="/sf/mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group/devprov_integtest.mrp"/> -->
      </component>
     </collection>
     <collection name="n:syncandremotemgmtfw" long-name="Sync and Remote Management Framework" level="framework">
      <component name="n:omasyncmldatasync" long-name="OMA SyncML Data Sync" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group/oma_syncml_datasync.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group" mrp="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group/oma_syncml_datasync.mrp"/> -->
      </component>
      <component name="n:omasyncmlcommonfw" long-name="OMA SyncML Common Framework" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group/oma_syncml_common_framework.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group" mrp="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group/oma_syncml_common_framework.mrp"/> -->
      </component>
      <component name="n:omasyncmldminterface" long-name="OMA SyncML DM Interface" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group/oma_syncml_dm_interface.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group" mrp="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group/oma_syncml_dm_interface.mrp"/> -->
      </component>
      <component name="n:omasyncmlconfig" long-name="OMA SyncML Config" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group/oma_syncml_config.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group" mrp="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group/oma_syncml_config.mrp"/> -->
      </component>
      <component name="n:devicemgmtfw" long-name="Device Management Framework" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group" mrp="mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group/devprov_devman_framework.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group" mrp="/sf/mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group/devprov_devman_framework.mrp"/> -->
      </component>
      <component name="n:clientprovisioningfw" long-name="Client Provisioning Framework" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group/devprov_clientprov_framework.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group" mrp="/sf/mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group/devprov_clientprov_framework.mrp"/> -->
      </component>
     </collection>
     <collection name="n:syncandremotemgmtservices" long-name="Sync and Remote Management Services" level="plugin">
      <component name="n:datasyncadaptors" long-name="Data Sync Adaptors" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group/data_sync_adaptors.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group" mrp="/sf/mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group/data_sync_adaptors.mrp"/> -->
      </component>
      <component name="n:devicemgmtadaptors" long-name="Device Management Adaptors" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group" mrp="mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group/devprov_devman_adapters.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group" mrp="/sf/mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group/devprov_devman_adapters.mrp"/> -->
      </component>
      <component name="n:clientprovisioningadaptors" long-name="Client Provisioning Adaptors" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group/devprov_clientprov_adapters.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group" mrp="/sf/mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group/devprov_clientprov_adapters.mrp"/> -->
      </component>
     </collection>
     <collection name="remotemgmt_info" long-name="Remote Management Info" level="specific">
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/mw/web/package_definition.xml
--- a/symbian2/mw/web/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/mw/web/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -81,10 +81,10 @@
      <component name="widgetengine" long-name="Widget Engine" origin-model="foundation">
       <unit bldFile="/sf/mw/web/webengine/widgetengine/group"/>
      </component>
-     <!--Component manually removed as empty and name conflicts with another component-->
-     <!--<component name="memoryplugin" long-name="Memory Plugin">
+     <!--MattD 20091019: Put back into model (originally taken out due to conflict with photosgallery memoryplugin - Bug 157?) -->
+     <component name="webmemoryplugin" long-name="Web Memory Plugin">
        <unit bldFile="/sf/mw/web/webengine/memoryplugin/group"/>
-     </component>-->
+     </component>
      <component name="widgetmemoryplugin" long-name="Widget Memory Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/web/webengine/widgetmemoryplugin/group"/>
      </component>
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/os/boardsupport/package_definition.xml
--- a/symbian2/os/boardsupport/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/os/boardsupport/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -9,43 +9,43 @@
      </component>
      <component name="n:unistore2emulatorsupport" long-name="UniStore2 Emulator Support" filter="gt" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/boardsupport/emulator/unistore2emulatorsupport" mrp="os/boardsupport/emulator/unistore2emulatorsupport/base_wins_unistore2.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/boardsupport/emulator/unistore2emulatorsupport" mrp="/sf/os/boardsupport/emulator/unistore2emulatorsupport/base_wins_unistore2.mrp"/> -->
      </component>
     </collection>
     <collection name="n:omaph2" long-name="OMAP H2" level="bsp">
      <component name="n:omaph2bsp" long-name="OMAP H2 BSP" introduced="9.0" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/boardsupport/omaph2/omaph2bsp/h2" mrp="os/boardsupport/omaph2/omaph2bsp/h2/base_omaph2.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/boardsupport/omaph2/omaph2bsp/h2" mrp="/sf/os/boardsupport/omaph2/omaph2bsp/h2/base_omaph2.mrp"/> -->
      </component>
      <component name="n:omaph2unistore2" long-name="OMAP H2 UniStore2" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/boardsupport/omaph2/omaph2unistore2" mrp="os/boardsupport/omaph2/omaph2unistore2/base_h2_unistore2.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/boardsupport/omaph2/omaph2unistore2" mrp="/sf/os/boardsupport/omaph2/omaph2unistore2/base_h2_unistore2.mrp"/> -->
      </component>
      <component name="n:omaph2sdio" long-name="OMAP H2 SDIO" filter="gt" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/boardsupport/omaph2/omaph2sdio" mrp="os/boardsupport/omaph2/omaph2sdio/base_h2_sdio.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/boardsupport/omaph2/omaph2sdio" mrp="/sf/os/boardsupport/omaph2/omaph2sdio/base_h2_sdio.mrp"/> -->
      </component>
     </collection>
     <collection name="n:omaph4" long-name="OMAP H4" level="bsp">
      <component name="n:omaph4bsp" long-name="OMAP H4 BSP" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/boardsupport/omaph4/omaph4bsp/h4" mrp="os/boardsupport/omaph4/omaph4bsp/h4/base_omaph4hrp.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/boardsupport/omaph4/omaph4bsp/h4" mrp="/sf/os/boardsupport/omaph4/omaph4bsp/h4/base_omaph4hrp.mrp"/> -->
      </component>
      <component name="n:h4bootloader" long-name="H4 Boot Loader" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit mrp="os/boardsupport/omaph4/h4bootloader/base_omaph4hrp_bootldr.mrp" bldFile="/sf/os/boardsupport/omaph4/h4bootloader"/> -->
+      <!-- <unit mrp="/sf/os/boardsupport/omaph4/h4bootloader/base_omaph4hrp_bootldr.mrp" bldFile="/sf/os/boardsupport/omaph4/h4bootloader"/> -->
      </component>
      <component name="n:omaph4minienvbootloader" long-name="OMAP H4 Mini Environment Boot Loader" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit mrp="os/boardsupport/omaph4/omaph4minienvbootloader/base_omaph4hrp_mebootldr.mrp" bldFile="/sf/os/boardsupport/omaph4/omaph4minienvbootloader"/> -->
+      <!-- <unit mrp="/sf/os/boardsupport/omaph4/omaph4minienvbootloader/base_omaph4hrp_mebootldr.mrp" bldFile="/sf/os/boardsupport/omaph4/omaph4minienvbootloader"/> -->
      </component>
      <component name="n:omaph4unistore2" long-name="OMAP H4 Unistore2" filter="gt" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/boardsupport/omaph4/omaph4unistore2" mrp="os/boardsupport/omaph4/omaph4unistore2/base_omaph4hrp_unistore2.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/boardsupport/omaph4/omaph4unistore2" mrp="/sf/os/boardsupport/omaph4/omaph4unistore2/base_omaph4hrp_unistore2.mrp"/> -->
      </component>
      <component name="n:omaph4sdio" long-name="OMAP H4 SDIO" filter="gt" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/boardsupport/omaph4/omaph4sdio" mrp="os/boardsupport/omaph4/omaph4sdio/base_omaph4hrp_sdio.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/boardsupport/omaph4/omaph4sdio" mrp="/sf/os/boardsupport/omaph4/omaph4sdio/base_omaph4hrp_sdio.mrp"/> -->
      </component>
     </collection>
     <collection name="haitest" long-name="HAI Test Suites" level="test">
@@ -61,4 +61,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/os/buildtools/package_definition.xml
--- a/symbian2/os/buildtools/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/os/buildtools/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -32,26 +32,26 @@
      </component>
      <component name="n:burtestserver" long-name="BUR Test Server" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/burtestserver/Group" mrp="os/buildtools/toolsandutils/burtestserver/Group/testtools_burtestserver.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/burtestserver/Group" mrp="/sf/os/buildtools/toolsandutils/burtestserver/Group/testtools_burtestserver.mrp"/> -->
      </component>
      <component name="n:cbrtools" long-name="Component Based Release (CBR) Tools" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/cbrtools/group" mrp="os/buildtools/toolsandutils/cbrtools/group/tools_cbr_tools.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/cbrtools/group" mrp="/sf/os/buildtools/toolsandutils/cbrtools/group/tools_cbr_tools.mrp"/> -->
      </component>
      <component name="n:prf" long-name="Product Realisation Framework" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/prf/group" mrp="os/buildtools/toolsandutils/prf/group/tools_cbr_prf.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/prf/group" mrp="/sf/os/buildtools/toolsandutils/prf/group/tools_cbr_prf.mrp"/> -->
      </component>
      <component name="n:cdb" long-name="Code Database" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/cdb/group" mrp="os/buildtools/toolsandutils/cdb/group/testtools_cdb.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/cdb/group" mrp="/sf/os/buildtools/toolsandutils/cdb/group/testtools_cdb.mrp"/> -->
      </component>
      <component name="e32tools" long-name="E32 Tools" deprecated="tb91" purpose="development" class="PC" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/buildtools/toolsandutils/e32tools/group" mrp="/sf/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
      </component>
      <component name="n:kitcomparator" long-name="Kit Comparator" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/kitcomparator/group" mrp="os/buildtools/toolsandutils/kitcomparator/group/testtools_cts_kitcomparator.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/kitcomparator/group" mrp="/sf/os/buildtools/toolsandutils/kitcomparator/group/testtools_cts_kitcomparator.mrp"/> -->
      </component>
      <component name="wincredistribution" long-name="WinC Redistribution" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_winc.mrp"/>
@@ -61,40 +61,40 @@
      </component>
      <component name="n:testdriver" long-name="Test Driver" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/testdriver/Group" mrp="os/buildtools/toolsandutils/testdriver/Group/testtools_testdriver.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/testdriver/Group" mrp="/sf/os/buildtools/toolsandutils/testdriver/Group/testtools_testdriver.mrp"/> -->
      </component>
      <component name="statapi" long-name="STAT API" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/statapi/source/statapi/console" mrp="os/buildtools/toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/statapi/source/statapi/console" mrp="/sf/os/buildtools/toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/> -->
      </component>
      <component name="n:statsource" long-name="STAT Source" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/toolsandutils/statsource/group/testtools_stat_common_source.mrp"/>
      </component>
      <component name="n:statdesktop" long-name="STAT Desktop" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/statdesktop/group" mrp="os/buildtools/toolsandutils/statdesktop/group/testtools_stat_desktop.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/statdesktop/group" mrp="/sf/os/buildtools/toolsandutils/statdesktop/group/testtools_stat_desktop.mrp"/> -->
      </component>
      <component name="n:systemmonitor" long-name="System Monitor" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/systemmonitor/group" mrp="os/buildtools/toolsandutils/systemmonitor/group/testtools_systemmonitor.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/systemmonitor/group" mrp="/sf/os/buildtools/toolsandutils/systemmonitor/group/testtools_systemmonitor.mrp"/> -->
      </component>
      <component name="n:testtoolsdesktop" long-name="Test Tools Desktop" filter="gt" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/testtoolsdesktop/group" mrp="os/buildtools/toolsandutils/testtoolsdesktop/group/testtools_desktop.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/testtoolsdesktop/group" mrp="/sf/os/buildtools/toolsandutils/testtoolsdesktop/group/testtools_desktop.mrp"/> -->
      </component>
      <component name="wintunnel" long-name="Wintunnel" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp"/>
      </component>
      <component name="n:usecasecontroller" long-name="Use Case Controller" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group" mrp="os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group/testtools_ucc.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group" mrp="/sf/os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group/testtools_ucc.mrp"/> -->
      </component>
      <component name="autotest" long-name="Autotest" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/buildtools/toolsandutils/autotest/group" mrp="/sf/os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
      </component>
      <component name="n:testconfigfileparser" long-name="Test Config File Parser" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/testconfigfileparser/group" mrp="os/buildtools/toolsandutils/testconfigfileparser/group/tools_testconfigfileparser.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/testconfigfileparser/group" mrp="/sf/os/buildtools/toolsandutils/testconfigfileparser/group/tools_testconfigfileparser.mrp"/> -->
      </component>
      <component name="n:kitsetupapp" long-name="Kit Setup App" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/toolsandutils/kitsetupapp/group/tools_devkits_kitsetupapp.mrp"/>
@@ -104,11 +104,11 @@
      </component>
      <component name="n:productinstaller" long-name="Product Installer" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/productinstaller/group" mrp="os/buildtools/toolsandutils/productinstaller/group/tools_custkits_productinstaller.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/productinstaller/group" mrp="/sf/os/buildtools/toolsandutils/productinstaller/group/tools_custkits_productinstaller.mrp"/> -->
      </component>
      <component name="n:stlport" long-name="STL Port" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/stlport/group" mrp="os/buildtools/toolsandutils/stlport/group/tools_stlport.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/stlport/group" mrp="/sf/os/buildtools/toolsandutils/stlport/group/tools_stlport.mrp"/> -->
      </component>
     </collection>
    <collection name="n:dist_os" long-name="Redistribution" level="mw">
@@ -119,25 +119,25 @@
     <collection name="n:bintools_os" long-name="Binary Tools" level="fw">
      <component name="n:rcomp" long-name="Resource Compiler" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/bintools_os/rcomp/group" mrp="os/buildtools/bintools_os/rcomp/group/tools_rcomp.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/bintools_os/rcomp/group" mrp="/sf/os/buildtools/bintools_os/rcomp/group/tools_rcomp.mrp"/> -->
      </component>
      <component name="n:evalid" long-name="Evalid" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/bintools_os/evalid" mrp="os/buildtools/bintools_os/evalid/tools_evalid.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/bintools_os/evalid" mrp="/sf/os/buildtools/bintools_os/evalid/tools_evalid.mrp"/> -->
      </component>
     </collection>
     <collection name="n:perltoolsplat_os" long-name="Perl Tools Platform" level="mw">
      <component name="n:redistribution" long-name="Redistribution" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/perltoolsplat_os/redistribution" mrp="os/buildtools/perltoolsplat_os/redistribution/tools_redistribution_common.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/perltoolsplat_os/redistribution" mrp="/sf/os/buildtools/perltoolsplat_os/redistribution/tools_redistribution_common.mrp"/> -->
      </component>
      <component name="n:legacycommonperl" long-name="Legacy Common Perl Libraries" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/perltoolsplat_os/legacycommonperl/group" mrp="os/buildtools/perltoolsplat_os/legacycommonperl/group/tools_sdk_eng_perllibrary.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/perltoolsplat_os/legacycommonperl/group" mrp="/sf/os/buildtools/perltoolsplat_os/legacycommonperl/group/tools_sdk_eng_perllibrary.mrp"/> -->
      </component>
      <component name="n:commonperl" long-name="Common Perl Libraries" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/perltoolsplat_os/commonperl/group" mrp="os/buildtools/perltoolsplat_os/commonperl/group/tools_sdk_eng_perl_shared.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/perltoolsplat_os/commonperl/group" mrp="/sf/os/buildtools/perltoolsplat_os/commonperl/group/tools_sdk_eng_perl_shared.mrp"/> -->
      </component>
     </collection>
     <collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
@@ -146,21 +146,21 @@
      </component>
      <component name="n:bldtools" long-name="Build Tools" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/sbsv1_os/bldtools/group" mrp="os/buildtools/sbsv1_os/bldtools/group/tools_sdk_eng_build-tools.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/sbsv1_os/bldtools/group" mrp="/sf/os/buildtools/sbsv1_os/bldtools/group/tools_sdk_eng_build-tools.mrp"/> -->
      </component>
     </collection>
     <collection name="n:srcanamdw_os" long-name="Source Analysis Middleware" level="fw">
      <component name="n:leavescan" long-name="Leavescan" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/srcanamdw_os/leavescan/group" mrp="os/buildtools/srcanamdw_os/leavescan/group/testtools_leavescan.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/srcanamdw_os/leavescan/group" mrp="/sf/os/buildtools/srcanamdw_os/leavescan/group/testtools_leavescan.mrp"/> -->
      </component>
      <component name="n:programchecker" long-name="Program Checker" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/srcanamdw_os/programchecker/group" mrp="os/buildtools/srcanamdw_os/programchecker/group/testtools_programchecker.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/srcanamdw_os/programchecker/group" mrp="/sf/os/buildtools/srcanamdw_os/programchecker/group/testtools_programchecker.mrp"/> -->
      </component>
      <component name="n:migrationtool" long-name="Migration Tool" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/srcanamdw_os/migrationtool/group" mrp="os/buildtools/srcanamdw_os/migrationtool/group/testtools_migrationtool.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/srcanamdw_os/migrationtool/group" mrp="/sf/os/buildtools/srcanamdw_os/migrationtool/group/testtools_migrationtool.mrp"/> -->
      </component>
     </collection>
     <collection name="imgtools_os" long-name="Image Tools" level="fw">
@@ -171,17 +171,17 @@
     <collection name="n:binanamdw_os" long-name="Binary Analysis Middleware" level="fw">
      <component name="n:captools" long-name="Capability Tools" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/binanamdw_os/captools/group" mrp="os/buildtools/binanamdw_os/captools/group/testtools_captools.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/binanamdw_os/captools/group" mrp="/sf/os/buildtools/binanamdw_os/captools/group/testtools_captools.mrp"/> -->
      </component>
      <component name="n:depcheck" long-name="Dependency Checker" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/binanamdw_os/depcheck" mrp="os/buildtools/binanamdw_os/depcheck/tools_depcheck.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/binanamdw_os/depcheck" mrp="/sf/os/buildtools/binanamdw_os/depcheck/tools_depcheck.mrp"/> -->
      </component>
     </collection>
     <collection name="n:devlib" long-name="Developer Library" level="ui">
      <component name="n:devlibhelp" long-name="Developer Library Help" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/devlib/devlibhelp/group/devlib94" mrp="os/buildtools/devlib/devlibhelp/group/devlib94/developerlibrary_doc_html.mrp" version="9.4"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/devlib/devlibhelp/group/devlib94" mrp="/sf/os/buildtools/devlib/devlibhelp/group/devlib94/developerlibrary_doc_html.mrp" version="9.4"/> -->
      </component>
      <component name="n:toolsdocs" long-name="Tools Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/devlib/toolsdocs/tools_documentation.mrp"/>
@@ -190,126 +190,126 @@
     <collection name="misccomponents" long-name="Misc Components" level="mw">
      <component name="n:runperl" long-name="Run PERL" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/runperl/group" mrp="os/buildtools/misccomponents/runperl/group/tools_sdk_eng_runperl.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/runperl/group" mrp="/sf/os/buildtools/misccomponents/runperl/group/tools_sdk_eng_runperl.mrp"/> -->
      </component>
      <component name="n:assertion" long-name="Assertion" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/assertion/group" mrp="os/buildtools/misccomponents/assertion/group/tools_sdk_eng_assertion.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/assertion/group" mrp="/sf/os/buildtools/misccomponents/assertion/group/tools_sdk_eng_assertion.mrp"/> -->
      </component>
      <component name="n:enum" long-name="Enum" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/enum/group" mrp="os/buildtools/misccomponents/enum/group/tools_sdk_eng_enum.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/enum/group" mrp="/sf/os/buildtools/misccomponents/enum/group/tools_sdk_eng_enum.mrp"/> -->
      </component>
      <component name="n:logger" long-name="Logger" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/logger/group" mrp="os/buildtools/misccomponents/logger/group/tools_sdk_eng_logger.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/logger/group" mrp="/sf/os/buildtools/misccomponents/logger/group/tools_sdk_eng_logger.mrp"/> -->
      </component>
      <component name="n:filesys" long-name="Filesys" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/filesys/group" mrp="os/buildtools/misccomponents/filesys/group/tools_sdk_eng_filesys.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/filesys/group" mrp="/sf/os/buildtools/misccomponents/filesys/group/tools_sdk_eng_filesys.mrp"/> -->
      </component>
      <component name="n:envvar" long-name="Envvar" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/envvar/group" mrp="os/buildtools/misccomponents/envvar/group/tools_sdk_eng_envvar.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/envvar/group" mrp="/sf/os/buildtools/misccomponents/envvar/group/tools_sdk_eng_envvar.mrp"/> -->
      </component>
      <component name="n:installutils" long-name="Install Utils" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/installutils/group" mrp="os/buildtools/misccomponents/installutils/group/tools_sdk_eng_installutils.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/installutils/group" mrp="/sf/os/buildtools/misccomponents/installutils/group/tools_sdk_eng_installutils.mrp"/> -->
      </component>
      <component name="n:mnemonicfix" long-name="Mnemonic Fix" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/mnemonicfix/group" mrp="os/buildtools/misccomponents/mnemonicfix/group/tools_sdk_eng_mnemonicfix.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/mnemonicfix/group" mrp="/sf/os/buildtools/misccomponents/mnemonicfix/group/tools_sdk_eng_mnemonicfix.mrp"/> -->
      </component>
      <component name="n:pathbrowser" long-name="Path Browser" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/pathbrowser/group" mrp="os/buildtools/misccomponents/pathbrowser/group/tools_sdk_eng_pathbrowser.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/pathbrowser/group" mrp="/sf/os/buildtools/misccomponents/pathbrowser/group/tools_sdk_eng_pathbrowser.mrp"/> -->
      </component>
      <component name="n:shellexec" long-name="Shell Exec" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/shellexec/group" mrp="os/buildtools/misccomponents/shellexec/group/tools_sdk_eng_shellexec.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/shellexec/group" mrp="/sf/os/buildtools/misccomponents/shellexec/group/tools_sdk_eng_shellexec.mrp"/> -->
      </component>
      <component name="n:swingworker" long-name="Swing Worker" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/swingworker/group" mrp="os/buildtools/misccomponents/swingworker/group/tools_sdk_eng_swingworker.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/swingworker/group" mrp="/sf/os/buildtools/misccomponents/swingworker/group/tools_sdk_eng_swingworker.mrp"/> -->
      </component>
      <component name="n:testcaserunner" long-name="Test Case Runner" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/testcaserunner/group" mrp="os/buildtools/misccomponents/testcaserunner/group/tools_sdk_eng_testcaserunner.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/testcaserunner/group" mrp="/sf/os/buildtools/misccomponents/testcaserunner/group/tools_sdk_eng_testcaserunner.mrp"/> -->
      </component>
      <component name="n:toolbarpanel" long-name="Tool Bar Panel" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/toolbarpanel/group" mrp="os/buildtools/misccomponents/toolbarpanel/group/tools_sdk_eng_toolbarpanel.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/toolbarpanel/group" mrp="/sf/os/buildtools/misccomponents/toolbarpanel/group/tools_sdk_eng_toolbarpanel.mrp"/> -->
      </component>
      <component name="n:javahelp" long-name="Java Help" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/javahelp/group" mrp="os/buildtools/misccomponents/javahelp/group/tools_sdk_eng_javahelp.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/javahelp/group" mrp="/sf/os/buildtools/misccomponents/javahelp/group/tools_sdk_eng_javahelp.mrp"/> -->
      </component>
      <component name="n:langconfig" long-name="Language Config" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/langconfig/group" mrp="os/buildtools/misccomponents/langconfig/group/tools_sdk_eng_langconfig.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/langconfig/group" mrp="/sf/os/buildtools/misccomponents/langconfig/group/tools_sdk_eng_langconfig.mrp"/> -->
      </component>
      <component name="n:sdkinfo" long-name="SDK Info" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkinfo/group" mrp="os/buildtools/misccomponents/sdkinfo/group/tools_sdk_eng_sdkinfo.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkinfo/group" mrp="/sf/os/buildtools/misccomponents/sdkinfo/group/tools_sdk_eng_sdkinfo.mrp"/> -->
      </component>
      <component name="n:jade" long-name="Jade " filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/jade/group" mrp="os/buildtools/misccomponents/jade/group/tools_sdk_eng_jade.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/jade/group" mrp="/sf/os/buildtools/misccomponents/jade/group/tools_sdk_eng_jade.mrp"/> -->
      </component>
      <component name="n:sdkpackagemgr" long-name="SDK Package Manager" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkpackagemgr/group" mrp="os/buildtools/misccomponents/sdkpackagemgr/group/tools_sdk_eng_sdkpkg-manager.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkpackagemgr/group" mrp="/sf/os/buildtools/misccomponents/sdkpackagemgr/group/tools_sdk_eng_sdkpkg-manager.mrp"/> -->
      </component>
      <component name="n:sdkpkgtools" long-name="SDK Package Tools" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkpkgtools/group" mrp="os/buildtools/misccomponents/sdkpkgtools/group/tools_sdk_eng_sdkpkg-tools.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkpkgtools/group" mrp="/sf/os/buildtools/misccomponents/sdkpkgtools/group/tools_sdk_eng_sdkpkg-tools.mrp"/> -->
      </component>
      <component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/buildtools/misccomponents/emulatorlauncher/group" mrp="/sf/os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
      </component>
      <component name="n:pkgmgrgui" long-name="SDK Package Manager GUI" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/pkgmgrgui/group" mrp="os/buildtools/misccomponents/pkgmgrgui/group/tools_sdk_eng_pkgmgrgui.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/pkgmgrgui/group" mrp="/sf/os/buildtools/misccomponents/pkgmgrgui/group/tools_sdk_eng_pkgmgrgui.mrp"/> -->
      </component>
      <component name="n:launch" long-name="Launch" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/launch/group" mrp="os/buildtools/misccomponents/launch/group/tools_sdk_eng_launch.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/launch/group" mrp="/sf/os/buildtools/misccomponents/launch/group/tools_sdk_eng_launch.mrp"/> -->
      </component>
      <component name="n:toolsstubs" long-name="Devices Tools Stubs" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/toolsstubs/group" mrp="os/buildtools/misccomponents/toolsstubs/group/tools_sdk_eng_tools_stubs.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/toolsstubs/group" mrp="/sf/os/buildtools/misccomponents/toolsstubs/group/tools_sdk_eng_tools_stubs.mrp"/> -->
      </component>
      <component name="n:bspbuilder" long-name="BSP Builder" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/bspbuilder/group" mrp="os/buildtools/misccomponents/bspbuilder/group/tools_bspbuilder.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/bspbuilder/group" mrp="/sf/os/buildtools/misccomponents/bspbuilder/group/tools_bspbuilder.mrp"/> -->
      </component>
      <component name="n:splash" long-name="Splash Screen" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/splash/group" mrp="os/buildtools/misccomponents/splash/group/tools_sdk_eng_splash.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/splash/group" mrp="/sf/os/buildtools/misccomponents/splash/group/tools_sdk_eng_splash.mrp"/> -->
      </component>
      <component name="n:sdkbuilder" long-name="SDK Building Tools" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkbuilder/group" mrp="os/buildtools/misccomponents/sdkbuilder/group/tools_sdk_eng_sdk_builder.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkbuilder/group" mrp="/sf/os/buildtools/misccomponents/sdkbuilder/group/tools_sdk_eng_sdk_builder.mrp"/> -->
      </component>
     </collection>
     <collection name="n:javatoolsplat" long-name="Java Tools Platform" level="mw">
      <component name="n:javalib" long-name="Java Library " filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/javatoolsplat/javalib/group" mrp="os/buildtools/javatoolsplat/javalib/group/tools_sdk_eng_javalibrary.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/javatoolsplat/javalib/group" mrp="/sf/os/buildtools/javatoolsplat/javalib/group/tools_sdk_eng_javalibrary.mrp"/> -->
      </component>
     </collection>
     <collection name="n:fileconv" long-name="File Converters" level="mw">
      <component name="n:cjpeg" long-name="CJpeg" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/fileconv/cjpeg/group" mrp="os/buildtools/fileconv/cjpeg/group/tools_sdk_eng_cjpeg.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/fileconv/cjpeg/group" mrp="/sf/os/buildtools/fileconv/cjpeg/group/tools_sdk_eng_cjpeg.mrp"/> -->
      </component>
      <component name="n:alp2csh" long-name="ALP to CSH" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/fileconv/alp2csh/group" mrp="os/buildtools/fileconv/alp2csh/group/tools_sdk_eng_alp2csh.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/fileconv/alp2csh/group" mrp="/sf/os/buildtools/fileconv/alp2csh/group/tools_sdk_eng_alp2csh.mrp"/> -->
      </component>
      <component name="n:rtf2ptml" long-name="RTF to PTML" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/fileconv/rtf2ptml/group" mrp="os/buildtools/fileconv/rtf2ptml/group/tools_sdk_eng_rtf2ptml.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/fileconv/rtf2ptml/group" mrp="/sf/os/buildtools/fileconv/rtf2ptml/group/tools_sdk_eng_rtf2ptml.mrp"/> -->
      </component>
     </collection>
     <collection name="buildtools_info" long-name="Build Tools Info" level="ui">
@@ -320,4 +320,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/os/cellularsrv/package_definition.xml
--- a/symbian2/os/cellularsrv/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/os/cellularsrv/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -19,7 +19,7 @@
      </component>
      <component name="n:cdmasmsstack" long-name="CDMA SMS Stack" introduced="8.0" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/cellularsrv/smsprotocols/cdmasmsstack/group" mrp="os/cellularsrv/smsprotocols/cdmasmsstack/group/nbprotocols_cdmasmsstack.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/cellularsrv/smsprotocols/cdmasmsstack/group" mrp="/sf/os/cellularsrv/smsprotocols/cdmasmsstack/group/nbprotocols_cdmasmsstack.mrp"/> -->
      </component>
     </collection>
     <collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
@@ -69,7 +69,7 @@
      </component>
      <component name="n:etelcdma" long-name="ETel CDMA" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelcdma/group" mrp="os/cellularsrv/telephonyserver/etelcdma/group/telephony_etelcdma.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelcdma/group" mrp="/sf/os/cellularsrv/telephonyserver/etelcdma/group/telephony_etelcdma.mrp"/> -->
      </component>
     </collection>
     <collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/os/commsfw/package_definition.xml
--- a/symbian2/os/commsfw/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/os/commsfw/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -94,11 +94,11 @@
     <collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
      <!-- Removing GT commdb
 <component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+<unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
 </component>
 -->
      <!-- <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+<unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
 </component> -->
      <component name="commstools" long-name="Comms Tools" introduced="tb91" purpose="development" class="PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
@@ -107,4 +107,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/os/graphics/package_definition.xml
--- a/symbian2/os/graphics/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/os/graphics/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -69,11 +69,11 @@
      </component>
      <component name="n:openglesimplementation" long-name="OpenGL ES Implementation" filter="gt" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/graphics/opengles/openglesimplementation/group/" mrp="os/graphics/opengles/openglesimplementation/group/graphics_opengles.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/graphics/opengles/openglesimplementation/group/" mrp="/sf/os/graphics/opengles/openglesimplementation/group/graphics_opengles.mrp"/> -->
      </component>
      <component name="n:openglesdisplayproperties" long-name="OpenGL ES Display Properties" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/graphics/opengles/openglesdisplayproperties/group" mrp="os/graphics/opengles/openglesdisplayproperties/group/graphics_openglesdisplayproperty.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/graphics/opengles/openglesdisplayproperties/group" mrp="/sf/os/graphics/opengles/openglesdisplayproperties/group/graphics_openglesdisplayproperty.mrp"/> -->
      </component>
     </collection>
     <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
@@ -90,7 +90,7 @@
      </component>
      <component name="n:eglimplementation" long-name="EGL Implementation" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/graphics/egl/eglimplementation/group/" mrp="os/graphics/egl/eglimplementation/group/graphics_egl.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/graphics/egl/eglimplementation/group/" mrp="/sf/os/graphics/egl/eglimplementation/group/graphics_egl.mrp"/> -->
      </component>
     </collection>
     <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
@@ -110,7 +110,7 @@
     <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
 	 <!-- Following component removed to avoid bmconv.exe collision with S60 version, collaterals: fontcomp.exe not built by OS anymore -->
 <!--     <component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+      <unit bldFile="/sf/os/graphics/graphicstools/gdi_tools/group" mrp="/sf/os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
      </component>
 -->
     </collection>
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/os/kernelhwsrv/package_definition.xml
--- a/symbian2/os/kernelhwsrv/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/os/kernelhwsrv/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -16,18 +16,18 @@
     <collection name="n:unistore2" long-name="UniStore2 Flash Translation Layer" level="hw-if">
      <component name="n:uiidrivers" long-name="UniStore2 Drivers" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/unistore2" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2.mrp"/> -->
      </component>
      <component name="n:uiicore" long-name="UniStore2 Core" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2_undeliverable.mrp"/>
      </component>
      <component name="n:uiicrashlogger" long-name="UniStore2 Crash Logger" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2/base_crashflash_unistore2.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2/base_crashflash_unistore2.mrp"/> -->
      </component>
      <component name="n:uiibootsupport" long-name="UniStore2 Boot Support" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/unistore2/uiibootsupport/nandloader/unistore2" mrp="os/kernelhwsrv/unistore2/uiibootsupport/base_nandboot_unistore2.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/unistore2/uiibootsupport/nandloader/unistore2" mrp="/sf/os/kernelhwsrv/unistore2/uiibootsupport/base_nandboot_unistore2.mrp"/> -->
      </component>
     </collection>
     <collection name="bsptemplate" long-name="BSP Template" level="hw-if">
@@ -46,15 +46,13 @@
      </component>
      <component name="n:sdiotest" long-name="SDIO Tests" filter="gt" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/kerneltest/sdiotest" mrp="os/kernelhwsrv/kerneltest/sdiotest/base_sdiotests.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/kerneltest/sdiotest" mrp="/sf/os/kernelhwsrv/kerneltest/sdiotest/base_sdiotests.mrp"/> -->
      </component>
-     <component name="n:e32utils" long-name="E32 Utilities" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/> -->
+     <component name="e32utils" long-name="E32 Utilities" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32utils/group" mrp="/sf/os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
      </component>
-     <component name="n:f32test" long-name="File Server Tests" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/> -->
+     <component name="f32test" long-name="File Server Tests" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="/sf/os/kernelhwsrv/kerneltest/f32test/group" mrp="/sf/os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
      </component>
     </collection>
     <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
@@ -84,11 +82,11 @@
     <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
      <component name="n:sdcard3c" long-name="SD Card 3C Driver" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c/base_e32_sd3c.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c/base_e32_sd3c.mrp"/> -->
      </component>
      <component name="n:sdcard4c" long-name="SD Card 4C Driver" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c/base_e32_sd4c.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c/base_e32_sd4c.mrp"/> -->
      </component>
      <component name="mediadrivers" long-name="Media Drivers" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- these are for storage media-->
@@ -110,7 +108,7 @@
      </component>
      <component name="n:nandftl" long-name="SSR Flash Translation Layer" filter="gt" introduced="7.0s" deprecated="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sftl" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sftl/base_f32_sftl.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sftl" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sftl/base_f32_sftl.mrp"/> -->
      </component>
      <component name="estart" long-name="Base Starter" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
@@ -143,11 +141,11 @@
      </component>
      <component name="n:ntfs" long-name="NTFS" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/ntfs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/ntfs/base_f32_sntfs.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/ntfs" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/ntfs/base_f32_sntfs.mrp"/> -->
      </component>
      <component name="n:iso9660fs" long-name="ISO9660 File System" filter="gt" introduced="8.1b" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/iso9660" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/iso9660/base_f32_siso9660.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/iso9660" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/iso9660/base_f32_siso9660.mrp"/> -->
      </component>
     </collection>
     <collection name="halservices" long-name="HAL Services" level="framework">
@@ -179,4 +177,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/os/lbs/package_definition.xml
--- a/symbian2/os/lbs/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/os/lbs/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -21,7 +21,7 @@
      </component>
      <component name="n:agpsintegrationmodule" long-name="A-GPS Integration Module" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/lbs/datasourcemodules/agpsintegrationmodule/group" mrp="os/lbs/datasourcemodules/agpsintegrationmodule/group/lbs_datasourceplugins.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/lbs/datasourcemodules/agpsintegrationmodule/group" mrp="/sf/os/lbs/datasourcemodules/agpsintegrationmodule/group/lbs_datasourceplugins.mrp"/> -->
      </component>
     </collection>
     <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
@@ -63,9 +63,8 @@
      <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
       <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
      </component>
-     <component name="n:suplprotocolmodule" long-name="SUPL Protocol Module" introduced="tb91" deprecated="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/> -->
+     <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="tb91" deprecated="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
      </component>
     </collection>
     <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/os/persistentdata/package_definition.xml
--- a/symbian2/os/persistentdata/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/os/persistentdata/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -24,9 +24,12 @@
      <component name="filelogger" long-name="File Logger" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/persistentdata/loggingservices/filelogger/group" mrp="/sf/os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
      </component>
+<!-- MattD: RFileLogger is in the PDK Overlay and is more recent -->
+<!--     
      <component name="rfilelogger" long-name="RFile Logger" introduced="9.1" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/persistentdata/loggingservices/rfilelogger/group" mrp="/sf/os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
      </component>
+-->     
     </collection>
     <collection name="traceservices" long-name="Trace Services" level="server">
      <component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/os/security/package_definition.xml
--- a/symbian2/os/security/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/os/security/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -63,4 +63,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/os/shortlinksrv/package_definition.xml
--- a/symbian2/os/shortlinksrv/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/os/shortlinksrv/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -105,4 +105,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/os/textandloc/package_definition.xml
--- a/symbian2/os/textandloc/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/os/textandloc/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -37,14 +37,14 @@
      </component>
      <component name="n:itypefontrasteriser" long-name="iType Font Rasteriser" filter="gt" introduced="tb92" purpose="development" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/graphics/fbs/itypefontrasteriser/group" mrp="os/graphics/fbs/itypefontrasteriser/group/graphics_itype.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/graphics/fbs/itypefontrasteriser/group" mrp="/sf/os/graphics/fbs/itypefontrasteriser/group/graphics_itype.mrp"/> -->
      </component>
      <component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/textandloc/fontservices/referencefonts/group" mrp="/sf/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
      </component>
      <component name="n:testfonts" long-name="Test Fonts" filter="gt" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/textandloc/fontservices/graphicstestfonts/group" mrp="os/textandloc/fontservices/graphicstestfonts/group/graphics_testfonts.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/textandloc/fontservices/graphicstestfonts/group" mrp="/sf/os/textandloc/fontservices/graphicstestfonts/group/graphics_testfonts.mrp"/> -->
      </component>
     </collection>
     <collection name="textlayout" long-name="Text Layout" level="text">
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/ostools/osrndtools/package_definition.xml
--- a/symbian2/ostools/osrndtools/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/ostools/osrndtools/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition name="foundation" schema="2.0.1">
- <systemModel>
-  <layer name="ostools" long-name="OS Tools">
-   <block name="osrndtools" long-name="OS RD tools" tech_domain="to" level="services" levels="fw trace">
+<systemModel>
+<layer name="ostools" long-name="OS Tools">
+<block name="osrndtools" long-name="OS RD tools" tech_domain="to" level="services" levels="fw trace">
     <collection name="stif" long-name="STIF" level="fw">
      <component name="testinterface" long-name="Test Interface" origin-model="foundation">
       <unit bldFile="/sf/ostools/osrndtools/stif/testinterface/group"/>
@@ -101,11 +101,11 @@
     <collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
      <component name="cinidata" long-name="CINI Data" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/osrndtools/testexecfw1/cinidata" mrp="os/osrndtools/testexecfw1/cinidata/tools_cinidata.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/osrndtools/testexecfw1/cinidata" mrp="/sf/os/osrndtools/testexecfw1/cinidata/tools_cinidata.mrp"/> -->
      </component>
      <component name="testexecute" long-name="Test Execute" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/osrndtools/testexecfw1/testexecute/Group" mrp="os/osrndtools/testexecfw1/testexecute/Group/tools_testexecute.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/osrndtools/testexecfw1/testexecute/Group" mrp="/sf/os/osrndtools/testexecfw1/testexecute/Group/tools_testexecute.mrp"/> -->
      </component>
     </collection>
     <collection name="osrndtools_info" long-name="OS RD tools Info" level="trace">
@@ -113,7 +113,7 @@
       <unit bldFile="/sf/ostools/osrndtools/group"/>
      </component>
     <component name="osrndtools_metadata" long-name="OS RD tools Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
+      <unit mrp="/sf/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
      </component>
     </collection>
 	<collection name="osrndtools_plat" long-name="OS RD tools Platform Interfaces" level="trace">
@@ -131,6 +131,6 @@
      </component>
     </collection>
    </block>
-  </layer>
- </systemModel>
-</SystemDefinition>
+</layer>
+</systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/tools/homescreentools/package_definition.xml
--- a/symbian2/tools/homescreentools/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/tools/homescreentools/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition name="foundation" schema="2.0.1">
- <systemModel>
-  <layer name="tools" long-name="Tools">
-   <block name="homescreentools" long-name="Home Screen Tools" tech_domain="ui" level="services" levels="tool install">
+<systemModel>
+<layer name="tools" long-name="Tools">
+<block name="homescreentools" long-name="Home Screen Tools" tech_domain="ui" level="services" levels="tool install">
     <collection name="dtdinstaller" long-name="DTD Installer" level="install">
      <component name="dtdinstaller_build" origin-model="foundation">
       <unit bldFile="/sf/tools/homescreentools/dtdinstaller/group"/>
@@ -18,12 +18,7 @@
       <unit bldFile="/sf/tools/homescreentools/themetool/group"/>
      </component>
     </collection>
-    <collection name="homescreentools_info" long-name="Home Screen Tools Info" level="install">
-     <component unofficial="yes" name="homescreentools_build" long-name="Home Screen Tools Build" origin-model="foundation">
-      <unit bldFile="/sf/tools/homescreentools/group"/>
-     </component>
-    </collection>
    </block>
-  </layer>
- </systemModel>
-</SystemDefinition>
+</layer>
+</systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/tools/platformtools/package_definition.xml
--- a/symbian2/tools/platformtools/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/tools/platformtools/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition name="foundation" schema="2.0.1">
- <systemModel>
+<systemModel>
 <layer name="tools" long-name="Tools">
-   <block name="platformtools" long-name="Platform Tools" tech_domain="to" level="generic">
+<block name="platformtools" long-name="Platform Tools" tech_domain="to" level="generic">
     <collection name="gfxconversion" long-name="Graphics Conversion">
      <component name="bmconv_s60" long-name="Bm Conv S60" origin-model="foundation">
       <unit bldFile="/sf/tools/platformtools/gfxconversion/bmconv_s60/group"/>
@@ -11,12 +11,7 @@
       <unit bldFile="/sf/tools/platformtools/gfxconversion/mifconv/group"/>
      </component>
     </collection>
-    <collection name="platformtools_info" long-name="Platform Tools Info">
-     <component unofficial="yes" name="platformtools_build" long-name="Platform Tools Build" origin-model="foundation">
-      <unit bldFile="/sf/tools/platformtools/group"/>
-     </component>
-    </collection>
    </block>
-  </layer>
- </systemModel>
-</SystemDefinition>
+</layer>
+</systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/tools/rndtools/package_definition.xml
--- a/symbian2/tools/rndtools/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/tools/rndtools/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition name="foundation" schema="2.0.1">
- <systemModel>
+<systemModel>
 <layer name="tools" long-name="Tools">
-   <block name="rndtools" long-name="RD tools" tech_domain="to" level="services" levels="app generic specific">
+<block name="rndtools" long-name="RD tools" tech_domain="to" level="services" levels="app generic specific">
     <collection name="creator" long-name="Creator" level="app">
      <component name="creator_build" origin-model="foundation">
       <unit bldFile="/sf/tools/rndtools/creator/group"/>
@@ -51,8 +51,20 @@
      </component>
     </collection>
     <collection name="htiui" long-name="HTI UI" level="generic">
-     <!-- Empty duplicate component HtiCommPlugins removed -->
-     <!-- Empty duplicate component HtiServicePlugins removed -->
+     <component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
+      <unit bldFile="/sf/tools/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
+     </component>
+     <component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
+      <!-- can only have a single unit. Should #include from a common bld.inf file -->
+      <unit bldFile="/sf/tools/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
+      <unit bldFile="/sf/tools/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
+      <unit bldFile="/sf/tools/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
+      <unit bldFile="/sf/tools/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
+      <unit bldFile="/sf/tools/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
+      <unit bldFile="/sf/tools/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
+      <unit bldFile="/sf/tools/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
+      <unit bldFile="/sf/tools/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
+     </component>
      <component name="htidevicereboot" long-name="HTI DeviceR eboot" origin-model="foundation">
       <unit bldFile="/sf/tools/rndtools/htiui/htidevicereboot/group"/>
      </component>
@@ -70,9 +82,8 @@
      <component name="memspyui_build" origin-model="foundation">
       <unit bldFile="/sf/tools/rndtools/memspyui/group"/>
      </component>
-    </collection>
+    </collection>    
    </block>
-  </layer>
- </systemModel>
-</SystemDefinition>
-
+</layer>
+</systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r 35423c29605e -r 6ea1b8b6cda9 symbian2/tools/swconfigtools/package_definition.xml
--- a/symbian2/tools/swconfigtools/package_definition.xml	Tue Nov 17 15:28:17 2009 +0000
+++ b/symbian2/tools/swconfigtools/package_definition.xml	Fri Nov 27 16:49:24 2009 +0000
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition name="foundation" schema="2.0.1">
- <systemModel>
+<systemModel>
 <layer name="tools" long-name="Tools">
-   <block name="swconfigtools" long-name="Software Config Tools" tech_domain="to" level="services">
+<block name="swconfigtools" long-name="Software Config Tools" tech_domain="to" level="services">
     <collection name="gid_pc_tool" long-name="GID PC Tool">
      <component name="dbimporter" long-name="DB Importer" origin-model="foundation">
       <unit bldFile="/sf/tools/swconfigtools/gid_pc_tool/group"/>
      </component>
     </collection>
    </block>
-  </layer>
- </systemModel>
-</SystemDefinition>
+</layer>
+</systemModel>
+</SystemDefinition>
\ No newline at end of file