diff -r 1553c141c99f -r 5dfc4b38cad0 3k/app/messaging/package_definition.xml
--- a/3k/app/messaging/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/app/messaging/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="messaging" long-name="Messaging Apps" tech_domain="pr" level="apps" span="2" levels="mail eng base ui">
     <collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-     <component name="audiomsg" long-name="Audio Message" origin-model="Foundation">
+     <component name="audiomsg" long-name="Audio Message" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/mobilemessaging/audiomsg/group"/>
      </component>
-     <component name="msgmedia" long-name="Message Media" origin-model="Foundation">
+     <component name="msgmedia" long-name="Message Media" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/mobilemessaging/msgmedia/group"/>
      </component>
-     <component name="unieditor" long-name="Uni Editor" origin-model="Foundation">
+     <component name="unieditor" long-name="Uni Editor" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/mobilemessaging/unieditor/group"/>
      </component>
-     <component name="mmsui" long-name="MMS UI" origin-model="Foundation">
+     <component name="mmsui" long-name="MMS UI" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/mobilemessaging/mmsui/group"/>
      </component>
-     <component name="postcard" long-name="Postcard" origin-model="Foundation">
+     <component name="postcard" long-name="Postcard" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/mobilemessaging/postcard/group"/>
      </component>
-     <component name="smilui" long-name="SMIL UI" origin-model="Foundation">
+     <component name="smilui" long-name="SMIL UI" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/mobilemessaging/smilui/group"/>
      </component>
-     <component name="smum" long-name="Smum" origin-model="Foundation">
+     <component name="smum" long-name="Smum" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/mobilemessaging/smum/group"/>
      </component>
-     <component name="smsui" long-name="SMS UI" origin-model="Foundation">
+     <component name="smsui" long-name="SMS UI" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/mobilemessaging/smsui/group"/>
       <!-- <unit bldFile="app/messaging/mobilemessaging/smsui/viewer"/> -->
      </component>
@@ -39,47 +39,47 @@
      </component>
     </collection>
     <collection name="mmsengine" long-name="MMS Engine" level="eng">
-     <component name="mmsconninit" long-name="MMS Connection Init" origin-model="Foundation">
+     <component name="mmsconninit" long-name="MMS Connection Init" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmsconninit/bld"/> -->
      </component>
-     <component name="genutils" long-name="General Utils" origin-model="Foundation">
+     <component name="genutils" long-name="General Utils" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/genutils/bld"/> -->
      </component>
-     <component name="mmsserversettings" long-name="MMS Server Aettings" origin-model="Foundation">
+     <component name="mmsserversettings" long-name="MMS Server Aettings" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmsserversettings/bld"/> -->
      </component>
-     <component name="mmsmessage" long-name="MMS Message" origin-model="Foundation">
+     <component name="mmsmessage" long-name="MMS Message" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmsmessage/bld"/> -->
      </component>
-     <component name="mmshttptransport" long-name="MMS HTTP Transport" origin-model="Foundation">
+     <component name="mmshttptransport" long-name="MMS HTTP Transport" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmshttptransport/bld"/> -->
      </component>
-     <component name="mmscodec" long-name="MMS Codec" origin-model="Foundation">
+     <component name="mmscodec" long-name="MMS Codec" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmscodec/bld"/> -->
      </component>
-     <component name="mmsserver" long-name="MMS Server" origin-model="Foundation">
+     <component name="mmsserver" long-name="MMS Server" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmsserver/bld"/> -->
      </component>
-     <component name="clientmtm" long-name="Client MTM" origin-model="Foundation">
+     <component name="clientmtm" long-name="Client MTM" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/clientmtm/bld"/> -->
      </component>
-     <component name="mmswatcher" long-name="MMS Watcher" origin-model="Foundation">
+     <component name="mmswatcher" long-name="MMS Watcher" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmswatcher/bld"/> -->
      </component>
-     <component name="mmspushhandler" long-name="MMS Push Handler" origin-model="Foundation">
+     <component name="mmspushhandler" long-name="MMS Push Handler" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmspushhandler/bld"/> -->
      </component>
-     <component name="applicationadapter" long-name="Application Adapter" origin-model="Foundation">
+     <component name="applicationadapter" long-name="Application Adapter" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/applicationadapter/bld"/> -->
      </component>
-     <component name="mmscodecclient" long-name="MMS Codec Client" origin-model="Foundation">
+     <component name="mmscodecclient" long-name="MMS Codec Client" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmscodecclient/bld"/> -->
      </component>
      <!--Component manually removed and merged to OS-->
      <!--<component name="mmssettings">
        <unit bldFile="app/messaging/mmsengine/mmssettings/test/group"/>
      </component>-->
-     <component unofficial="yes" name="mmsengine_build" long-name="MMS Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="mmsengine_build" long-name="MMS Engine Build" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/mmsengine/group"/>
      </component>
     <component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
@@ -90,43 +90,43 @@
      </component>
     </collection>
     <collection name="messagingappbase" long-name="Messaging App Base" level="base">
-     <component name="msgavkon" long-name="Messaging Avkon" origin-model="Foundation">
+     <component name="msgavkon" long-name="Messaging Avkon" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/messagingappbase/msgavkon/group"/>
      </component>
-     <component name="mce" long-name="MCE" origin-model="Foundation">
+     <component name="mce" long-name="MCE" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/messagingappbase/mce/group"/>
      </component>
-     <component name="mceextraitems" long-name="Mce Extra Items" origin-model="Foundation">
+     <component name="mceextraitems" long-name="Mce Extra Items" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/messagingappbase/mceextraitems/group"/>
      </component>
-     <component name="mcesettings" long-name="MCE Settings" origin-model="Foundation">
+     <component name="mcesettings" long-name="MCE Settings" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/messagingappbase/mcesettings/group"/>
      </component>
-     <component name="msgerrorwatcher" long-name="Msg Error Watcher" origin-model="Foundation">
+     <component name="msgerrorwatcher" long-name="Msg Error Watcher" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/messagingappbase/msgerrorwatcher/group"/>
      </component>
-     <component name="ncnlist" long-name="NCN List" origin-model="Foundation">
+     <component name="ncnlist" long-name="NCN List" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/messagingappbase/ncnlist/group"/>
      </component>
-     <component name="schemeplugin" long-name="Scheme Plugin" origin-model="Foundation">
+     <component name="schemeplugin" long-name="Scheme Plugin" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/messagingappbase/schemeplugin/group"/>
      </component>
-     <component name="sendui" long-name="Send UI" origin-model="Foundation">
+     <component name="sendui" long-name="Send UI" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/messagingappbase/sendui/drmlinksender/group"/> -->
       <!-- <unit bldFile="app/messaging/messagingappbase/sendui/genericmtmplugin/group"/> -->
       <unit bldFile="/sf/app/messaging/messagingappbase/sendui/group"/>
       <!-- <unit bldFile="app/messaging/messagingappbase/sendui/meetingrequestsender/group"/> -->
      </component>
-     <component name="smilengine" long-name="SMIL Engine" origin-model="Foundation">
+     <component name="smilengine" long-name="SMIL Engine" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/messagingappbase/smilengine/group"/>
      </component>
-     <component name="bium" long-name="Bium" origin-model="Foundation">
+     <component name="bium" long-name="Bium" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/messagingappbase/bium/group"/>
      </component>
-     <component name="smartmessaging" long-name="Smart Messaging" origin-model="Foundation">
+     <component name="smartmessaging" long-name="Smart Messaging" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/messagingappbase/smartmessaging/group"/>
      </component>
-     <component name="msgeditor" long-name="Messaging Editor" origin-model="Foundation">
+     <component name="msgeditor" long-name="Messaging Editor" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/messagingappbase/msgeditor/group"/>
      </component>
      <!--Component manually removed and merged to OS-->
@@ -159,19 +159,19 @@
      </component>
     </collection>
     <collection name="email" long-name="Email" level="mail">
-     <component name="alwaysonlineemailplugin" long-name="Always Online Mail Plugin" origin-model="Foundation">
+     <component name="alwaysonlineemailplugin" long-name="Always Online Mail Plugin" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/email/alwaysonlineemailplugin/group"/>
      </component>
-     <component name="emailnotificationhandler" long-name="Email Notification Handler" origin-model="Foundation">
+     <component name="emailnotificationhandler" long-name="Email Notification Handler" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/email/emailnotificationhandler/group"/>
      </component>
-     <component name="imum" long-name="IMUM" origin-model="Foundation">
+     <component name="imum" long-name="IMUM" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/email/imum/domainapi/group"/> -->
       <unit bldFile="/sf/app/messaging/email/imum/group"/>
       <!-- <unit bldFile="app/messaging/email/imum/mtms/group"/> -->
       <!-- <unit bldFile="app/messaging/email/imum/utils/group"/> -->
      </component>
-     <component name="mail" long-name="Mail" origin-model="Foundation">
+     <component name="mail" long-name="Mail" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/email/mail/group"/>
      </component>
      <!--Component manually removed and merged to OS-->
@@ -206,93 +206,32 @@
      </component>
     </collection>
     <collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-     <component unofficial="yes" name="mms_client_mtm_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_pub/mms_client_mtm_api/group"/>
-      <!-- <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="email_domain_utilities_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/email_domain_utilities_api/group"/>
-      <!-- <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="messaging_build" long-name="Messaging Apps Build" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_test" long-name="Messaging Apps Test" origin-model="Foundation">
+     <component unofficial="yes" name="messaging_test" long-name="Messaging Apps Test" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="messaging_media_resolver_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_center_ui_utilities_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_message_notification_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/new_message_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contacts_note_status_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="open_new_message_notification_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_pub/open_new_message_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="internet_mail_mtm_ui_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_engine_settings_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/mms_engine_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_integration_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_pub/messaging_integration_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_application_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/mms_application_api/group"/>
-     </component>
-     <component unofficial="yes" name="plugin_bio_control_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_pub/plugin_bio_control_api/group"/>
-      <!-- <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="mms_server_settings_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/mms_server_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="send_ui_meeting_request_api" origin-model="Foundation">
+     <component unofficial="yes" name="msg_plat" class="api" origin-model="foundation">
+      <!-- <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/tsrc/group"/> -->
+      <unit bldFile="/sf/app/messaging/msg_plat/group"/>
+      <unit bldFile="/sf/app/messaging/msg_plat/messaging_center_ui_utilities_api/tsrc/group"/>
+      <unit bldFile="/sf/app/messaging/msg_plat/messaging_editor_api/tsrc/group"/>
+      <unit bldFile="/sf/app/messaging/msg_plat/messaging_media_resolver_api/tsrc/group"/>
+      <unit bldFile="/sf/app/messaging/msg_plat/mms_application_api/tsrc/group"/>
+      <unit bldFile="/sf/app/messaging/msg_plat/mms_codec_client_api/tsrc/group"/>
+      <unit bldFile="/sf/app/messaging/msg_plat/mms_conformance_api/tsrc/group"/>
+      <unit bldFile="/sf/app/messaging/msg_plat/mms_server_settings_api/tsrc/group"/>
       <!-- <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/tsrc/group"/> -->
-      <unit bldFile="/sf/app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-     </component>
-     <component unofficial="yes" name="mail_ui_constants_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/mail_ui_constants_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contact_notes_extended_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-     </component>
-     <component unofficial="yes" name="unified_editor_video_conversion_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contacts_note_secondary_display_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_editor_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/messaging_editor_api/group"/>
+      <unit bldFile="/sf/app/messaging/msg_plat/smil_engine_api/tsrc/group"/>
+      <unit bldFile="/sf/app/messaging/msg_plat/unified_editor_video_conversion_api/tsrc/group"/>
      </component>
-     <component unofficial="yes" name="smil_player_launch_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/smil_player_launch_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_codec_client_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/mms_codec_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="smil_engine_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/smil_engine_api/group"/>
+     <component unofficial="yes" name="msg_pub" class="api" origin-model="foundation">
+      <unit bldFile="/sf/app/messaging/msg_pub/group"/>
+      <!-- <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/> -->
+      <unit bldFile="/sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/group"/>
+      <!-- <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/> -->
+      <unit bldFile="/sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/group"/>
      </component>
-     <component unofficial="yes" name="smil_transition_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/smil_transition_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_conformance_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/mms_conformance_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contacts_note_variables_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_editor_constants_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/messaging/msg_pub/messaging_editor_constants_api/group"/>
+     <component unofficial="yes" name="messaging_build" long-name="Messaging Apps Build" origin-model="foundation">
+      <unit bldFile="/sf/app/messaging/group"/>
      </component>
     <component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>