# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1279040668 -3600
# Node ID 92112409797050c43d3a18e47fb224817dc946a5
# Parent  589d0dcca7298dda9924196736d6bf5b15adcc2f
Update package models from latest system model  (platform@011afa5a8776)

diff -r 589d0dcca729 -r 921124097970 symbian4/adaptation/stubs/package_definition.xml
--- a/symbian4/adaptation/stubs/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/adaptation/stubs/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -62,11 +62,6 @@
 <unit bldFile="/sf/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
 </component>
 </collection>
-<collection name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub" level="adaptation">
-<component name="btaudioadaptation_stub_build" long-name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
-<unit bldFile="/sf/adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-</collection>
 <collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
 <component name="drm_stubs_build" long-name="DRM Stubs Build">
 <unit bldFile="/sf/adaptation/stubs/drm_stubs/group"/>
diff -r 589d0dcca729 -r 921124097970 symbian4/app/calendarwidget/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/app/calendarwidget/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (block*|collection*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT block (subblock*|collection*)*>
+ <!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT subblock (collection)*>
+ <!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT collection (component)*>
+ <!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED>
+ <!ELEMENT component (unit)*>
+ <!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) 'N'
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose (optional|mandatory|development) 'optional'>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED>
+]>
+<SystemDefinition name="Symbian^4" schema="2.0.1">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="calendarwidget" level="apps" long-name="Calendar Widget" levels="build app">
+<collection name="calendarwidget_info" long-name="Calendar Widget Info" level="build">
+<component name="calendarwidget_rom" long-name="Calendar Widget ROM" filter="dfs_build" introduced="^4">
+<!-- remove subdirs and put exports into a real bld.inf  -->
+<unit bldFile="/sf/app/calendarwidget" proFile="calendarwidget.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="calendarwidgetinstaller" long-name="Calendar Widget Installer" level="build">
+<!-- collection is really a component, need to move down a directory -->
+<component name="calendarwidgetinstaller_build" long-name="Calendar Widget Installer Build" filter="dfs_build" introduced="^4" class="placeholder">
+<!--  built by calendarwidget_rom
+	  <unit bldFile="calendarwidgetinstaller" qt:qmakeArgs="-r" qt:proFile="calendarwidgetinstaller.pro"/> -->
+</component>
+</collection>
+<collection name="calendarwidgetplugin" long-name="Calendar Widget Plugin" level="app">
+<!-- collection is really a component, need to move down a directory -->
+<component name="calendarwidgetplugin_build" long-name="Calendar Widget Plugin Build" filter="dfs_build" introduced="^4" plugin="Y" class="placeholder">
+<!--  built by calendarwidget_rom
+	  <unit bldFile="calendarwidgetplugin" qt:qmakeArgs="-r" qt:proFile="calendarwidgetplugin.pro"/> -->
+</component>
+<component name="calendarwidgetplugin_test" long-name="Calendar Widget Plugin Test" filter="dfs_build" introduced="^4">
+<unit bldFile="/sf/app/calendarwidget/calendarwidgetplugin/tsrc" qmakeArgs="-r" proFile="tsrc.pro"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r 589d0dcca729 -r 921124097970 symbian4/app/commonemail/package_definition.xml
--- a/symbian4/app/commonemail/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/app/commonemail/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -57,7 +57,16 @@
 <!-- need to resolve the qt parts into proper components, then uncomment the units -->
 <collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
 <component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
-<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
+<!--<unit bldFile="email_plat/nmail_client_api" qt:proFile="nmail_client_api.pro"/> -->
+</component>
+<component name="email_services_api" long-name="Email Services API" filter="s60" introduced="^4" class="api placeholder">
+<!--<unit bldFile="email_plat/email_services_api" qt:proFile="email_services_api.pro"/> -->
+</component>
+<component name="nmail_settings_api" long-name="NMail Settings API" filter="s60" introduced="^4" class="api placeholder">
+<!--<unit bldFile="email_plat/nmail_settings_api" qt:proFile="nmail_settings_api.pro"/> -->
+</component>
+<component name="email_client_api" long-name="EMail Client API" filter="s60" introduced="^4" class="api placeholder">
+<!--<unit bldFile="email_plat/email_client_api" qt:proFile="email_client_api.pro"/> -->
 </component>
 </collection>
 <collection name="emailservices" long-name="Email Services" level="service">
@@ -131,7 +140,7 @@
 <collection name="commonemail_info" long-name="Email Apps Info" level="app">
 <component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
 <!-- split into actual components -->
-<unit bldFile="/sf/app/commonemail/group"/>
+<unit bldFile="/sf/app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 </block>
diff -r 589d0dcca729 -r 921124097970 symbian4/app/contacts/package_definition.xml
--- a/symbian4/app/contacts/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/app/contacts/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -53,7 +53,7 @@
 <SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
+   <block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services plugin ui">
 <collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
 <component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
 </collection>
@@ -75,19 +75,21 @@
 <unit bldFile="/sf/app/contacts/phonebookui" proFile="phonebookui.pro"/>
 </component>
 </collection>
+<collection name="phonebookengines_old" long-name="Old Phonebook Engines" level="engine">
+<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
+<unit bldFile="/sf/app/contacts/phonebookengines_old/contactsmodel/groupsql" mrp="/sf/app/contacts/phonebookengines_old/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
+</component>
+</collection>
 <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
 <component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
 </component>
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="/sf/app/contacts/phonebookengines_old/contactsmodel/groupsql" mrp="/sf/app/contacts/phonebookengines_old/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
 <component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
 </component>
-<component name="qtcontactsmobility" filter="s60" long-name="Qt Contacts Mobility" introduced="^4" plugin="Y">
+<component name="qtcontactsmobility" filter="s60" long-name="Qt Contacts Mobility" introduced="^4" plugin="Y" class="placeholder">
 <!-- need to move to this actual dir rather than including something from another collection -->
-<unit bldFile="/sf/app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
+<!-- <unit bldFile="qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/> -->
 </component>
 <component name="cntlistmodel" filter="s60" long-name="Contact List Model" introduced="^4">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntlistmodel" proFile="cntlistmodel.pro"/>
@@ -121,6 +123,12 @@
 <unit bldFile="/sf/app/contacts/presencecache/presencecacheqt" proFile="presencecacheqt.pro"/>
 </component>
 </collection>
+<collection name="contactwidgethsplugin" long-name="Contact Widget Homescreen Plugin" level="plugin">
+<!-- collection is really a component, move down a directory -->
+<component name="contactwidgethsplugin_build" long-name="Contact Widget Homescreen Plugin Build" introduced="^4">
+<unit bldFile="/sf/app/contacts/contactwidgethsplugin" proFile="contactwidgethsplugin.pro"/>
+</component>
+</collection>
 <collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
 <component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
 <unit mrp="/sf/app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
diff -r 589d0dcca729 -r 921124097970 symbian4/app/devicecontrol/package_definition.xml
--- a/symbian4/app/devicecontrol/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/app/devicecontrol/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -60,6 +60,12 @@
 <unit bldFile="/sf/app/devicecontrol/devicemgmtdialogsplugin" proFile="devicemgmtdialogsplugin.pro"/>
 </component>
 </collection>
+<collection name="devicemgmtindicatorsplugin" long-name="Device Management Indicators Plugin" level="support">
+<!-- collection is really a component. Need to move down a dir -->
+<component name="devicemgmtindicatorsplugin_build" long-name="Device Management Indicators Plugin Build" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="/sf/app/devicecontrol/devicemgmtindicatorsplugin" proFile="devicemgmtindicatorsplugin.pro"/>
+</component>
+</collection>
 <collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
 <component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
 <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
@@ -76,6 +82,15 @@
 <unit bldFile="/sf/app/devicecontrol/clientprovisioning/cpqtsp" proFile="cpqtsp.pro"/>
 </component>
 </collection>
+<collection name="applicationmanagement" long-name="Applicaton Management" level="mid">
+<component name="applicationmgmtserver" long-name="Applicaton Management Server" filter="s60" introduced="^4">
+<unit bldFile="/sf/app/devicecontrol/applicationmanagement/server" proFile="server.pro"/>
+</component>
+<component name="applicationmgmt_build" long-name="Applicaton Management Build" filter="s60" introduced="^4">
+<!-- need to break up into components or move down a directory -->
+<unit bldFile="/sf/app/devicecontrol/applicationmanagement/group"/>
+</component>
+</collection>
 <collection name="omadmadapters" long-name="OMA DM Adapters" level="support">
 <component name="omadmadapters_build" long-name="OMA DM Adapters Build" filter="s60">
 <!-- need to split IBY into the components or make this a ROM component -->
@@ -102,8 +117,8 @@
 <component name="globalwlansettings" long-name="Global WLAN Settings" filter="s60">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/globalwlansettings/group"/>
 </component>
-<component name="nsmldminternet" filter="s60" class="placeholder">
-<!--  <unit bldFile="omadmadapters/nsmldminternet/group"/> -->
+<component name="nsmldminternet" filter="s60">
+<unit bldFile="/sf/app/devicecontrol/omadmadapters/nsmldminternet/group"/>
 </component>
 <component name="nsmldmalwaysonadapter" long-name="Always Online Device Management Adapter" filter="s60" introduced="9.1" plugin="Y">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/nsmldmalwaysonadapter/group"/>
@@ -124,13 +139,25 @@
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/mms/bld"/>
 </component>
 <component name="omadm_fota" long-name="OMA DM FOTA" filter="s60">
-<!--  <unit bldFile="omadmadapters/fota/bld"/> -->
+<unit bldFile="/sf/app/devicecontrol/omadmadapters/fota/bld"/>
 </component>
 <component name="omadm_imps" long-name="OMA DM IMPS" filter="s60">
 <!--  <unit bldFile="omadmadapters/imps/bld"/> -->
 </component>
-<component name="dcmodmadapter" long-name="DC Management Object  DM Adapter" filter="s60" plugin="Y" class="placeholder">
-<!--  <unit bldFile="omadmadapters/dcmodmadapter/group"/> -->
+<component name="dcmodmadapter" long-name="DC Management Object  DM Adapter" filter="s60" plugin="Y">
+<unit bldFile="/sf/app/devicecontrol/omadmadapters/dcmodmadapter/group"/>
+</component>
+</collection>
+<collection name="omadcmoadapters" long-name="OMA DC Management Object Adapters" level="support">
+<component name="omadcmoadapters_build" long-name="OMA DCMA Adapters Build" filter="s60" introduced="^4">
+<!-- need to break up into components  -->
+<unit bldFile="/sf/app/devicecontrol/omadcmoadapters/group"/>
+</component>
+</collection>
+<collection name="omacpadapters" long-name="OMA Client Provisioning Adapters" level="support">
+<component name="omacpadapters_build" long-name="OMA CP Adapters Build" filter="s60" introduced="^4">
+<!-- need to break up into components  -->
+<unit bldFile="/sf/app/devicecontrol/omacpadapters/bld"/>
 </component>
 </collection>
 </block>
diff -r 589d0dcca729 -r 921124097970 symbian4/app/homescreen/package_definition.xml
--- a/symbian4/app/homescreen/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/app/homescreen/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -90,12 +90,11 @@
 <unit bldFile="/sf/app/homescreen/homescreenapp" proFile="homescreenapp_exports_to_rom.pri" qmakeArgs="-r -config rom"/>
 </component>
 </collection>
-<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<!-- break collection info components, or move down a dir and make it a component -->
-<component name="taskswitcherapp_build" long-name="Task Switcher Application Build">
-<unit bldFile="/sf/app/homescreen/taskswitcherapp" proFile="taskswitcherapp.pro" qmakeArgs="-r -config rom"/>
+<collection name="screensaver" long-name="Screen Saver" level="ss">
+<!-- break collection into components, or move down a dir and make it a component -->
+<component name="screensaver_build" long-name="Screen Saver Build">
+<unit bldFile="/sf/app/homescreen/screensaver" proFile="screensaver.pro" qmakeArgs="-r -config rom"/>
 </component>
-<component name="tsdevicedialogplugin" long-name="Task Switcher Device Dialog Plugin" introduced="^4" plugin="Y"/>
 </collection>
 </block>
   </layer>
diff -r 589d0dcca729 -r 921124097970 symbian4/app/phone/package_definition.xml
--- a/symbian4/app/phone/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/app/phone/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -171,8 +171,8 @@
 <component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
 <unit bldFile="/sf/app/phone/phoneplugins/csplugin/group"/>
 </component>
-<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="/sf/app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
+<component name="dialerwidgetplugin" filter="s60" long-name="Dialer Widget Plugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/app/phone/phoneplugins/dialerwidgetplugin" proFile="dialerwidgetplugin.pro"/>
 </component>
 <component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
 <unit bldFile="/sf/app/phone/phoneplugins/infowidgetplugin" proFile="infowidgetplugin.pro"/>
diff -r 589d0dcca729 -r 921124097970 symbian4/app/rndtools/package_definition.xml
--- a/symbian4/app/rndtools/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/app/rndtools/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -97,9 +97,8 @@
 </component>
 </collection>
 <collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifuiqt" filter="s60" long-name="STIF Qt UI" purpose="development" introduced="^4">
-<unit bldFile="/sf/app/rndtools/stifui/qt" proFile="stifqtui.pro"/>
-<!-- should use stifuiqt as the dir name -->
+<component name="stifui_avkon" filter="s60" long-name="STIF UI for Avkon" purpose="development">
+<unit bldFile="/sf/app/rndtools/stifui/avkon/group"/>
 </component>
 </collection>
 <collection name="memspyui" long-name="Memspy UI" level="generic">
diff -r 589d0dcca729 -r 921124097970 symbian4/app/search/package_definition.xml
--- a/symbian4/app/search/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/app/search/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -54,12 +54,27 @@
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
-<collection name="search_info" long-name="Search Info">
+<collection name="search_info" long-name="Search Info" level="base">
 <component name="search_build" long-name="Search Build" introduced="^4">
 <unit bldFile="/sf/app/search/group"/>
 </component>
 </collection>
-<collection name="searchui" long-name="Search UI">
+<collection name="search_plat" long-name="Search Platform Interfaces" level="api">
+<component name="search_plat_build" long-name="Search Platform Interfaces Build" introduced="^4" class="api">
+<unit bldFile="/sf/app/search/search_plat" proFile="search_plat.pro"/>
+</component>
+</collection>
+<collection name="onlinesearchproviders" long-name="Online Search Providers" level="eng">
+<component name="onlinesearchproviders_build" long-name="Online Search Providers Build" introduced="^4">
+<unit bldFile="/sf/app/search/onlinesearchproviders" proFile="onlinesearchproviders.pro"/>
+</component>
+</collection>
+<collection name="search_harvesterplugins" long-name="Search Harvester Plugins" level="base">
+<component name="search_qtemailfetcher" long-name="Search Qt Email Fetcher" introduced="^4" plugin="Y">
+<unit bldFile="/sf/app/search/harvesterplugins/messaging/email/qtemailfetcher" proFile="qtemailfetcher.pro"/>
+</component>
+</collection>
+<collection name="searchui" long-name="Search UI" level="app">
 <component name="searchui_build" long-name="Search UI Build" introduced="^4">
 <unit bldFile="/sf/app/search/searchui" proFile="searchui.pro"/>
 </component>
diff -r 589d0dcca729 -r 921124097970 symbian4/app/videoplayer/package_definition.xml
--- a/symbian4/app/videoplayer/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/app/videoplayer/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -80,8 +80,8 @@
 <component name="mediasettingsengine" filter="s60" long-name="Media Settings Engine">
 <unit bldFile="/sf/app/videoplayer/mediasettings/mediasettingsengine/group"/>
 </component>
-<component name="videosettingsplugin" filter="s60" long-name="Video Settings Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="mediasettings/videosettingsplugin" qt:proFile="videosettingsplugin.pro"/> -->
+<component name="videosettingsplugin" filter="s60" long-name="Video Settings Plugin" plugin="Y">
+<unit bldFile="/sf/app/videoplayer/mediasettings/videosettingsplugin" proFile="videosettingsplugin.pro"/>
 </component>
 </collection>
 <collection name="videoplayerapp" long-name="Video Player App" level="apps">
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/accesssec/package_definition.xml
--- a/symbian4/mw/accesssec/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/accesssec/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -61,14 +61,23 @@
 <component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
 <unit bldFile="/sf/mw/accesssec/accesssec_plat/eap_type_api/group"/>
 </component>
+<component name="eap_qt_configuration_api" long-name="EAP Qt Configuration API" filter="s60" introduced="^4" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat" proFile="accesssec_plat.pro" qmakeArgs="-r"/>
+</component>
 </collection>
 <collection name="securitysettings" long-name="WLAN Security Settings" level="specific">
 <component name="accesssec_qtconfigutils" filter="s60" long-name="Access Security Config Utils" introduced="^4">
 <unit bldFile="/sf/mw/accesssec/securitysettings/qtconfigutils" proFile="qtconfigutils.pro" qmakeArgs="-r"/>
 </component>
-<component name="cpwlansecurityuiplugins" filter="s60" long-name="Control Panel WLAN Security UI Plugins" introduced="^4">
+<component name="cpwlansecurityuiplugins" filter="s60" long-name="Control Panel WLAN Security UI Plugins" introduced="^4" plugin="Y">
 <unit bldFile="/sf/mw/accesssec/securitysettings/cpwlansecurityuiplugins" proFile="cpwlansecurityuiplugins.pro" qmakeArgs="-r"/>
 </component>
+<component name="cpeapuiplugins" filter="s60" long-name="Control Panel EAP UI Pugins" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/accesssec/securitysettings/cpeapuiplugins" proFile="cpeapuiplugins.pro" qmakeArgs="-r"/>
+</component>
+<component name="eapqtdialogs" filter="s60" long-name="EAP Qt Dialogs" introduced="^4">
+<unit bldFile="/sf/mw/accesssec/securitysettings/eapqtdialogs" proFile="eapqtdialogs.pro" qmakeArgs="-r"/>
+</component>
 </collection>
 <collection name="eapol" long-name="EAPOL" level="framework">
 <component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/appinstall/package_definition.xml
--- a/symbian4/mw/appinstall/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/appinstall/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -89,9 +89,8 @@
 </component>
 </collection>
 <collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- collection is really just a component. Move down one diretcory -->
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="/sf/mw/appinstall/ncdengine/group"/>
+<component name="ncdengine_build" filter="s60" long-name="NCD Engine" introduced="^1">
+<unit bldFile="/sf/mw/appinstall/ncdengine/engine" proFile="engine.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="appinstaller" long-name="Application Installer" level="generic">
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/appsupport/package_definition.xml
--- a/symbian4/mw/appsupport/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -249,8 +249,12 @@
 <component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/systemsettings/gssensorplugin/group"/>
 </component>
-<component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-<unit bldFile="/sf/mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
+<component name="accindicatorplugin" filter="s60" long-name="ACC Indicator Plugin" plugin="Y">
+<unit bldFile="/sf/mw/appsupport/systemsettings/accindicatorplugin" proFile="accindicatorplugin.pro"/>
+</component>
+<component name="accindicatorsettings" filter="s60" long-name="ACC Indicator Settings">
+<!-- can't have a component inside another component -->
+<unit bldFile="/sf/mw/appsupport/systemsettings/accindicatorplugin/accindicatorsettings" proFile="accindicatorsettings.pro"/>
 </component>
 </collection>
 <collection name="filehandling" long-name="File Handling" level="server">
@@ -277,7 +281,7 @@
 <unit bldFile="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
 </component>
 <component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="/sf/mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+<unit mrp="/sf/mw/appsupport/commonappservices/doc_pub/app-services_documentation.mrp"/>
 </component>
 <component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/commonappservices/backuprestorenotification/group" mrp="/sf/mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/btservices/package_definition.xml
--- a/symbian4/mw/btservices/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/btservices/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -114,6 +114,9 @@
 <component name="usb_obexservicemanager_client_api" long-name="OBEX Service Manager Client API" filter="s60" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/usb_obexservicemanager_client_api/group"/>
 </component>
+<component name="bt_remote_device_setting_api" long-name="BT Remote Device Setting API" filter="s60" introduced="^4" class="api">
+<unit bldFile="/sf/mw/btservices/btservices_plat" proFile="btservices_plat.pro"/>
+</component>
 </collection>
 <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
 <component name="btnotifclient" filter="s60" long-name="Bluetooth Notification Client" introduced="^4">
@@ -159,6 +162,12 @@
 <component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
 </component>
+<component name="btindicator" filter="s60" long-name="Bluetooth Indicator" introduced="^4">
+<unit bldFile="/sf/mw/btservices/bluetoothengine/btindicator" proFile="btindicator.pro"/>
+</component>
+<component name="bluetoothengine_conf" filter="s60" long-name="Bluetooth Engine Config" introduced="^4" class="config">
+<unit bldFile="/sf/mw/btservices/bluetoothengine/conf"/>
+</component>
 </collection>
 <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
 <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
@@ -182,6 +191,10 @@
 <component name="obexreceiveservices" long-name="OBEX Receive Services" filter="s60">
 <unit bldFile="/sf/mw/btservices/btobexprofiles/obexreceiveservices/group"/>
 </component>
+<component name="btmsgviewer" long-name="BT Message Viewer" filter="s60" introduced="^4">
+<!-- should be moved out from under obexreceiveservices into own component dir -->
+<unit bldFile="/sf/mw/btservices/btobexprofiles/obexreceiveservices/btmsgviewer" proFile="btmsgviewer.pro"/>
+</component>
 <component name="obexsendservices" long-name="OBEX Send Services" filter="s60">
 <unit bldFile="/sf/mw/btservices/btobexprofiles/obexsendservices/group"/>
 </component>
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/drm/package_definition.xml
--- a/symbian4/mw/drm/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/drm/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -133,12 +133,19 @@
 <!-- should be split into the above files, or them collapsed into a single component -->
 <unit bldFile="/sf/mw/drm/commondrm/group"/>
 </component>
+<component name="commondrm_qt_build" filter="s60" long-name="Common DRM Qt Build" introduced="^4">
+<!-- split up build components -->
+<unit bldFile="/sf/mw/drm/commondrm" qmakeArgs="-r" proFile="commondrm.pro"/>
+</component>
 </collection>
 <collection name="omadrm" long-name="OMA DRM" level="server">
-<!-- collection is really a component. Move down a directory -->
+<!-- split up build components -->
 <component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
 <unit bldFile="/sf/mw/drm/omadrm/group"/>
 </component>
+<component name="omadrm_qt_build" filter="s60" long-name="OMA DRM Qt Build" introduced="^4">
+<unit bldFile="/sf/mw/drm/omadrm" proFile="omadrm.pro"/>
+</component>
 <component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
 <unit bldFile="/sf/mw/drm/omadrm/foundationcerts/group"/>
 </component>
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/homescreensrv/package_definition.xml
--- a/symbian4/mw/homescreensrv/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -54,11 +54,6 @@
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-<collection name="appfoundation" long-name="App Foundation" level="generic">
-<component name="appfoundation_build" long-name="App Foundation Build" introduced="^4">
-<unit bldFile="/sf/mw/homescreensrv/appfoundation" qmakeArgs="-r" proFile="appfoundation.pro"/>
-</component>
-</collection>
 <collection name="hswidgetmodel" long-name="Home Screen Widget Model" level="framework">
 <component name="hswidgetmodel_build" long-name="Home Screen Widget Model Build" introduced="^4">
 <unit bldFile="/sf/mw/homescreensrv/hswidgetmodel" qmakeArgs="-r" proFile="hswidgetmodel.pro"/>
@@ -89,10 +84,8 @@
 <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat" qmakeArgs="-r" proFile="homescreensrv_plat.pro"/>
 </component>
 <component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api"/>
-<component name="appruntimemodel_api" long-name="Appliction Run-Time Model API" filter="s60" introduced="^4" class="api"/>
 <component name="contentstorage_api" long-name="Content Storage API" filter="s60" introduced="^4" class="api"/>
 <component name="hswidgetmodel_api" long-name="HS Widget Model API" filter="s60" introduced="^4" class="api"/>
-<component name="statemodel_api" long-name="State Model API" filter="s60" introduced="^4" class="api"/>
 <component name="homescreen_information_api" long-name="Homescreen Information API" filter="s60" introduced="^4" class="api"/>
 </collection>
 <collection name="hsactivityfw" long-name="Activity Framework" level="fw">
@@ -111,6 +104,12 @@
 <unit bldFile="/sf/mw/homescreensrv/hsappkeyhandler" qmakeArgs="-r" proFile="hsappkeyhandler.pro"/>
 </component>
 </collection>
+<collection name="tsdevicedialog" long-name="Task Switcher Device Dialog" level="plugin">
+<component name="tsdevicedialog_build" long-name="Task Switcher Device Dialog Build" introduced="^4">
+<!-- break this up into real components -->
+<unit bldFile="/sf/mw/homescreensrv/tsdevicedialog" qmakeArgs="-r" proFile="tsdevicedialog.pro"/>
+</component>
+</collection>
 <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
 <component name="homescreensrvconf" long-name="Home Screen Services Config" introduced="^4" class="config">
 <unit bldFile="/sf/mw/homescreensrv" qmakeArgs="-r" proFile="homescreensrv_exports_to_rom.pri"/>
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/ipconnmgmt/package_definition.xml
--- a/symbian4/mw/ipconnmgmt/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/ipconnmgmt/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -55,6 +55,9 @@
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server utils api">
 <collection name="ipcm_plat" long-name="IP Connectivity Management Platform Interfaces" level="api">
+<component name="ipcm_plat_qt_build" long-name="IP Connectivity Management Qt Platform Interfaces" filter="s60" introduced="^4" class="api">
+<unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat" proFile="ipcm_plat.pro"/>
+</component>
 <component name="access_point_engine_misc_api" long-name="Access Point Engine Misc API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
 </component>
@@ -91,6 +94,9 @@
 <component name="flextimer_api" long-name="Flex Timer API" filter="s60" introduced="^4" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/flextimer_api/group"/>
 </component>
+<component name="mpm_vpn_toggle_api" long-name="MPM VPN Toggle API" filter="s60" introduced="^4" class="api">
+<unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/mpm_vpn_toggle_api/group"/>
+</component>
 </collection>
 <collection name="ipcm_pub" long-name="IP Connectivity Management Public Interfaces" level="api">
 <component name="connection_settings_api" long-name="Connection Settings API" filter="s60" class="api">
@@ -146,6 +152,24 @@
 <component name="cmmgr" filter="s60" long-name="CM Manager">
 <unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cmmgr/group"/>
 </component>
+<component name="connection_settings_shim" long-name="Connection Settings Shim" introduced="^4">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/connection_settings_shim" proFile="connection_settings_shim.pro" qmakeArgs="-r"/>
+</component>
+<component name="cmapplsettingsui" long-name="Connection Settings UI" introduced="^4">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cmapplsettingsui" proFile="cmapplsettingsui.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpipsettingsplugin" long-name="Connection Settings IP Plugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cpipsettingsplugin" proFile="cpipsettingsplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpdestinationplugin" long-name="CP Destination Plugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cpdestinationplugin" proFile="cpdestinationplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="cppacketdataapplugin" long-name="CP Packet Data AP Pplugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cppacketdataapplugin" proFile="cppacketdataapplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpwlanapplugin" long-name="CP WLAN AP Plugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cpwlanapplugin" proFile="cpwlanapplugin.pro" qmakeArgs="-r"/>
+</component>
 </collection>
 <collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
 <component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
@@ -159,11 +183,23 @@
 <component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
 <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
 </component>
+<component name="cellularindicatorplugin" long-name="Cellular Indicator Plugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/cellularindicatorplugin" proFile="cellularindicatorplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="indicatorobserver" long-name="Indicator Observer" introduced="^4">
+<unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/indicatorobserver" proFile="indicatorobserver.pro" qmakeArgs="-r"/>
+</component>
+<component name="connectionmonitoringnview" long-name="Connection View" introduced="^4">
+<unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connectionview" proFile="connectionview.pro" qmakeArgs="-r"/>
+</component>
 </collection>
 <collection name="connectionutilities" long-name="Connection Utilities" level="utils">
 <component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
 <unit bldFile="/sf/mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
 </component>
+<component name="confirmqueries" long-name="Confirm Queries" introduced="^4">
+<unit bldFile="/sf/mw/ipconnmgmt/connectionutilities/confirmqueries" proFile="confirmqueries.pro" qmakeArgs="-r"/>
+</component>
 </collection>
 <collection name="keepalive" long-name="Keep Alive" level="server">
 <component name="flextimer" filter="s60" long-name="Flex Timer" introduced="^4">
@@ -193,9 +229,6 @@
 <!-- need to move exports to another component, or make this a config component and revmove the #includes -->
 <unit bldFile="/sf/mw/ipconnmgmt/group"/>
 </component>
-<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-<unit bldFile="/sf/mw/ipconnmgmt" proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
-</component>
 </collection>
 </block>
   </layer>
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/legacypresence/package_definition.xml
--- a/symbian4/mw/legacypresence/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/legacypresence/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -95,41 +95,6 @@
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
 </component>
 </collection>
-<collection name="xdmengine" long-name="XDM Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-<unit bldFile="/sf/mw/legacypresence/xdmengine/group"/>
-</component>
-</collection>
-<collection name="xdmprotocols" long-name="XDM Protocols" level="fw">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
-<component name="xdmprotocols_build" filter="s60" long-name="XDM Protocols Build">
-<unit bldFile="/sf/mw/legacypresence/xdmprotocols/group"/>
-</component>
-</collection>
-<collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-<unit bldFile="/sf/mw/legacypresence/msgconnmanager/group"/>
-</component>
-</collection>
-<collection name="simpleengine" long-name="SIMPLE Engine" level="engine">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleengine_build" filter="s60" long-name="SIMPLE Engine Build">
-<unit bldFile="/sf/mw/legacypresence/simpleengine/group"/>
-</component>
-</collection>
-<collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-<unit bldFile="/sf/mw/legacypresence/presencefwsimpleadpt/group"/>
-</component>
-</collection>
-<collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-<component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-<unit bldFile="/sf/mw/legacypresence/simpledatamodeladapter/group"/>
-</component>
-</collection>
 </block>
   </layer>
  </systemModel>
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/mds/package_definition.xml
--- a/symbian4/mw/mds/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/mds/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -96,6 +96,21 @@
 </component>
 </collection>
 <collection name="locationmanager" long-name="Location Manager" level="mgr">
+<component name="geoconverter" filter="s60" long-name="Geoconverter" introduced="^4">
+<unit bldFile="/sf/mw/mds/locationmanager/geoconverter/group"/>
+</component>
+<component name="geo_tagcreator" filter="s60" long-name="Geo Tag Creator" introduced="^4">
+<unit bldFile="/sf/mw/mds/locationmanager/tagcreator/group"/>
+</component>
+<component name="reversegeocode" filter="s60" long-name="Reverse Geocode" introduced="^4">
+<unit bldFile="/sf/mw/mds/locationmanager/ReverseGeocode/group"/>
+</component>
+<component name="reversegeocoderplugin" filter="s60" long-name="Reverse Geo-Coder Plugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/mds/locationmanager/ReverseGeoCoderPlugin/group"/>
+</component>
+<component name="geotagger" filter="s60" long-name="Geo Tagger" introduced="^4">
+<unit bldFile="/sf/mw/mds/locationmanager/geotagger/group"/>
+</component>
 <component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
 <unit bldFile="/sf/mw/mds/locationmanager/locationtrail/group"/>
 </component>
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/messagingmw/package_definition.xml
--- a/symbian4/mw/messagingmw/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/messagingmw/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -68,12 +68,6 @@
 <unit bldFile="/sf/mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
 </component>
 </collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="support">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="msgbranched_build" filter="s60" long-name="Messaging Branched Build" class="config">
-<unit bldFile="/sf/mw/messagingmw/msgbranched/group"/>
-</component>
-</collection>
 <collection name="messagingfw" long-name="Messaging Framework" level="fw">
 <!-- should break this collection up into smaller related collections -->
 <component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/netprotocols/package_definition.xml
--- a/symbian4/mw/netprotocols/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/netprotocols/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -75,9 +75,6 @@
 <component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
 <unit bldFile="/sf/mw/netprotocols/httpfilters/deflatefilter/group"/>
 </component>
-<component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-<unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-</component>
 <component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
 <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
 </component>
@@ -90,9 +87,6 @@
 <component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
 <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilterproxy/group"/>
 </component>
-<component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-<unit bldFile="/sf/mw/netprotocols/httpfilters/uaproffilter/group"/>
-</component>
 </collection>
 <collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
 <component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/phonesrv/package_definition.xml
--- a/symbian4/mw/phonesrv/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/phonesrv/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -172,6 +172,9 @@
 <component name="dialpad_api" long-name="Dialpad API" filter="s60" introduced="^4" class="api">
 <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/dialpad_api/group"/>
 </component>
+<component name="phone_settings_ui_notes_api" long-name="Phone Settings UI Notes API" filter="s60" introduced="^4" class="api">
+<unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_settings_ui_notes_api/group"/>
+</component>
 </collection>
 <collection name="telutils" long-name="Telephony Utils" level="utils">
 <component name="phoneparser" filter="s60" long-name="Phone Parser">
@@ -213,6 +216,9 @@
 <component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development">
 <unit bldFile="/sf/mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
 </component>
+<component name="psuinotes" filter="s60" long-name="Phone Settings Notes UI" introduced="^4">
+<unit bldFile="/sf/mw/phonesrv/cellular/psuinotes" proFile="psuinotes.pro"/>
+</component>
 <component name="servicerequest" filter="s60" long-name="Service Request">
 <unit bldFile="/sf/mw/phonesrv/cellular/servicerequest/group"/>
 </component>
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/qt/package_definition.xml
--- a/symbian4/mw/qt/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -61,7 +61,7 @@
 </collection>
 <collection name="qt_info" long-name="Qt Info" level="mw">
 <component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="/sf/mw/qt" proFile="projects.pro" qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
+<unit bldFile="/sf/mw/qt" proFile="projects.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="qtdemos" long-name="Qt Demos" level="app"/>
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/remoteconn/package_definition.xml
--- a/symbian4/mw/remoteconn/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/remoteconn/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -85,6 +85,9 @@
 <component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="/sf/mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
 </component>
+<component name="mtpplaybackcontroldp" long-name="MTP Playback Control Data Provider" introduced="^4" purpose="optional" plugin="Y">
+<unit bldFile="/sf/mw/remoteconn/mtpdataproviders/mtpplaybackcontroldp/group" mrp="/sf/mw/remoteconn/mtpdataproviders/mtpplaybackcontroldp/group/mtp_playbackcontroldp.mrp"/>
+</component>
 </collection>
 <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
 <component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/remotemgmt/package_definition.xml
--- a/symbian4/mw/remotemgmt/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/remotemgmt/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -144,9 +144,6 @@
 <component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
 </component>
-<component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-</component>
 <component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
 </component>
@@ -159,19 +156,18 @@
 <component name="devicemgmt_dialogs_api" long-name="Device Management Dialogs API" filter="s60" introduced="^4" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/devicemgmt_dialogs_api/group"/>
 </component>
+<component name="dm_device_dialog_api" long-name="DM Device Dialog API" filter="s60" introduced="^4" class="api">
+<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_device_dialog_api/group"/>
+</component>
 </collection>
 <collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-<unit bldFile="/sf/mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-</component>
-<component name="dmutilserver" filter="s60" long-name="DM Util Server">
-<unit bldFile="/sf/mw/remotemgmt/policymanagement/dmutilserver/group"/>
+<component name="policyenginepolicies" long-name="Policy Engine Policies" filter="s60,!dfs_build">
+<unit bldFile="/sf/mw/remotemgmt/policymanagement/policyengine/policyenginepolicies/group"/>
 </component>
 <component name="policyengine" filter="s60" long-name="Policy Engine">
-<unit bldFile="/sf/mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
+<unit bldFile="/sf/mw/remotemgmt/policymanagement/policyengine" proFile="policyengine.pro"/>
 </component>
-<component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-<!--  need to distribute exports, etc into the other components and remove this-->
+<component name="policymanagement_config" filter="s60" long-name="Policy Management Config" class="config">
 <unit bldFile="/sf/mw/remotemgmt/policymanagement/group"/>
 </component>
 </collection>
@@ -231,15 +227,23 @@
 </component>
 </collection>
 <collection name="fotaapplication" long-name="FOTA Application" level="generic">
+<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
+<!-- need to make this a real component: move down a dir? break up? -->
+<unit bldFile="/sf/mw/remotemgmt/fotaapplication/group"/>
+</component>
 <component name="fotaserver" filter="s60" long-name="FOTA Server">
-<unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver/group"/>
+<unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver" proFile="fotaserver.pro"/>
 </component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands">
-<unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver/fotacustcmds/group"/>
+</collection>
+<collection name="devicemgmtnotifications" long-name="Device Management Notifications" level="server">
+<component name="devicemgmtnotifications_rom" filter="s60" long-name="DM Notifications ROM" introduced="^4">
+<unit bldFile="/sf/mw/remotemgmt/devicemgmtnotifications/rom"/>
 </component>
-<!-- really need to find a better way to do this -->
-<component name="fotacustcmds-alt" filter="s60" long-name="FOTA Custom Commands">
-<unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver/fotacustcmds/group"/>
+<component name="dmdevdialogclient" filter="s60" long-name="DM Device Dialog Client" introduced="^4">
+<unit bldFile="/sf/mw/remotemgmt/devicemgmtnotifications/dmdevdialogclient/bld"/>
+</component>
+<component name="dmdevdialogserver" filter="s60" long-name="DM Device Dialog Server" introduced="^4">
+<unit bldFile="/sf/mw/remotemgmt/devicemgmtnotifications/dmdevdialogserver/bld"/>
 </component>
 </collection>
 </block>
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/searchsrv/package_definition.xml
--- a/symbian4/mw/searchsrv/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/searchsrv/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -83,13 +83,18 @@
 <component name="searchserver" long-name="Search Server" filter="s60" introduced="^4">
 <unit bldFile="/sf/mw/searchsrv/searcher/SearchServer/group"/>
 </component>
+<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
+<!-- #include from common bld.inf or split into two components -->
+<unit bldFile="/sf/mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
+<unit bldFile="/sf/mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
+</component>
 </collection>
 <collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
 <component name="searchsrv_pluginfw" long-name="Search Server" filter="s60" introduced="^4">
 <unit bldFile="/sf/mw/searchsrv/harvester/pluginfw/group"/>
 </component>
 <component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60" introduced="^4">
-<unit bldFile="/sf/mw/searchsrv/harvester/HarvesterServer/group"/>
+<unit bldFile="/sf/mw/searchsrv/harvester/harvesterserver" proFile="harvester.pro"/>
 </component>
 </collection>
 <collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
@@ -98,9 +103,8 @@
 </component>
 </collection>
 <collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpixsearchclient" long-name="Qt CPIX Search Client" introduced="^4">
-<!-- Snag! qcpix.pro and qcpixsearchclient.pro in same directory! -->
-<unit bldFile="/sf/mw/searchsrv/qcpix" proFile="qcpixsearchclient.pro"/>
+<component name="qcpix_build" long-name="Qt CPIX Build" introduced="^4">
+<unit bldFile="/sf/mw/searchsrv/qcpix" proFile="qcpix.pro"/>
 </component>
 </collection>
 <collection name="searchsrv_info" long-name="Search Services Info">
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/securitysrv/package_definition.xml
--- a/symbian4/mw/securitysrv/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/securitysrv/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -142,6 +142,9 @@
 <component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/pkiutilities/ocsp/group" mrp="/sf/mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
 </component>
+<component name="untrustedcertificatedialog" filter="s60" long-name="Untrusted Certificate Dialog" introduced="^4">
+<unit bldFile="/sf/mw/securitysrv/pkiutilities/untrustedcertificatedialog" proFile="untrustedcertificateplugin.pro" qmakeArgs="-r"/>
+</component>
 </collection>
 <collection name="wim" long-name="Wireless Identity Module" level="framework">
 <!-- collection is really a component. Need to move down a directory-->
@@ -159,9 +162,6 @@
 <component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
 <unit bldFile="/sf/mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
 </component>
-<component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="/sf/mw/securitysrv/securitydialogs/autolock" proFile="autolock.pro"/>
-</component>
 <component name="secui" filter="s60" long-name="Security UI">
 <unit bldFile="/sf/mw/securitysrv/securitydialogs/secui/group"/>
 </component>
@@ -178,8 +178,17 @@
 <component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
 <unit bldFile="/sf/mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
 </component>
+<component name="indicatorautolockplugin" long-name="Auto Lock Indicator Plugin" introduced="^4" filter="s60" plugin="Y">
+<!-- directory at the wrong level to be a component-->
+<unit bldFile="/sf/mw/securitysrv/securitydialogs/autolock/indicatorplugin" proFile="indicatorautolockplugin.pro" qmakeArgs="-r"/>
+</component>
 <component name="autolockuseractivityservice" long-name="Auto Lock User Activity Service" introduced="^4" filter="s60">
-<unit bldFile="/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice" proFile="autolockuseractivityservice.pro" qmakeArgs="-r"/>
+<!-- Can't have two .pro files in the same dir: their generated bld.infs will overwrite each other-->
+<unit bldFile="/sf/mw/securitysrv/securitydialogs/autolock" proFile="autolockuseractivityservice.pro" qmakeArgs="-r"/>
+</component>
+<component name="autolocksrv" long-name="Auto Lock Server" introduced="^4" filter="s60">
+<!-- Can't have two .pro files in the same dir: their generated bld.infs will overwrite each other-->
+<unit bldFile="/sf/mw/securitysrv/securitydialogs/autolock" proFile="autolock.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="cpsecplugins" long-name="Security Settings Plugins" level="plugin">
@@ -236,6 +245,7 @@
 </component>
 </collection>
 <collection name="securitysrv_info" long-name="Security Services Info" level="specific">
+<component name="securitysrv_test" filter="s60,test,api_test" purpose="development" long-name="Security Services Test"/>
 <component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
 <unit mrp="/sf/mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
 </component>
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/usbservices/package_definition.xml
--- a/symbian4/mw/usbservices/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/usbservices/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -119,7 +119,7 @@
 </collection>
 <collection name="usbuis" long-name="USB UIs" level="specific">
 <component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="/sf/mw/usbservices/usbuis/usbuinotif" proFile="usbuinotif.pro" qmakeArgs="-r"/>
+<unit bldFile="/sf/mw/usbservices/usbuis/usbuinotif" filter="!test" proFile="usbuinotif.pro" qmakeArgs="-r"/>
 </component>
 <component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
 <unit bldFile="/sf/mw/usbservices/usbuis/imageprintuiprovider/group"/>
@@ -134,7 +134,6 @@
 <unit bldFile="/sf/mw/usbservices/usbuis/usbindicatorplugin" proFile="usbindicatorplugin.pro" qmakeArgs="-r"/>
 </component>
 </collection>
-<collection name="usbservices_test" long-name="USB Services Test" level="server"/>
 </block>
   </layer>
  </systemModel>
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/web/package_definition.xml
--- a/symbian4/mw/web/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/web/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -90,9 +90,6 @@
 <component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
 <unit bldFile="/sf/mw/web/web_plat/connection_manager_api/group"/>
 </component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-<unit bldFile="/sf/mw/web/web_plat/cxml_library_api/group"/>
-</component>
 <component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
 <unit bldFile="/sf/mw/web/web_plat/download_mgr_client_api_extn/group"/>
 </component>
@@ -123,9 +120,6 @@
 <component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
 <unit bldFile="/sf/mw/web/web_plat/widget_registry_api/group"/>
 </component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-<unit bldFile="/sf/mw/web/web_plat/xml_parser_api/group"/>
-</component>
 </collection>
 <collection name="browserutilities" long-name="Browser Utilities" level="utils">
 <component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
@@ -134,12 +128,6 @@
 <component name="recenturlstore" filter="s60" long-name="Recent URL Store">
 <unit bldFile="/sf/mw/web/browserutilities/recenturlstore/group"/>
 </component>
-<component name="xmlparser" filter="s60" long-name="XML Interface">
-<unit bldFile="/sf/mw/web/browserutilities/xmlparser/group"/>
-</component>
-<component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-<unit bldFile="/sf/mw/web/browserutilities/cxmllibrary/group"/>
-</component>
 <component name="downloadmgr" filter="s60" long-name="Download Manager">
 <unit bldFile="/sf/mw/web/browserutilities/downloadmgr/group"/>
 </component>
diff -r 589d0dcca729 -r 921124097970 symbian4/mw/wirelessacc/package_definition.xml
--- a/symbian4/mw/wirelessacc/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/wirelessacc/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -69,55 +69,38 @@
 </component>
 </collection>
 <collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-</component>
-<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-</component>
-<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-</component>
-<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-</component>
-<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-</component>
-<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-<!--  should break up this bld.inf into the above components, or collapse them all into a single component -->
+<!-- collection is really a component. Needs to move down a dir -->
+<component name="hotspotfw_build" filter="s60" long-name="HotSpot Framework Build">
 <unit bldFile="/sf/mw/wirelessacc/hotspotfw/group"/>
 </component>
 </collection>
 <collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
-<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-<unit bldFile="/sf/mw/wirelessacc/wlanutilities" proFile="wlanutilities.pro" qmakeArgs="-r"/>
+<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanqtutilities" proFile="wlanqtutilities.pro" qmakeArgs="-r"/>
+</component>
+<component name="eapwizard " filter="s60" long-name="EAP Wizard" introduced="^4">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/eapwizard" proFile="eapwizard.pro" qmakeArgs="-r"/>
 </component>
-<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanplugin" qt:proFile="wlanqtutilities.pro"/>-->
+<component name="wpswizard " filter="s60" long-name="WPS Wizard" introduced="^4">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wpswizard" proFile="wpswizard.pro" qmakeArgs="-r"/>
 </component>
-<component name="wlanwizard " filter="s60" long-name="WLAN Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanwizard" qt:proFile="wlanwizard.pro"/>-->
+<component name="wlanwizard " filter="s60" long-name="WLAN Wizard" introduced="^4">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanwizard" proFile="wlanwizard.pro" qmakeArgs="-r"/>
 </component>
-<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansettingsui" qt:proFile="wlansniffer.pro"/>-->
+<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlansniffer" proFile="wlansniffer.pro" qmakeArgs="-r"/>
 </component>
-<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansniffer" qt:proFile="wlanentryplugin.pro"/>-->
+<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanentryplugin" proFile="wlanentryplugin.pro" qmakeArgs="-r"/>
 </component>
-<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanindicatorplugin" qt:proFile="wlanindicatorplugin.pro"/>-->
+<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanindicatorplugin" proFile="wlanindicatorplugin.pro" qmakeArgs="-r"/>
 </component>
-<component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/cpwlansettingsplugin" qt:proFile="cpwlansettingsplugin.pro"/>-->
+<component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/cpwlansettingsplugin" proFile="cpwlansettingsplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="wlanlogin" filter="s60" long-name="WLAN Login" introduced="^4">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanlogin" proFile="wlanlogin.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 </block>
diff -r 589d0dcca729 -r 921124097970 symbian4/os/bt/package_definition.xml
--- a/symbian4/os/bt/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/os/bt/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -135,6 +135,11 @@
 <unit mrp="/sf/os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
 </component>
 </collection>
+<collection name="btsimulator" long-name="Bluetooth Simulator" level="internal-utils">
+<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaption Stub" introduced="^3" purpose="optional" filter="s60">
+<unit bldFile="/sf/os/bt/btsimulator/btaudioadaptation_stub/group"/>
+</component>
+</collection>
 </block>
   </layer>
  </systemModel>
diff -r 589d0dcca729 -r 921124097970 symbian4/os/cellularsrv/package_definition.xml
--- a/symbian4/os/cellularsrv/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/os/cellularsrv/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -85,9 +85,6 @@
 <component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
 <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="/sf/os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
 </component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="/sf/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
 <component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="/sf/os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
 </component>
@@ -157,6 +154,7 @@
 </component>
 </collection>
 <collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
+<collection name="cbsref" long-name="CBS Reference" level="plugin"/>
 <collection name="wapstack" long-name="WAP Stack" level="plugin">
 <component name="wapmessageapi" long-name="WAP Message API" purpose="optional">
 <unit bldFile="/sf/os/cellularsrv/wapstack/wapmessageapi/group" mrp="/sf/os/cellularsrv/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/>
diff -r 589d0dcca729 -r 921124097970 symbian4/os/devicesrv/package_definition.xml
--- a/symbian4/os/devicesrv/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -56,6 +56,7 @@
    <block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
 <collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
 <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
+<!-- this needs to be moved to deviceplatformrelease -->
 <unit bldFile="/sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
 </component>
 <component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
@@ -367,7 +368,7 @@
 <!-- Move exports to a self-contained component. Or leave as a component but move down a dir -->
 <unit bldFile="/sf/os/devicesrv/resourcemgmt/group"/>
 </component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory" filter="s60">
 <unit bldFile="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
 </component>
 </collection>
diff -r 589d0dcca729 -r 921124097970 symbian4/os/mm/package_definition.xml
--- a/symbian4/os/mm/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/os/mm/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -341,13 +341,17 @@
 <unit bldFile="/sf/os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
 </component>
 </collection>
-<collection name="audio" long-name="Audio Codecs" level="middleware">
-<component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-<unit bldFile="/sf/os/mm/audio/arm_cmmf_codecs/group"/>
+<collection name="frametable_stub" long-name="Frametable Stub" level="device-fw">
+<!-- collection is really a component. Needs to move down a directory -->
+<component name="frametable_stub_build" long-name="Frametable Stub Build" filter="s60" introduced="^4">
+<unit bldFile="/sf/os/mm/frametable_stub/group"/>
 </component>
 </collection>
-<collection name="video" long-name="Video Codecs" level="middleware">
-<!-- empty -->
+<collection name="eaacplusutil_stub" long-name="eAAC Plus Utils Stub" level="hw-if">
+<!-- collection is really a component. Needs to move down a directory -->
+<component name="eaacplusutil_stub_build" long-name="eAAC Plus Utils Stub Build" filter="s60" introduced="^4">
+<unit bldFile="/sf/os/mm/eaacplusutil_stub/group"/>
+</component>
 </collection>
 <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
 <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
diff -r 589d0dcca729 -r 921124097970 symbian4/os/osrndtools/package_definition.xml
--- a/symbian4/os/osrndtools/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/os/osrndtools/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -115,9 +115,6 @@
 <component name="commandline" filter="s60" long-name="MemSpy Command Line" purpose="development">
 <unit bldFile="/sf/os/osrndtools/memspy/commandline/group"/>
 </component>
-<component name="console" filter="s60" long-name="MemSpy Console" purpose="development">
-<unit bldFile="/sf/os/osrndtools/memspy/console/group"/>
-</component>
 <component name="memspyserver" filter="s60" long-name="MemSpy Server" purpose="development" introduced="^4">
 <unit bldFile="/sf/os/osrndtools/memspy/MemSpyServer/group"/>
 </component>
@@ -178,11 +175,6 @@
 <unit bldFile="/sf/os/osrndtools/analyzetool/group"/>
 </component>
 </collection>
-<collection name="osrndtools_info" long-name="OS R&amp;D tools Info" level="trace">
-<component name="osrndtools_metadata" long-name="OS R&amp;D tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="/sf/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
-</component>
-</collection>
 </block>
   </layer>
  </systemModel>
diff -r 589d0dcca729 -r 921124097970 symbian4/os/xmlsrv/package_definition.xml
--- a/symbian4/os/xmlsrv/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/os/xmlsrv/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -64,6 +64,12 @@
 <component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api">
 <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/group"/>
 </component>
+<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
+<unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/cxml_library_api/group"/>
+</component>
+<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
+<unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_parser_api/group"/>
+</component>
 </collection>
 <collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
 <component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
@@ -81,25 +87,31 @@
 </collection>
 <collection name="xml" long-name="XML" level="generic">
 <component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/xmlsrv/xml/xmlfw/group" mrp="/sf/os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
+<unit bldFile="/sf/os/xmlsrv/xml/xmlfw/group" mrp="/sf/os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp" filter="!test"/>
 </component>
 <component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-<unit bldFile="/sf/os/xmlsrv/xml/libxml2libs/group" mrp="/sf/os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+<unit bldFile="/sf/os/xmlsrv/xml/libxml2libs/group" mrp="/sf/os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp" filter="!test"/>
 </component>
 <component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="/sf/os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
+<unit bldFile="/sf/os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="/sf/os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp" filter="!test"/>
 </component>
 <component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-<unit bldFile="/sf/os/xmlsrv/xml/xmldomandxpath/group" mrp="/sf/os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+<unit bldFile="/sf/os/xmlsrv/xml/xmldomandxpath/group" mrp="/sf/os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp" filter="!test"/>
 </component>
 <component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/xmlsrv/xml/xmlexpatparser/group" mrp="/sf/os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+<unit bldFile="/sf/os/xmlsrv/xml/xmlexpatparser/group" mrp="/sf/os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp" filter="!test"/>
 </component>
 <component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/xmlsrv/xml/xmllibxml2parser/group" mrp="/sf/os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+<unit bldFile="/sf/os/xmlsrv/xml/xmllibxml2parser/group" mrp="/sf/os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp" filter="!test"/>
 </component>
 <component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/xmlsrv/xml/wbxmlparser/group" mrp="/sf/os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+<unit bldFile="/sf/os/xmlsrv/xml/wbxmlparser/group" mrp="/sf/os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp" filter="!test"/>
+</component>
+<component name="cxmllibrary" filter="s60" long-name="cXml Library">
+<unit bldFile="/sf/os/xmlsrv/xml/cxmllibrary/group"/>
+</component>
+<component name="xmlparser" filter="s60" long-name="XML Interface">
+<unit bldFile="/sf/os/xmlsrv/xml/xmlparser/group"/>
 </component>
 </collection>
 <collection name="xmlsrv_info" long-name="XML Services Info" level="specific">