# HG changeset patch
# User hgs
# Date 1280127772 -10800
# Node ID 3aeaa0c5c8c19152f4c2e3e2aed90b29834e1ae9
# Parent  9e2a905b887f5be5ab040f9f8646d1ffca9440dd
201029_03

diff -r 9e2a905b887f -r 3aeaa0c5c8c1 package_definition.xml
--- a/package_definition.xml	Fri Jul 23 15:57:13 2010 +0300
+++ b/package_definition.xml	Mon Jul 26 10:02:52 2010 +0300
@@ -1,188 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="btservices" name="Bluetooth Services" levels="framework server generic specific plugin">
-  <collection id="btservices_pub" name="BT Services Public Interfaces" level="plugin">
-   <component id="bluetooth_power_state_api" name="Bluetooth Power State API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_pub/bluetooth_power_state_api/bluetooth_power_state_api.metaxml"/>
-    <unit bldFile="btservices_pub/bluetooth_power_state_api/group"/>
-   </component>
-   <component id="bluetooth_notifier_api" name="Bluetooth Notifier API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_pub/bluetooth_notifier_api/bluetooth_notifier_api.metaxml"/>
-    <unit bldFile="btservices_pub/bluetooth_notifier_api/group"/>
-   </component>
-  </collection>
-  <collection id="btservices_plat" name="BT Services Platform Interfaces" level="plugin">
-   <!-- Turn the device setting pri file into a pro and rephrase this entry accordingly and get rid of btservices_plat.pro -->
-   <component id="bt_remote_device_setting_api" name="Bluetooth Remote Device Setting API" class="api" filter="s60" introduced="^4">
-    <meta rel="Api" href="btservices_plat/bt_remote_device_setting_api/bt_remote_device_setting_api.metaxml"/>
-    <unit bldFile="btservices_plat" qt:proFile="btservices_plat.pro"/>
-   </component>
-   <component id="bluetooth_dosserver_audio_api" name="Bluetooth DOS Server Audio API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_dosserver_audio_api/bluetooth_dosserver_audio_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_dosserver_audio_api/group"/>
-   </component>
-   <component id="bluetooth_dut_mode_api" name="Bluetooth DUT Mode API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_dut_mode_api/bluetooth_dut_mode_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_dut_mode_api/group"/>
-   </component>
-   <component id="bluetooth_engine_api" name="Bluetooth Engine API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_engine_api/bluetooth_engine_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_api/group"/>
-   </component>
-   <component id="bluetooth_engine_connection_management_api" name="Bluetooth Engine Connection Management API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_engine_connection_management_api/bluetooth_engine_connection_management_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_connection_management_api/group" filter="!test"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_connection_management_api/tsrc/group"  filter="test,api_test"/>
-   </component>
-   <component id="bluetooth_engine_device_management_api" name="Bluetooth Engine Device Management API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_engine_device_management_api/bluetooth_engine_device_management_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_device_management_api/group" filter="!test"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_device_management_api/tsrc/group"  filter="test,api_test"/>
-   </component>
-   <component id="bluetooth_engine_discovery_api" name="Bluetooth Engine Discovery API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_engine_discovery_api/bluetooth_engine_discovery_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_discovery_api/group" filter="!test"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_discovery_api/tsrc/group"  filter="test,api_test"/>
-   </component>
-   <component id="bluetooth_engine_features_api" name="Bluetooth Engine Features API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_engine_features_api/bluetooth_engine_features_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_features_api/group"/>
-   </component>
-   <component id="bluetooth_engine_settings_api" name="Bluetooth Engine Settings API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_engine_settings_api/bluetooth_engine_settings_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_settings_api/group" filter="!test"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_settings_api/tsrc/group"  filter="test,api_test"/>
-   </component>
-   <component id="bluetooth_engine_plugin_api" name="Bluetooth Engine Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_engine_plugin_api/bluetooth_engine_plugin_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_plugin_api/group"/>
-   </component>
-   <component id="bluetooth_local_variation_api" name="Bluetooth Local Variation API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_local_variation_api/bluetooth_local_variation_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_local_variation_api/group"/>
-   </component>
-   <component id="bluetooth_notifier_internal_api" name="Bluetooth Notifier internal API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_notifier_internal_api/bluetooth_notifier_internal_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_notifier_internal_api/group"/>
-   </component>
-   <component id="bluetooth_sap_connection_state_api" name="Bluetooth SAP Connection State API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_sap_connection_state_api/bluetooth_sap_connection_state_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_sap_connection_state_api/group"/>
-   </component>
-   <component id="bluetooth_secondary_display_notification_api" name="Bluetooth Secondary Display Notification API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_secondary_display_notification_api/bluetooth_secondary_display_notification_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-   </component>
-   <component id="obex_secondary_display_notification_api" name="OBEX Secondary Display Notification API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/obex_secondary_display_notification_api/obex_secondary_display_notification_api.metaxml"/>
-    <unit bldFile="btservices_plat/obex_secondary_display_notification_api/group"/>
-   </component>
-   <component id="obex_service_plugin_api" name="OBEX Service Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/obex_service_plugin_api/obex_service_plugin_api.metaxml"/>
-    <unit bldFile="btservices_plat/obex_service_plugin_api/group"/>
-   </component>
-   <component id="obex_service_utils_api" name="OBEX Service Utils API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/obex_service_utils_api/obex_service_utils_api.metaxml"/>
-    <unit bldFile="btservices_plat/obex_service_utils_api/group"/>
-   </component>
-   <component id="usb_obexservicemanager_client_api" name="OBEX Service Manager Client API" class="api" filter="s60">
-    <unit bldFile="btservices_plat/usb_obexservicemanager_client_api/group"/>
-   </component>
-  </collection>
-  <collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
-   <component id="btnotifclient" filter="s60" name="Bluetooth Notification Client" introduced="^4">
-	<!-- cannot put a component under another component. Move up a directory -->
-    <unit bldFile="bluetoothengine/btnotif/btnotifclient/group"/>
-   </component>
-   <component id="bteng" filter="s60" name="Bluetooth Engine">
-    <unit bldFile="bluetoothengine/bteng/group"/>
-   </component>
-   <component id="btserviceutil" filter="s60" name="Bluetooth Service Utils" introduced="^4">
-    <unit bldFile="bluetoothengine/btserviceutil/group" filter="!test"/>
-    <unit bldFile="bluetoothengine/btserviceutil/tsrc/btserviceutiltest/group"  filter="test,api_test"/>
-   </component>
-   <component id="btnotif" filter="s60" name="Bluetooth Notifier">
-    <unit bldFile="bluetoothengine/btnotif/group"/>
-   </component>
-   <!-- btdevicedialogplugin is a component, under another component (btnotif)- this is a coding standards violation -->
-   <component id="btdevicedialogplugin" filter="s60" name="Bluetooth Device Dialog Plugin" class="plugin" introduced="^4">
-    <unit bldFile="bluetoothengine/btnotif/btdevicedialogplugin" qt:proFile="btdevicedialogplugin.pro"/>
-   </component>
-   <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
-    <unit bldFile="bluetoothengine/btaudioman/group" filter="!test"/>
-    <unit bldFile="bluetoothengine/btaudioman/tsrc/btAudioManApiTest/group"  filter="test,api_test"/>
-   </component>
-   <component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
-    <unit bldFile="bluetoothengine/btmac/group"/>
-   </component>
-   <component id="btsac" filter="s60" name="Bluetooth Stereo Audio Controller" class="plugin">
-    <unit bldFile="bluetoothengine/btsac/group"/>
-   </component>
-   <component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
-    <unit bldFile="bluetoothengine/btaudiostreamer/group" filter="!test"/>
-    <unit bldFile="bluetoothengine/btaudiostreamer/tsrc/BtAudioStreamerApiTest/group" filter="test,api_test"/>
-   </component>
-   <component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
-    <unit bldFile="bluetoothengine/btsap/group"/>
-   </component>
-   <component id="btui" filter="s60" name="Bluetooth UI">
-	 <unit  bldFile="bluetoothengine/btui" qt:proFile="btui.pro" />
-   </component>
-   <component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
-    <unit bldFile="bluetoothengine/btpbap/group"/>
-   </component>
-   <component id="bthid" filter="s60" name="Bluetooth HID">
-    <unit bldFile="bluetoothengine/bthid/group"/>
-   </component>
-   <component id="btindicator" filter="s60" name="Bluetooth Indicator" introduced="^4">
-    <unit bldFile="bluetoothengine/btindicator" qt:proFile="btindicator.pro"/>
-   </component>
-   <component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
-    <unit bldFile="bluetoothengine/btctrldcmoadapter/group"/>
-   </component>
-  </collection>
-  <collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
-   <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-    <unit bldFile="bluetoothappprofiles/avrcp" mrp="bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-   </component>
-  </collection>
-  <collection id="atcommands" name="AT Commands" level="generic">
-   <component id="modematplugin" name="Modem AT Plugin" filter="s60" class="plugin" introduced="^4">
-    <unit bldFile="atcommands/modematplugin/group"/>
-   </component>
-   <component id="lccustomplugin" name="LC Custom Plugin" filter="s60" class="plugin" introduced="^4">
-    <unit bldFile="atcommands/lccustomplugin/group"/>
-   </component>
-  </collection>
-  <collection id="cbsatplugin" name="CBS AT Plugin" level="plugin">
-     <component id="atmisccmdplugin" name="AT Misc Commands Plugin"  filter="s60" class="plugin" introduced="^4">
-      <unit bldFile="cbsatplugin/atmisccmdplugin/group"/>
-     </component>
-  </collection>
-  <collection id="btobexprofiles" name="BT OBEX Profiles" level="generic">
-     <component id="obexreceiveservices" name="OBEX Receive Services"  filter="s60">
-      <unit bldFile="btobexprofiles/obexreceiveservices/group"/>
-     </component>
-     <!-- Move this up to btobexprofiles/btmsgviewer, because obexreceiveservices is already a cpt and you can't have components inside components -->
-     <component id="btmsgviewer" name="BT message viewer"  filter="s60" introduced="^4">
-      <unit bldFile="btobexprofiles/obexreceiveservices/btmsgviewer" qt:proFile="btmsgviewer.pro"/>
-     </component>
-     <component id="obexsendservices" name="OBEX Send Services"  filter="s60">
-      <unit bldFile="btobexprofiles/obexsendservices/group"/>
-     </component>
-     <component id="obexhighway" name="OBEX Highway"  filter="s60" introduced="^4">
-		<!-- should be moved out from under obexsendservices into own component dir -->
-        <unit bldFile="btobexprofiles/obexsendservices/obexhighway" qt:proFile="obexhighway.pro"/>
-     </component>
-     <component id="obexserviceman" name="OBEX Service Manager"  filter="s60">
-      <unit bldFile="btobexprofiles/obexserviceman/group"/>
-     </component>
-  </collection>
-  <collection id="btservices_info" name="BT Services Info" level="plugin">
-   <component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
-    <unit mrp="btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
+<SystemDefinition schema="3.0.0">
+  <package id="btservices" name="Bluetooth Services" levels="framework server generic specific plugin">
+    <collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
+      <component id="bteng" filter="s60" name="Bluetooth Engine">
+        <unit bldFile="bluetoothengine/bteng/group"/>
+      </component>
+      <component id="btserviceutil" filter="s60" name="Bluetooth Service Utility">
+        <unit bldFile="bluetoothengine/btserviceutil/group"/>
+      </component>
+      <component id="btnotif" filter="s60" name="Bluetooth Notifier">
+      	<!-- client is separated for breaking cyclic compiling dependencies -->
+        <unit bldFile="bluetoothengine/btnotif/btnotifclient/group"/>
+        <unit bldFile="bluetoothengine/btnotif/group"/>
+          <!-- is this test needed as unit? -->
+        <!-- <unit bldFile="bluetoothengine/btnotif/tsrc/btnotifapitest/group"/> -->
+      </component>
+      <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
+        <unit bldFile="bluetoothengine/btaudioman/group"/>
+      </component>
+      <component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
+        <unit bldFile="bluetoothengine/btmac/group"/>
+      </component>
+      <component id="btsac" filter="s60" name="Bluetooth Stereo Audio Controller" class="plugin">
+        <unit bldFile="bluetoothengine/btsac/group"/>
+      </component>
+      <component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
+        <unit bldFile="bluetoothengine/btaudiostreamer/group"/>
+        <!-- <unit bldFile="bluetoothengine/btaudiostreamer/tsrc/btaudiostreamerapitest/group"/> -->
+      </component>
+      <component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
+        <unit bldFile="bluetoothengine/btsap/group"/>
+      </component>
+      <component id="btui" filter="s60" name="Bluetooth UI">
+        <!-- <unit bldFile="bluetoothengine/btui/ecom/group"/> -->
+        <unit bldFile="bluetoothengine/btui/group"/>
+      </component>
+      <component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
+        <unit bldFile="bluetoothengine/btpbap/group"/>
+      </component>
+      <component id="bthid" filter="s60" name="Bluetooth HID">
+        <unit bldFile="bluetoothengine/bthid/group"/>
+      </component>
+    </collection>
+    <collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
+      <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
+        <unit bldFile="bluetoothappprofiles/avrcp" mrp="bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+      </component>
+    </collection>
+    <collection id="btservices_info" name="BT Services Info" level="plugin">
+      <component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+        <unit mrp="btservices_info/btservices_metadata/btservices_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
-