diff -r 52097e3efe51 -r af9a3c6582bb symbian4/mw/remotemgmt/package_definition.xml
--- a/symbian4/mw/remotemgmt/package_definition.xml	Thu Sep 09 10:32:56 2010 +0100
+++ b/symbian4/mw/remotemgmt/package_definition.xml	Thu Sep 09 14:03:04 2010 +0100
@@ -50,129 +50,129 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
+   <block name="remotemgmt" level="specific" levels="plugin framework server generic specific" long-name="Remote Management">
 <collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
+<component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
 </component>
 </collection>
 <collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
+<component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
 </component>
-<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
+<component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
 </component>
-<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
+<component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
 </component>
-<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
+<component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
 </component>
-<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
+<component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
 </component>
-<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
+<component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
 </component>
-<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
+<component name="syncml_client_api" long-name="SyncML Client API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
 </component>
-<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
+<component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
 </component>
-<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
+<component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
 </component>
-<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
+<component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
 </component>
-<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
+<component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
 </component>
-<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
+<component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
 </component>
-<component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
+<component name="scp_server_api" long-name="SCP Server API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
 </component>
-<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
+<component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
 </component>
-<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
+<component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
 </component>
-<component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
+<component name="dm_utils_api" long-name="DM Utils API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
 </component>
-<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
+<component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
 </component>
-<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
+<component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
 </component>
-<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
+<component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
 </component>
-<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
+<component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
 </component>
-<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
+<component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
 </component>
-<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
+<component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
 </component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
+<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
 </component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
+<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
 </component>
-<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
+<component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
 </component>
-<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
+<component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
 </component>
-<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
+<component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
 </component>
-<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
+<component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
 </component>
-<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
+<component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
 </component>
-<component name="devicemgmt_dialogs_api" long-name="Device Management Dialogs API" filter="s60" introduced="^4" class="api">
+<component name="devicemgmt_dialogs_api" long-name="Device Management Dialogs API" introduced="^4" filter="s60" purpose="optional" 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">
+<component name="dm_device_dialog_api" long-name="DM Device Dialog API" introduced="^4" filter="s60" purpose="optional" 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="policyenginepolicies" long-name="Policy Engine Policies" filter="s60,!dfs_build">
+<component name="policyenginepolicies" long-name="Policy Engine Policies" filter="s60,!dfs_build" purpose="optional">
 <unit bldFile="/sf/mw/remotemgmt/policymanagement/policyengine/policyenginepolicies/group"/>
 </component>
-<component name="policyengine" filter="s60" long-name="Policy Engine">
+<component name="policyengine" long-name="Policy Engine" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/remotemgmt/policymanagement/policyengine" proFile="policyengine.pro"/>
 </component>
-<component name="policymanagement_config" filter="s60" long-name="Policy Management Config" class="config">
+<component name="policymanagement_config" long-name="Policy Management Config" filter="s60" purpose="optional" class="config">
 <unit bldFile="/sf/mw/remotemgmt/policymanagement/group"/>
 </component>
 </collection>
 <collection name="syncmlfw" long-name="SyncML Framework" level="server">
-<component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
+<component name="syncmlfw_build" long-name="SyncML Framework Build" filter="s60" purpose="optional">
 <!--  need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
 <unit bldFile="/sf/mw/remotemgmt/syncmlfw/group"/>
 </component>
 </collection>
 <collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="scp" filter="s60" long-name="Security Code Proxy">
+<component name="scp" long-name="Security Code Proxy" filter="s60" purpose="optional">
 <!-- can only have one unit, need to have these #included from a single bld.inf -->
 <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
 <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
@@ -183,60 +183,60 @@
 <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
 <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
 </component>
-<component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
+<component name="terminalsecurity_client" long-name="Terminal Control Client" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/client/group"/>
 </component>
-<component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
+<component name="terminalsecurity_server" long-name="Terminal Control Server" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/server/group"/>
 </component>
-<component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
+<component name="tcadapter" long-name="Terminal Control Adapter" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
 </component>
-<component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
+<component name="terminalsecurity_build" long-name="Terminal Security Build" filter="s60" purpose="optional">
 <!--  need to distribute exports, etc into the other components and remove this-->
 <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/group"/>
 </component>
 </collection>
 <collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-<component name="pnputil" filter="s60" long-name="PnP Util">
+<component name="pnputil" long-name="PnP Util" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/pnputil/group"/>
 </component>
-<component name="provisioning" filter="s60" long-name="Provisioning">
+<component name="provisioning" long-name="Provisioning" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/provisioning/group"/>
 </component>
 </collection>
 <collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-<component name="dcmoclient" filter="s60" long-name="DCMO Client">
+<component name="dcmoclient" long-name="DCMO Client" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/remotemgmt/dcmofw/dcmoclient/group"/>
 </component>
-<component name="dcmoserver" filter="s60" long-name="DCMO Server">
+<component name="dcmoserver" long-name="DCMO Server" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/remotemgmt/dcmofw/dcmoserver/group"/>
 </component>
-<component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
+<component name="dcmocustcmd" long-name="DCMO Custom Commands" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
 </component>
-<component name="dcmofw_build" filter="s60" long-name="DCMO Build">
+<component name="dcmofw_build" long-name="DCMO Build" filter="s60" purpose="optional">
 <!--  need to distribute exports, etc into the other components and remove this-->
 <unit bldFile="/sf/mw/remotemgmt/dcmofw/group"/>
 </component>
 </collection>
 <collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
+<component name="fotaapplication_build" long-name="FOTA Application Build" filter="s60" purpose="optional">
 <!-- 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">
+<component name="fotaserver" long-name="FOTA Server" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver" proFile="fotaserver.pro"/>
 </component>
 </collection>
 <collection name="devicemgmtnotifications" long-name="Device Management Notifications" level="server">
-<component name="devicemgmtnotifications_rom" filter="s60" long-name="DM Notifications ROM" introduced="^4">
+<component name="devicemgmtnotifications_rom" long-name="DM Notifications ROM" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/remotemgmt/devicemgmtnotifications/group"/>
 </component>
-<component name="dmdevdialogclient" filter="s60" long-name="DM Device Dialog Client" introduced="^4">
+<component name="dmdevdialogclient" long-name="DM Device Dialog Client" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/remotemgmt/devicemgmtnotifications/dmdevdialogclient/bld"/>
 </component>
-<component name="dmdevdialogserver" filter="s60" long-name="DM Device Dialog Server" introduced="^4">
+<component name="dmdevdialogserver" long-name="DM Device Dialog Server" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/remotemgmt/devicemgmtnotifications/dmdevdialogserver/bld"/>
 </component>
 </collection>