diff -r 1553c141c99f -r 5dfc4b38cad0 3k/mw/shortlinkconn/package_definition.xml
--- a/3k/mw/shortlinkconn/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/mw/shortlinkconn/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,140 +1,132 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="shortlinkconn" long-name="Shortlink Connectivity" tech_domain="de" level="generic" levels="framework server generic specific plugin">
     <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-     <component name="bteng" long-name="Bluetooth Engine" origin-model="Foundation">
+     <component name="bteng" long-name="Bluetooth Engine" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/bteng/group"/>
      </component>
-     <component name="btnotif" long-name="Bluetooth Notifier" origin-model="Foundation">
+     <component name="btnotif" long-name="Bluetooth Notifier" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btnotif/group"/>
       <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btnotif/tsrc/btnotifapitest/group"/> -->
      </component>
-     <component name="btaudioman" long-name="Bluetooth Audio Man" origin-model="Foundation">
+     <component name="btaudioman" long-name="Bluetooth Audio Man" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btaudioman/group"/>
      </component>
-     <component name="btmac" long-name="Bluetooth Mac" origin-model="Foundation">
+     <component name="btmac" long-name="Bluetooth Mac" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btmac/group"/>
      </component>
-     <component name="btsac" long-name="Bluetooth SAC" origin-model="Foundation">
+     <component name="btsac" long-name="Bluetooth SAC" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btsac/group"/>
      </component>
-     <component name="btaudiostreamer" long-name="Bluetooth Audio Streamer" origin-model="Foundation">
+     <component name="btaudiostreamer" long-name="Bluetooth Audio Streamer" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btaudiostreamer/group"/>
       <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudiostreamer/tsrc/btaudiostreamerapitest/group"/> -->
      </component>
-     <component name="btsap" long-name="Bluetooth SAP" origin-model="Foundation">
+     <component name="btsap" long-name="Bluetooth SAP" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btsap/group"/>
      </component>
-     <component name="btui" long-name="Bluetooth UI" origin-model="Foundation">
+     <component name="btui" long-name="Bluetooth UI" origin-model="foundation">
       <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btui/ecom/group"/> -->
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btui/group"/>
      </component>
-     <component name="btpbap" long-name="Bluetooth PBAP" origin-model="Foundation">
+     <component name="btpbap" long-name="Bluetooth PBAP" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btpbap/group"/>
      </component>
-     <component name="bthid" long-name="BTHID" origin-model="Foundation">
+     <component name="bthid" long-name="BTHID" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/bthid/group"/>
      </component>
-     <component unofficial="yes" name="bluetoothengine_build" long-name="Bluetooth Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="bluetoothengine_build" long-name="Bluetooth Engine Build" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/group"/>
      </component>
     </collection>
     <collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-     <component name="atext" long-name="Atext" origin-model="Foundation">
+     <component name="atext" long-name="Atext" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/atext/group"/>
      </component>
-     <component name="locod" long-name="Locod" origin-model="Foundation">
+     <component name="locod" long-name="Locod" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/locod/group"/>
      </component>
-     <component name="obexserviceman" long-name="Obex Service Man" origin-model="Foundation">
+     <component name="obexserviceman" long-name="Obex Service Man" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
      </component>
-     <component name="obexsendservices" long-name="Obex Send Services" origin-model="Foundation">
+     <component name="obexsendservices" long-name="Obex Send Services" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
      </component>
-     <component name="obexreceiveservices" long-name="OBEX Receive Services" origin-model="Foundation">
+     <component name="obexreceiveservices" long-name="OBEX Receive Services" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
      </component>
-     <component name="dun" long-name="Dun" origin-model="Foundation">
+     <component name="dun" long-name="Dun" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/dun/group"/>
      </component>
-     <component name="lcstylustap" long-name="LC Stylus Tap" origin-model="Foundation">
+     <component name="lcstylustap" long-name="LC Stylus Tap" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
      </component>
-     <component name="generichid" long-name="Generic HID" origin-model="Foundation">
+     <component name="generichid" long-name="Generic HID" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/generichid/group"/>
      </component>
-     <component unofficial="yes" name="localconnectivityservice_build" long-name="Local Connectivity Service Build" origin-model="Foundation">
+     <component unofficial="yes" name="localconnectivityservice_build" long-name="Local Connectivity Service Build" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/group"/>
      </component>
     </collection>
     <collection name="usbclasses" long-name="USB classes" level="framework">
-     <component name="usbobexclasscontroller" long-name="USB Obex Class Controller" origin-model="Foundation">
+     <component name="usbobexclasscontroller" long-name="USB Obex Class Controller" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbclasses/usbobexclasscontroller/group"/>
       <!-- <unit bldFile="mw/shortlinkconn/usbclasses/usbobexclasscontroller/tsrc/group"/> -->
      </component>
-     <component name="usbbasicpersonality" long-name="USB Basic Personality" origin-model="Foundation">
+     <component name="usbbasicpersonality" long-name="USB Basic Personality" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbclasses/usbbasicpersonality/group"/>
      </component>
-     <component name="usbmscpersonality" long-name="USB Msc Personality" origin-model="Foundation">
+     <component name="usbmscpersonality" long-name="USB Msc Personality" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbclasses/usbmscpersonality/group"/>
      </component>
-     <component name="ptpstack" long-name="Ptp Stack" origin-model="Foundation">
+     <component name="ptpstack" long-name="Ptp Stack" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbclasses/ptpstack/group"/>
      </component>
-     <component name="sicdusbplugin" long-name="Sicd USB Plugin" origin-model="Foundation">
+     <component name="sicdusbplugin" long-name="Sicd USB Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbclasses/sicdusbplugin/group"/>
      </component>
-     <component name="ptpserver" long-name="Ptp Server" origin-model="Foundation">
+     <component name="ptpserver" long-name="Ptp Server" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbclasses/ptpserver/group"/>
       <!-- <unit bldFile="mw/shortlinkconn/usbclasses/ptpserver/ptpclasscontroller/group"/> -->
      </component>
-     <component name="pictbridgeengine" long-name="Pictbridge Engine" origin-model="Foundation">
+     <component name="pictbridgeengine" long-name="Pictbridge Engine" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbclasses/pictbridgeengine/group"/>
      </component>
-     <component name="usbosdescriptorhandler" long-name="USB Os Descriptor Handler" origin-model="Foundation"/>
+     <component name="usbosdescriptorhandler" long-name="USB Os Descriptor Handler" origin-model="foundation"/>
     </collection>
     <collection name="usbengines" long-name="USB Engines" level="generic">
-     <component name="usbwatcher" long-name="USB Watcher" origin-model="Foundation">
+     <component name="usbwatcher" long-name="USB Watcher" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbengines/usbwatcher/group"/>
      </component>
-     <component name="usblocodplugin" long-name="USB Locod Plugin" origin-model="Foundation">
+     <component name="usblocodplugin" long-name="USB Locod Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbengines/usblocodplugin/group"/>
       <!-- <unit bldFile="mw/shortlinkconn/usbengines/usblocodplugin/tsrc/group"/> -->
      </component>
-     <component name="usbdevcon" long-name="USB Devcon" origin-model="Foundation">
+     <component name="usbdevcon" long-name="USB Devcon" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbengines/usbdevcon/group"/>
      </component>
-     <component name="usbremotepersonality" long-name="USB Remote Personality" origin-model="Foundation">
+     <component name="usbremotepersonality" long-name="USB Remote Personality" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbengines/usbremotepersonality/group"/>
      </component>
     </collection>
     <collection name="usbuis" long-name="USB UIs" level="specific">
-     <component name="usbui" long-name="USB UI" origin-model="Foundation">
+     <component name="usbui" long-name="USB UI" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbuis/usbui/group"/>
       <!-- <unit bldFile="mw/shortlinkconn/usbuis/usbui/tsrc/usbuiapitest/group"/> -->
      </component>
-     <component name="usbuinotif" long-name="USB UI Notif" origin-model="Foundation">
+     <component name="usbuinotif" long-name="USB UI Notif" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbuis/usbuinotif/group"/>
       <!-- <unit bldFile="mw/shortlinkconn/usbuis/usbuinotif/tsrc/usbuinotifapitest/group"/> -->
      </component>
-     <component name="imageprintuiprovider" long-name="ImagePrint UI Provider" origin-model="Foundation">
+     <component name="imageprintuiprovider" long-name="ImagePrint UI Provider" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbuis/imageprintuiprovider/group"/>
      </component>
-     <component name="imageprintui" long-name="ImagePrint UI" origin-model="Foundation">
+     <component name="usbimageprintui" long-name="ImagePrint UI" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbuis/imageprintui/group"/>
      </component>
     </collection>
-    <collection name="shortlinkconn_pub" long-name="Shortlink Connectivity Public Interfaces" level="plugin">
-     <component unofficial="yes" name="bluetooth_power_state_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_pub/bluetooth_power_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_notifier_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_pub/bluetooth_notifier_api/group"/>
-     </component>
-    </collection>
     <collection name="obex" long-name="OBEX" level="generic">
      <component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/mw/shortlinkconn/obex/obexprotocol/group" mrp="/sf/mw/shortlinkconn/obex/obexprotocol/group/obex.mrp"/>
@@ -149,106 +141,23 @@
      </component>
     </collection>
     <collection name="shortlinkconn_info" long-name="Shortlink Connectivity Info" level="plugin">
-     <component unofficial="yes" name="public" origin-model="Foundation">
+     <component unofficial="yes" name="shortlinkconn_pub" long-name="Shortlink Connectivity Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_pub/group"/>
+     </component>
+     <component unofficial="yes" name="public" origin-model="foundation">
       <!-- <unit bldFile="mw/shortlinkconn/tsrc/public/basic/group"/> -->
      </component>
-     <component unofficial="yes" name="shortlinkconn_build" long-name="Shortlink Connectivity Build" origin-model="Foundation">
+     <component unofficial="yes" name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/tsrc/group"/> -->
+      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/group"/>
+     </component>
+     <component unofficial="yes" name="shortlinkconn_build" long-name="Shortlink Connectivity Build" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/group"/>
      </component>
     <component name="shortlinkconn_metadata" long-name="Shortlink Connectivity Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/mw/shortlinkconn/shortlinkconn_info/shortlinkconn_metadata/shortlinkconn_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-     <component unofficial="yes" name="bluetooth_engine_settings_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="dialup_connection_status_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_dosserver_audio_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/bluetooth_dosserver_audio_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_watcher_info_api_header" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/usb_watcher_info_api_header/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_sap_connection_state_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/bluetooth_sap_connection_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_notifier_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/usb_notifier_api/group"/>
-     </component>
-     <component unofficial="yes" name="pictbridge_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/pictbridge_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptp_transport_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/ptp_transport_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_device_management_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_device_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_device_control_plugin_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/usb_device_control_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_notifier_internal_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/bluetooth_notifier_internal_api/group"/>
-     </component>
-     <component unofficial="yes" name="at_command_handler_plugin_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/at_command_handler_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_connection_management_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_connection_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_watcher_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/usb_watcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="obex_secondary_display_notification_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_personality_plugin_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/usb_personality_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptp_responder_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/ptp_responder_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_secondary_display_notification_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/bluetooth_secondary_display_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="dun_secondary_display_notification_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_discovery_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_discovery_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_dut_mode_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/bluetooth_dut_mode_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_local_variation_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/bluetooth_local_variation_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_personality_api_header" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/usb_personality_api_header/group"/>
-     </component>
-     <component unofficial="yes" name="obex_service_plugin_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_secondary_display_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/usb_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptp_server_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/ptp_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="obex_service_utils_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_plugin_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_plugin_api/group"/>
-     </component>
-    </collection>
    </block>
 </layer>
 </systemModel>