diff -r e1a3c78941f2 -r b83b50a45c11 tip_pbc/mw/btservices/package_definition.xml
--- a/tip_pbc/mw/btservices/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ b/tip_pbc/mw/btservices/package_definition.xml	Mon Sep 06 15:26:01 2010 +0100
@@ -50,124 +50,121 @@
   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="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
+   <block name="btservices" level="generic" levels="framework server generic specific plugin" long-name="Bluetooth Services">
 <collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
+<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
 </component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
+<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
 </component>
 </collection>
 <collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
+<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
 </component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
+<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
 </component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
+<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_api/group"/>
 </component>
-<component name="bluetooth_engine_connection_management_api" long-name="Bluetooth Engine Connection Management API" filter="s60" class="api">
+<component name="bluetooth_engine_connection_management_api" long-name="Bluetooth Engine Connection Management API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group" filter="!test"/>
 </component>
-<component name="bluetooth_engine_device_management_api" long-name="Bluetooth Engine Device Management API" filter="s60" class="api">
+<component name="bluetooth_engine_device_management_api" long-name="Bluetooth Engine Device Management API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group" filter="!test"/>
 </component>
-<component name="bluetooth_engine_discovery_api" long-name="Bluetooth Engine Discovery API" filter="s60" class="api">
+<component name="bluetooth_engine_discovery_api" long-name="Bluetooth Engine Discovery API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group" filter="!test"/>
 </component>
-<component name="bluetooth_engine_features_api" long-name="Bluetooth Engine Features API" filter="s60" class="api">
+<component name="bluetooth_engine_features_api" long-name="Bluetooth Engine Features API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_features_api/group"/>
 </component>
-<component name="bluetooth_engine_settings_api" long-name="Bluetooth Engine Settings API" filter="s60" class="api">
+<component name="bluetooth_engine_settings_api" long-name="Bluetooth Engine Settings API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_settings_api/group" filter="!test"/>
 </component>
-<component name="bluetooth_engine_plugin_api" long-name="Bluetooth Engine Plugin API" filter="s60" class="api">
+<component name="bluetooth_engine_plugin_api" long-name="Bluetooth Engine Plugin API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_plugin_api/group"/>
 </component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
+<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
 </component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
+<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
 </component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
+<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
 </component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
+<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
 </component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
+<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/obex_secondary_display_notification_api/group"/>
 </component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
+<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/obex_service_plugin_api/group"/>
 </component>
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
+<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/obex_service_utils_api/group"/>
 </component>
-<component name="usb_obexservicemanager_client_api" long-name="OBEX Service Manager Client API" filter="s60" class="api">
+<component name="usb_obexservicemanager_client_api" long-name="OBEX Service Manager Client API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/usb_obexservicemanager_client_api/group"/>
 </component>
-<component name="bt_remote_device_setting_api" long-name="BT Remote Device Setting API" filter="s60" introduced="^4" class="api">
+<component name="bt_remote_device_setting_api" long-name="BT Remote Device Setting API" introduced="^4" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat" proFile="btservices_plat.pro"/>
 </component>
 </collection>
 <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="btnotifclient" filter="s60" long-name="Bluetooth Notification Client" introduced="^4">
+<component name="btnotifclient" long-name="Bluetooth Notification Client" introduced="^4" filter="s60" purpose="optional">
 <!-- cannot put a component under another component. Move up a directory -->
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btnotif/btnotifclient/group"/>
 </component>
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
+<component name="bteng" long-name="Bluetooth Engine" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/bteng/group"/>
 </component>
-<component name="btserviceutil" filter="s60" long-name="Bluetooth Service Utils" introduced="^4">
+<component name="btserviceutil" long-name="Bluetooth Service Utils" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btserviceutil/group" filter="!test"/>
 </component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
+<component name="btnotif" long-name="Bluetooth Notifier" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btnotif/group"/>
 </component>
-<component name="btdevicedialogplugin" filter="s60" long-name="Bluetooth Device Dialog Plugin" introduced="^4" plugin="Y">
+<component name="btdevicedialogplugin" long-name="Bluetooth Device Dialog Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btnotif/btdevicedialogplugin" proFile="btdevicedialogplugin.pro"/>
 </component>
-<component name="btaudioman" filter="s60" long-name="Bluetooth Audio Manager">
+<component name="btaudioman" long-name="Bluetooth Audio Manager" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btaudioman/group" filter="!test"/>
 </component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
+<component name="btmac" long-name="Bluetooth Mono Audio Controller" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btmac/group"/>
 </component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
+<component name="btsac" long-name="Bluetooth Stereo Audio Controller" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btsac/group"/>
 </component>
-<component name="btaudiostreamer" filter="s60" long-name="Bluetooth Audio Streamer">
+<component name="btaudiostreamer" long-name="Bluetooth Audio Streamer" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btaudiostreamer/group" filter="!test"/>
 </component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
+<component name="btsap" long-name="Bluetooth SIM Access Profile" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btsap/group"/>
 </component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
+<component name="btui" long-name="Bluetooth UI" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btui" proFile="btui.pro"/>
 </component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
+<component name="btpbap" long-name="Bluetooth Phonebook Access Profile" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btpbap/group"/>
 </component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
+<component name="bthid" long-name="Bluetooth HID" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/bthid/group"/>
 </component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
+<component name="btctrldcmoadapter" long-name="Bluetooth Control DCMO Adapter" introduced="^3" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
 </component>
-<component name="btindicator" filter="s60" long-name="Bluetooth Indicator" introduced="^4">
+<component name="btindicator" long-name="Bluetooth Indicator" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btindicator" proFile="btindicator.pro"/>
 </component>
-<component name="bluetoothengine_conf" filter="s60" long-name="Bluetooth Engine Config" introduced="^4" class="config">
-<unit bldFile="/sf/mw/btservices/bluetoothengine/conf"/>
-</component>
 </collection>
 <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
 <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
@@ -175,34 +172,34 @@
 </component>
 </collection>
 <collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
+<component name="modematplugin" long-name="Modem AT Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/atcommands/modematplugin/group"/>
 </component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
+<component name="lccustomplugin" long-name="LC Custom Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/atcommands/lccustomplugin/group"/>
 </component>
 </collection>
 <collection name="cbsatplugin" long-name="CBS AT Plugin" level="plugin">
-<component name="atmisccmdplugin" long-name="AT Misc Commands Plugin" filter="s60" introduced="^4" plugin="Y">
+<component name="atmisccmdplugin" long-name="AT Misc Commands Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/cbsatplugin/atmisccmdplugin/group"/>
 </component>
 </collection>
 <collection name="btobexprofiles" long-name="BT OBEX Profiles" level="generic">
-<component name="obexreceiveservices" long-name="OBEX Receive Services" filter="s60">
+<component name="obexreceiveservices" long-name="OBEX Receive Services" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/btobexprofiles/obexreceiveservices/group"/>
 </component>
-<component name="btmsgviewer" long-name="BT Message Viewer" filter="s60" introduced="^4">
+<component name="btmsgviewer" long-name="BT Message Viewer" introduced="^4" filter="s60" purpose="optional">
 <!-- should be moved out from under obexreceiveservices into own component dir -->
 <unit bldFile="/sf/mw/btservices/btobexprofiles/obexreceiveservices/btmsgviewer" proFile="btmsgviewer.pro"/>
 </component>
-<component name="obexsendservices" long-name="OBEX Send Services" filter="s60">
+<component name="obexsendservices" long-name="OBEX Send Services" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/btobexprofiles/obexsendservices/group"/>
 </component>
-<component name="obexhighway" long-name="OBEX Highway" filter="s60" introduced="^4">
+<component name="obexhighway" long-name="OBEX Highway" introduced="^4" filter="s60" purpose="optional">
 <!-- should be moved out from under obexsendservices into own component dir -->
 <unit bldFile="/sf/mw/btservices/btobexprofiles/obexsendservices/obexhighway" proFile="obexhighway.pro"/>
 </component>
-<component name="obexserviceman" long-name="OBEX Service Manager" filter="s60">
+<component name="obexserviceman" long-name="OBEX Service Manager" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/btobexprofiles/obexserviceman/group"/>
 </component>
 </collection>