--- a/symbian3/os/devicesrv/package_definition.xml	Wed Dec 02 18:06:06 2009 +0000
+++ b/symbian3/os/devicesrv/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
@@ -1,310 +1,171 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!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>
+ <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
+ <!ATTLIST SystemBuild schema CDATA #REQUIRED>
+ <!ELEMENT list (ref+)>
+ <!ATTLIST list
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT ref EMPTY>
+ <!ATTLIST ref item CDATA #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y|N) #REQUIRED>
+ <!ELEMENT configuration (listRef+|ref+|task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
+ <!ELEMENT listRef EMPTY>
+ <!ATTLIST listRef list CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y|N) #REQUIRED
+  targetParallel (Y|N) 'N'>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  root CDATA #IMPLIED
+  command CDATA #REQUIRED>
+]>
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="devicesrv" long-name="Device Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="accessoryservices" long-name="Accessory Services" level="framework">
-     <component name="accessorymonitor" long-name="Accessory Monitor" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonconnectionemulator/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/tests/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmontesttimer/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/asystub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/group"/> -->
-     </component>
-     <component name="accessoryremotecontrol" long-name="Accessory Remote Control" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dosservercontrol/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfcore/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/audio/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/phone/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/remcon/group"/> -->
-     </component>
-     <component name="accessoryserver" long-name="Accessory Server" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dosservercontrol/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfcore/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/accessorytestcontrol/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/asystub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/btasystub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/group"/> -->
-     </component>
-     <component name="headsetstatusapi" long-name="Headset Status Api" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/headsetstatusapi/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="tspclientmapper" long-name="TSP Client Mapper" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/tspclientmapper/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/tspclientmapper/tsrc/public/basic/group"/> -->
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="remotecontrolfw">
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/bearerplugin/group"/>
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/client"/>
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/converterplugin/group"/>
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/reference"/>
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/server/group"/>
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/targetselectorplugin/group"/>
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/test"/>
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/types/group"/>
-     </component>-->
-     <component name="reftsp" origin-model="foundation"/>
-     <component unofficial="yes" name="accessoryservices_build" long-name="Accessory Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/group"/>
-     </component>
-    <component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-     </component>
-    </collection>
+<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="accessoryservices" long-name="Accessory Services" level="framework">
+<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
+<unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+</component>
+</collection>
+<!-- MattD 20091030 - hacked in from package definition. Presume these should be in the GT model... -->
     <collection name="commonservices" long-name="Common Services" level="app-if">
-     <component name="commonengine" long-name="Common Engine" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/commonservices/commonengine/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/commonengine/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="commonengineresources" long-name="Common Engine Resources" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/commonservices/commonengineresources/group"/>
-     </component>
-     <component name="platformenv" long-name="Platform Env" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/disknotifyhandler/group"/> -->
-      <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/platformver/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/sysversioninfo/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="sysutil" long-name="Sysutil" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/tsrc/public/basic/sysutiltests/group"/> -->
-     </component>
-     <component name="activitymanager" long-name="Activity Manager" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/commonservices/activitymanager/group"/>
-      <unit bldFile="/sf/os/devicesrv/commonservices/activitymanager/tsrc/public/basic/group"/>
-     </component>
-     <component unofficial="yes" name="commonservices_build" long-name="Common Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/commonservices/group"/>
-     </component>
-    </collection>
-    <collection name="dosservices" long-name="Dos Services" level="hw-if">
-     <component name="commondsy" long-name="Common DSY" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/dosservices/commondsy/group"/>
-     </component>
-     <component name="dosserver" long-name="Dos Server" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/dosservices/dosserver/group"/>
-     </component>
-     <component unofficial="yes" name="dosservices_test" long-name="Dos Services Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/dsytesttool/dosservercontrol/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/public/basic/stubs/dsystub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/dsytesttool/dsytfcore/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/public/basic/dosservertestplugin/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/dsytesttool/group"/> -->
-     </component>
-     <component unofficial="yes" name="dosservices_build" long-name="Dos Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/dosservices/group"/>
-     </component>
+      <component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
+        <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/group" mrp="/sf/os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
+      </component>
+          <component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
+        <unit bldFile="/sf/os/devicesrv/commonservices/activitymanager/group" mrp="/sf/os/devicesrv/commonservices\activitymanager\group\activitymanager.mrp"/>
+      </component>  
     </collection>
-    <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-     <component name="serverexe" long-name="Server Exe" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/serverexe/group"/> -->
-     </component>
-     <component name="hwrmfmtxwatcherplugin" long-name="HWRM FM Transmitter Watcher Plugin" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/> -->
-     </component>
-     <component name="clientdll" long-name="Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/clientdll/group"/> -->
-     </component>
-     <component name="commondll" long-name="Common DLL" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/commondll/group"/> -->
-     </component>
-     <component name="vibraclientdll" long-name="Vibra Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/vibraclientdll/group"/> -->
-     </component>
-     <component name="extendedlightclientdll" long-name="Extended Light Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/extendedlightclientdll/group"/> -->
-     </component>
-     <component name="lightclientdll" long-name="Light Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/lightclientdll/group"/> -->
-     </component>
-     <component name="fmtxclientdll" long-name="FM TX Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/fmtxclientdll/group"/> -->
-     </component>
-     <component name="hwrmtargetmodifierplugin" long-name="HWRM Target Modifier Plugin" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/tsrc/hwrmtargetmodifierplugintest/group"/> -->
-     </component>
-     <component name="vibractrl" long-name="Vibra Control" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/resourcemgmt/vibractrl/group"/>
-     </component>
-     <component name="hwresourcesmgr" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/test/group"/>
-      <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/test/plugins/targetmodifierplugin/group"/>
-     </component>
-     <!--Component manually removed as empty and name conflicts with an OS component-->
-     <!--<component name="powerandmemorynotificationservice"/>-->
-     <component unofficial="yes" name="resourcemgmt_build" long-name="Resource Management Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/resourcemgmt/group"/>
-     </component>
-     <component unofficial="yes" name="resourcemgmt_test" long-name="Resource Management Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/tsrc/public/basic/group"/> -->
-     </component>
-    <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-     </component>
-    </collection>
-    <collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-     <component name="hapticseffectdatagetterfw" long-name="Haptics Effect Data Getter Framework" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-     </component>
-     <component name="hapticspluginservice" long-name="Haptics Plugin Service" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-     </component>
-     <component name="hapticspacketizer" long-name="Haptics Packetizer" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-     </component>
-     <component name="hapticspluginmanager" long-name="Haptics Plugin Manager" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-     </component>
-     <component name="hapticsserver" long-name="Haptics Server" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-     </component>
-     <component name="hapticsclient" long-name="Haptics Client" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-     </component>
-     <component unofficial="yes" name="hwrmhaptics_build" long-name="HWRM Haptics Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/group"/>
-     </component>
-    </collection>
-    <collection name="mediator" long-name="Mediator" level="app-if">
-     <component unofficial="yes" name="mediator_test" long-name="Mediator Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/mediator/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/mediator/tsrc/public/basic/stub/group"/> -->
-     </component>
-     <component unofficial="yes" name="mediator_build" long-name="Mediator Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/mediator/group"/>
-     </component>
-    </collection>
-    <collection name="psmservices" long-name="PSM Services" level="app-if">
-     <component name="psmserver" long-name="PSM Server" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/psmservices/psmserver/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/psmservices/psmserver/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="psmservices_build" long-name="PSM Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/psmservices/group"/>
-     </component>
-    </collection>
-    <collection name="sensorservices" long-name="Sensor Services" level="framework">
-     <component name="sensorserver" long-name="Sensor Server" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/condevalstub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/sensrvcondevalplugin/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/ssystub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/stubprocess/group"/> -->
-     </component>
-     <component name="orientationssy" long-name="Orientation SSY" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/sensorservices/orientationssy/group"/>
-     </component>
-     <component name="tiltcompensationssy" long-name="Tilt Compensation SSY" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-     </component>
-     <component name="sensordatacompensator" long-name="Sensor Data Compensator" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/sensorservices/sensordatacompensator/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensordatacompensator/tsrc/sensordatacompensatorpluginstub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group"/> -->
-     </component>
-     <component unofficial="yes" name="sensorservices_build" long-name="Sensor Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/sensorservices/group"/>
-     </component>
-    </collection>
-    <collection name="sysstatemgmt" long-name="System State Management" level="server">
-     <component name="starter" long-name="Starter" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/starter/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/sysstatemgmt/starter/strtsecnote/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/sysstatemgmt/starter/strtsecobs/group"/> -->
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="systemstarter">
-       -  <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/sysmondemo/group"/>  -
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tamastarter/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tapstart/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tdscstore/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testappgood"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testappnorv"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testapprvafterretry"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testapprverror"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testappslow"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testprocgood"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/trestartsys/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tstartsafe/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tstartupproperties/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tsysmon/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart2/group"/>
-     </component>-->
-     <component unofficial="yes" name="sysstatemgmt_build" long-name="System State Management Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/group"/>
-     </component>
-     <component unofficial="yes" name="sysstatemgmt_test" long-name="System State Management Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/sysstatemgmt/tsrc/public/basic/group"/> -->
-     </component>
-    <component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="tb92" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-     </component>
-    </collection>
-    <collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if">
-     <component name="accessorieshaitest" long-name="Accessories HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-	<unit mrp="devicesrvapitest/accessorieshaitest/gropup/accessorieshai.mrp"/>
-	-->
-     </component>
-     <component name="hwrmhaitest" long-name="HWRM HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-	<unit mrp="devicesrvapitest/hwrmhaitest/group/hwrmhai.mrp"/>
-	-->
-     </component>
-    </collection>
-    <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-     <component unofficial="yes" name="devicesrv_pub" long-name="Device Services Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/> -->
-      <unit bldFile="/sf/os/devicesrv/devicesrv_pub/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/sensor_channel_api/tsrc/bc/sensor/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/sensor_data_compensator_api/tsrc/bc/sensordatacompensatortest/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/> -->
-     </component>
-     <component unofficial="yes" name="devicesrv_build" long-name="Device Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/group"/>
-     </component>
-     <component unofficial="yes" name="devicesrv_plat" long-name="Device Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_plat/activity_manager_api/tsrc/group"/> -->
-      <unit bldFile="/sf/os/devicesrv/devicesrv_plat/group"/>
-     </component>
-    <component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
+<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
+<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="tb91" purpose="optional">
+<unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+</component>
+<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="tb92" purpose="optional" class="config">
+<unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+</component>
+<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+<unit bldFile="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+</component>
+</collection>
+<collection name="sysstatemgmt" long-name="System State Management" level="server">
+<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="tb92" purpose="mandatory">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+</component>
+<component name="systemstatemgr" long-name="System State Manager" introduced="tb92" purpose="mandatory">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+</component>
+<component name="systemstateplugins" long-name="System State Plugins" introduced="tb92" purpose="optional" plugin="Y">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+</component>
+<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="tb92" purpose="optional" plugin="Y">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+</component>
+</collection>
+<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
+<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="tb92" purpose="optional">
+<unit bldFile="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+</component>
+</collection>
+<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
+<component name="systemhealthmgr" long-name="System Health Manager" introduced="tb92" purpose="optional">
+<unit bldFile="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+</component>
+</collection>
+<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if">
+<component name="accessorieshaitest" long-name="Accessories HAI Tests" introduced="tb91" purpose="development">
+<unit mrp="/sf/os/devicesrv/devicesrvapitest/accessorieshaitest/group/accessorieshaitest.mrp"/>
+</component>
+<component name="hwrmhaitest" long-name="HWRM HAI Tests" introduced="tb91" purpose="development">
+<unit mrp="/sf/os/devicesrv/devicesrvapitest/hwrmhaitest/group/hwrmhaitest.mrp"/>
+</component>
+</collection>
+<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
+<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="tb91" purpose="development" class="config PC">
+<unit mrp="/sf/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+</component>
+</collection>
+<collection name="s60">
+<component name="devicesrv">
+<unit bldFile="/sf/os/devicesrv/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file