--- a/symbian3/mw/appsupport/package_definition.xml	Fri Jan 29 14:35:06 2010 +0000
+++ b/symbian3/mw/appsupport/package_definition.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -1,219 +1,270 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!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="mw" long-name="Middleware" levels="generic specific">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/filehandling/fileconverterfw/group" mrp="/sf/mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="/sf/mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="/sf/mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-name="Alarm Server" introduced="7.0" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/commonappservices/alarmserver/Group" mrp="/sf/mw/appsupport/commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="tb92" introduced="8.1" purpose="development">
-<unit bldFile="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="coreappstest" long-name="Core Apps Test" introduced="8.1" purpose="development">
-<unit mrp="/sf/mw/appsupport/commonappservices/coreappstest/Group/app-services_CoreAppsTest.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"/>
-</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"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/tzservices/tzserver/group" mrp="/sf/mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/tzservices/tzloc/group" mrp="/sf/mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="/sf/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/sf/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="/sf/mw/appsupport/tzservices/tzdatabase/group" mrp="/sf/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-<!--PLACEHOLDER="DS.1802" START REMOVE -->
-<component name="worldserver" long-name="World Server" introduced="7.0" deprecated="9.1" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/tzservices/worldserver/group" mrp="/sf/mw/appsupport/tzservices/worldserver/group/app-services_worldserver.mrp"/>
-</component>
-<component name="worldservertest" long-name="World Server Test" introduced="8.1" deprecated="9.1" purpose="development">
-<unit bldFile="/sf/mw/appsupport/tzservices/worldservertest/TestWorldSrv" mrp="/sf/mw/appsupport/tzservices/worldservertest/TestWorldSrv/app-services_testworldsrv.mrp"/>
-</component>
-<!--PLACEHOLDER="DS.1802" END REMOVE -->
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/appsupport/contenthandling/webrecognisers/group" mrp="/sf/mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="tb92" purpose="development">
-<unit bldFile="/sf/mw/appsupport/openenvutils/commandshell/group" mrp="/sf/mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="tb92" purpose="development">
-<unit bldFile="/sf/mw/appsupport/openenvutils/telnetserver/group" mrp="/sf/mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/printingsupport/printinguisupport/group" mrp="/sf/mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="/sf/mw/appsupport/appfw/apparchitecture/group" mrp="/sf/mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="/sf/mw/appsupport/appfw/viewserver/group" mrp="/sf/mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-<component name="uiftestfw" long-name="UIF Test Framework" introduced="9.2" purpose="development">
-<unit mrp="/sf/mw/appsupport/appfw/uiftestfw/group/app-framework_testframework.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="/sf/mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/applaunchservices/applaunchplugins/group" mrp="/sf/mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="/sf/mw/appsupport/tzpcside/tzcompiler/group" mrp="/sf/mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-<!--PLACEHOLDER="DS.1802" START REMOVE -->
-<component name="worlddatabasekit" long-name="World Database Kit" introduced="6.0" deprecated="9.1" purpose="development" class="config PC">
-<unit bldFile="/sf/mw/appsupport/tzpcside/worlddatabasekit/group" mrp="/sf/mw/appsupport/tzpcside/worlddatabasekit/group/app-services_wlddatabasekit_cedar.mrp"/>
-</component>
-<component name="worldtools" long-name="World Tools" introduced="ER5" deprecated="9.1" purpose="development" class="config PC">
-<unit bldFile="/sf/mw/appsupport/tzpcside/worldtools/group" mrp="/sf/mw/appsupport/tzpcside/worldtools/group/app-services_wldtools.mrp"/>
-</component>
-<!--PLACEHOLDER="DS.1802" END REMOVE -->
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="appsupport">
-<unit bldFile="/sf/mw/appsupport/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!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^3" schema="2.0.1">
+  <systemModel>
+    <layer name="mw" long-name="Middleware" levels="generic specific">
+      <block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
+        <collection name="contextframework" long-name="Context Framework" level="framework">
+          <component name="cfw" filter="s60" long-name="Context Framework">
+            <unit bldFile="/sf/mw/appsupport/contextframework/cfw/group"/>
+          </component>
+          <component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/contextframework/cfwplugins/group"/>
+          </component>
+        </collection>
+        <collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
+          <component name="dbrecovery" filter="s60" long-name="Database Recovery">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/dbrecovery/group"/>
+          </component>
+          <component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
+            <!-- No Service Power Save? Window Server? Please elaborate-->
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
+          </component>
+          <component name="rfs" filter="s60" long-name="Restore Factory Settings">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfs/group"/>
+          </component>
+          <component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfsplugins/group"/>
+          </component>
+          <component name="sysap" filter="s60" long-name="System Application">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sysap/group"/>
+          </component>
+          <component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/variatedsettings/group"/>
+          </component>
+          <component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
+          </component>
+          <component name="kefmapper" filter="s60" long-name="Key Event Framework">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/kefmapper/group"/>
+          </component>
+          <component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
+          </component>
+          <component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
+          </component>
+          <component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
+          </component>
+          <component name="gsserverengine" filter="s60" long-name="GS Server Engine">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverengine/group"/>
+          </component>
+          <component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
+          </component>
+        </collection>
+        <collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
+          <!--  collection is really a component. Move down a directory -->
+          <component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
+        </collection>
+        <collection name="mediakeys" long-name="Media Keys" level="plugin">
+          <!--  collection is really a component. Move down a directory -->
+          <component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
+            <unit bldFile="/sf/mw/appsupport/mediakeys/group"/>
+          </component>
+        </collection>
+        <collection name="startupservices" long-name="Startup Services" level="system">
+          <component name="splashscreen" filter="s60" long-name="Splash Screen">
+            <unit bldFile="/sf/mw/appsupport/startupservices/splashscreen/group"/>
+          </component>
+          <component name="startupanimation" filter="s60" long-name="Startup Animation">
+            <unit bldFile="/sf/mw/appsupport/startupservices/startupanimation/group"/>
+          </component>
+          <component name="startup" long-name="Startup Application" filter="s60">
+            <unit bldFile="/sf/mw/appsupport/startupservices/startup/group"/>
+          </component>
+        </collection>
+        <collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
+          <component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
+            <unit bldFile="/sf/mw/appsupport/sysresmonitoring/oodmonitor/group"/>
+          </component>
+          <component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
+            <unit bldFile="/sf/mw/appsupport/sysresmonitoring/oommonitor/group"/>
+          </component>
+        </collection>
+        <collection name="systemsettings" long-name="System Settings" level="system">
+          <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>
+        </collection>
+        <collection name="filehandling" long-name="File Handling" level="server">
+          <component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
+            <unit bldFile="/sf/mw/appsupport/filehandling/fileconverterfw/group" mrp="/sf/mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
+          </component>
+          <component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="/sf/mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
+          </component>
+          <component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="/sf/mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
+          </component>
+        </collection>
+        <collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
+          <component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+          </component>
+        </collection>
+        <collection name="commonappservices" long-name="Common Application Services" level="framework">
+          <component name="alarmserver" long-name="Alarm Server" introduced="7.0" purpose="optional">
+            <unit bldFile="/sf/mw/appsupport/commonappservices/alarmserver/Group" mrp="/sf/mw/appsupport/commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
+          </component>
+          <component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
+            <unit bldFile="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
+          </component>
+          <component name="coreappstest" long-name="Core Apps Test" introduced="8.1" purpose="development" filter="test">
+            <unit mrp="/sf/mw/appsupport/commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp" bldFile="/sf/mw/appsupport/commonappservices/coreappstest/Group"/>
+          </component>
+          <component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
+            <unit mrp="/sf/mw/appsupport/commonappservices/appservicesdocs/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"/>
+          </component>
+        </collection>
+        <collection name="tzservices" long-name="Time Zone Services" level="plugin">
+          <component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
+            <unit bldFile="/sf/mw/appsupport/tzservices/tzserver/group" mrp="/sf/mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
+          </component>
+          <component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
+            <unit bldFile="/sf/mw/appsupport/tzservices/tzloc/group" mrp="/sf/mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
+          </component>
+          <component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
+            <unit bldFile="/sf/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/sf/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
+          </component>
+          <component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+            <unit bldFile="/sf/mw/appsupport/tzservices/tzdatabase/group" mrp="/sf/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+          </component>
+        </collection>
+        <collection name="contenthandling" long-name="Content Handling" level="plugin">
+          <component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/contenthandling/webrecognisers/group" mrp="/sf/mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
+          </component>
+        </collection>
+        <collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
+          <component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
+            <unit bldFile="/sf/mw/appsupport/openenvutils/commandshell/group" mrp="/sf/mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
+          </component>
+          <component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
+            <unit bldFile="/sf/mw/appsupport/openenvutils/telnetserver/group" mrp="/sf/mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
+          </component>
+        </collection>
+        <collection name="printingsupport" long-name="Printing Support" level="generic">
+          <component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
+            <unit bldFile="/sf/mw/appsupport/printingsupport/printinguisupport/group" mrp="/sf/mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
+          </component>
+        </collection>
+        <collection name="appfw" long-name="Application Framework" level="framework">
+          <component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
+            <unit bldFile="/sf/mw/appsupport/appfw/apparchitecture/group" mrp="/sf/mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
+          </component>
+          <component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
+            <unit bldFile="/sf/mw/appsupport/appfw/viewserver/group" mrp="/sf/mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+          </component>
+          <component name="uiftestfw" long-name="UIF Test Framework" introduced="9.2" purpose="development" filter="test">
+            <unit mrp="/sf/mw/appsupport/appfw/uiftestfw/group/app-framework_testframework.mrp" bldFile="/sf/mw/appsupport/appfw/uiftestfw/group"/>
+          </component>
+        </collection>
+        <collection name="applaunchservices" long-name="Application Launch Services" level="generic">
+          <component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
+            <unit bldFile="/sf/mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="/sf/mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
+          </component>
+          <component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
+            <unit bldFile="/sf/mw/appsupport/applaunchservices/applaunchplugins/group" mrp="/sf/mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
+          </component>
+        </collection>
+        <collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
+          <component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
+            <unit bldFile="/sf/mw/appsupport/tzpcside/tzcompiler/group" mrp="/sf/mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
+          </component>
+        </collection>
+        <collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
+          <component name="appsupport_plat" filter="s60" long-name="Generic Application Support Platform Interfaces" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/group"/>
+          </component>
+          <component name="appsupport_pub" filter="s60" long-name="Generic Application Support Public Interfaces" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_pub/group"/>
+          </component>
+          <component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
+            <unit mrp="/sf/mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>