--- a/symbian4/mw/appsupport/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,209 +50,209 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="appsupport" level="generic" levels="system plugin framework server generic specific" long-name="Generic Application Support">
+   <block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
 <collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" purpose="optional" class="api">
+<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
 </component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" purpose="optional" class="api">
+<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_pub/network_status_api/group"/>
 </component>
 </collection>
 <collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" purpose="optional" class="api">
+<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/action_plugin_api/group"/>
 </component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" purpose="optional" class="api">
+<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/application_orientation_api/group"/>
 </component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" purpose="optional" class="api">
+<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_access_api/group"/>
 </component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" purpose="optional" class="api">
+<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
 </component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" purpose="optional" class="api">
+<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
 </component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" purpose="optional" class="api">
+<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
 </component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" purpose="optional" class="api">
+<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
 </component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" purpose="optional" class="api">
+<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
 </component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" purpose="optional" class="api">
+<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
 </component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" purpose="optional" class="api">
+<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_subscription_api/group"/>
 </component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" purpose="optional" class="api">
+<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
 </component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" purpose="optional" class="api">
+<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
 </component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" purpose="optional" class="api">
+<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
 </component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" purpose="optional" class="api">
+<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
 </component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" purpose="optional" class="api">
+<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
 </component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" purpose="optional" class="api">
+<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
 </component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" purpose="optional" class="api">
+<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/operation_provider_api/group"/>
 </component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" purpose="optional" class="api">
+<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
 </component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" purpose="optional" class="api">
+<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
 </component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" purpose="optional" class="api">
+<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
 </component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" purpose="optional" class="api">
+<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
 </component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" purpose="optional" class="api">
+<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
 </component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" purpose="optional" class="api">
+<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
 </component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" purpose="optional" class="api">
+<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
 </component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" purpose="optional" class="api">
+<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
 </component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" purpose="optional" class="api">
+<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
 </component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" purpose="optional" class="api">
+<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
 </component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" purpose="optional" class="api">
+<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
 </component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" purpose="optional" class="api">
+<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
 </component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" purpose="optional" class="api">
+<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
 </component>
-<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" introduced="^2" filter="s60,!sf_build" purpose="optional" class="api">
+<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
 </component>
-<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" introduced="^2" filter="s60,!sf_build" purpose="optional" class="api">
+<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
 </component>
 </collection>
 <collection name="contextframework" long-name="Context Framework" level="framework">
-<component name="cfw" long-name="Context Framework" filter="s60" purpose="optional">
+<component name="cfw" filter="s60" long-name="Context Framework">
 <unit bldFile="/sf/mw/appsupport/contextframework/cfw/group"/>
 </component>
-<component name="cfwplugins" long-name="Context Framework Plugins" filter="s60" purpose="optional" plugin="Y">
+<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" long-name="Database Recovery" filter="s60" purpose="optional">
+<component name="dbrecovery" filter="s60" long-name="Database Recovery">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/dbrecovery/group"/>
 </component>
-<component name="nspswsplugin" long-name="NSPS WS Plugin" filter="s60" purpose="optional" plugin="Y">
+<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" long-name="Restore Factory Settings" filter="s60" purpose="optional">
+<component name="rfs" filter="s60" long-name="Restore Factory Settings">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfs/group"/>
 </component>
-<component name="rfsplugins" long-name="Restore Factory Settings Plugins" filter="s60" purpose="optional" plugin="Y">
+<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" long-name="System Application" filter="s60" purpose="optional">
+<component name="sysap" filter="s60" long-name="System Application">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sysap/group"/>
 </component>
-<component name="variatedsettings" long-name="Variated Settings" filter="s60" purpose="optional" class="config">
+<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/variatedsettings/group"/>
 </component>
-<component name="accfwuinotifier" long-name="Accessory Framework UI Notifier" filter="s60" purpose="optional" plugin="Y">
+<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" long-name="Key Event Framework" filter="s60" purpose="optional">
+<component name="kefmapper" filter="s60" long-name="Key Event Framework">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/kefmapper/group"/>
 </component>
-<component name="advancedtspcontroller" long-name="Advanced TSP Controller" filter="s60" purpose="optional">
+<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
 </component>
-<component name="powersaveutilities" long-name="Power Save Utilities" filter="s60" purpose="optional">
+<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/powersaveutilities" proFile="powersaveutilities.pro"/>
 </component>
-<component name="gsserverenginestub" long-name="GS Server Engine Stub" deprecated="^4" filter="s60" purpose="optional">
+<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub" deprecated="^4">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
 </component>
-<component name="gsserverengine" long-name="GS Server Engine" deprecated="^4" filter="s60" purpose="optional">
+<component name="gsserverengine" filter="s60" long-name="GS Server Engine" deprecated="^4">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverengine/group"/>
 </component>
-<component name="sensordatacompensatorplugin" long-name="Sensor Data Compensator Plugin" filter="s60" purpose="optional" plugin="Y">
+<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
 </component>
-<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" purpose="optional" plugin="Y">
+<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
 </component>
-<component name="devicepowermenuplugin" long-name="Device Power Menu Plugin" introduced="^4" purpose="optional" plugin="Y">
+<component name="devicepowermenuplugin" long-name="Device Power Menu Plugin" introduced="^4" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/devicepowermenuplugin" proFile="devicepowermenuplugin.pro"/>
 </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" introduced="^2" filter="s60" purpose="optional"/>
+<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" long-name="Media Keys Build" filter="s60" purpose="optional">
+<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" long-name="Splash Screen" filter="s60" purpose="optional">
+<component name="splashscreen" filter="s60" long-name="Splash Screen">
 <unit bldFile="/sf/mw/appsupport/startupservices/splashscreen/group"/>
 </component>
-<component name="startupanimation" long-name="Startup Animation" filter="s60" purpose="optional">
+<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" purpose="optional">
+<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" long-name="OOD Monitor" introduced="7.0s" filter="s60" purpose="optional">
+<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
 <unit bldFile="/sf/mw/appsupport/sysresmonitoring/oodmonitor/group"/>
 </component>
-<component name="oommonitor" long-name="OOM Monitor" introduced="7.0s" filter="s60" purpose="optional">
+<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" long-name="GS Sensor Plugin" filter="s60" purpose="optional" plugin="Y">
+<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/systemsettings/gssensorplugin/group"/>
 </component>
-<component name="accindicatorplugin" long-name="ACC Indicator Plugin" filter="s60" purpose="optional" plugin="Y">
+<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" long-name="ACC Indicator Settings" filter="s60" purpose="optional">
+<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>
@@ -269,7 +269,7 @@
 </component>
 </collection>
 <collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" deprecated="^4" purpose="optional" plugin="Y">
+<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" deprecated="^4" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
 </component>
 </collection>
@@ -277,7 +277,7 @@
 <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" introduced="8.1" deprecated="^3" purpose="development">
+<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="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
@@ -315,7 +315,7 @@
 </component>
 </collection>
 <collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" introduced="^2" deprecated="^3" purpose="optional">
+<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>