--- a/symbian3/app/messaging/package_definition.xml	Wed Jan 27 15:59:56 2010 +0000
+++ b/symbian3/app/messaging/package_definition.xml	Thu Jan 28 14:49:47 2010 +0000
@@ -1,143 +1,236 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="/sf/app/messaging/mobilemessaging/smsmtm/group" mrp="/sf/app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/app/messaging/mmsengine/mmssettings/group" mrp="/sf/app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="/sf/app/messaging/mmsengine/mmsconf" mrp="/sf/app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/app/messaging/messagingappbase/smilparser/GROUP" mrp="/sf/app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/Group" mrp="/sf/app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="mail">
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" plugin="Y">
-<unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/group" mrp="/sf/app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/app/messaging/email/imap4mtm/group" mrp="/sf/app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="messaging">
-<unit bldFile="/sf/app/messaging/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="app" long-name="Applications" levels="services apps">
+      <block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
+        <collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
+          <component name="audiomsg" filter="s60" long-name="Audio Message">
+            <unit bldFile="/sf/app/messaging/mobilemessaging/audiomsg/group"/>
+          </component>
+          <component name="msgmedia" filter="s60" long-name="Message Media">
+            <unit bldFile="/sf/app/messaging/mobilemessaging/msgmedia/group"/>
+          </component>
+          <component name="unieditor" filter="s60" long-name="Unified Editor">
+            <unit bldFile="/sf/app/messaging/mobilemessaging/unieditor/group"/>
+          </component>
+          <component name="mmsui" filter="s60" long-name="MMS UI">
+            <unit bldFile="/sf/app/messaging/mobilemessaging/mmsui/group"/>
+          </component>
+          <component name="postcard" filter="s60" long-name="Postcard">
+            <unit bldFile="/sf/app/messaging/mobilemessaging/postcard/group"/>
+          </component>
+          <component name="smilui" filter="s60" long-name="SMIL UI">
+            <unit bldFile="/sf/app/messaging/mobilemessaging/smilui/group"/>
+          </component>
+          <component name="smum" filter="s60" long-name="SMS UI MTM and UI Data MTM" plugin="Y">
+            <unit bldFile="/sf/app/messaging/mobilemessaging/smum/group"/>
+          </component>
+          <component name="smsui" filter="s60" long-name="SMS UI">
+            <unit bldFile="/sf/app/messaging/mobilemessaging/smsui/group"/>
+          </component>
+          <component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/app/messaging/mobilemessaging/smsmtm/group" mrp="/sf/app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
+          </component>
+        </collection>
+        <collection name="mmsengine" long-name="MMS Engine" level="eng">
+          <component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
+            <!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
+          </component>
+          <component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
+            <!-- <unit bldFile="mmsengine/genutils/bld"/> -->
+          </component>
+          <component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
+            <!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
+          </component>
+          <component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
+            <!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
+          </component>
+          <component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
+            <!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
+          </component>
+          <component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
+            <!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
+          </component>
+          <component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
+            <!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
+          </component>
+          <component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
+            <!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
+          </component>
+          <component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
+            <!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
+          </component>
+          <component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
+            <!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
+          </component>
+          <component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
+            <!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
+          </component>
+          <component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
+            <!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
+          </component>
+          <component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
+            <unit bldFile="/sf/app/messaging/mmsengine/mmssettings/group" mrp="/sf/app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
+          </component>
+          <component name="mmsconf" long-name="MMS Configuration" purpose="optional">
+            <unit bldFile="/sf/app/messaging/mmsengine/mmsconf" mrp="/sf/app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
+          </component>
+          <component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
+            <!-- this bld.inf should be broken up into the individual other components -->
+            <unit bldFile="/sf/app/messaging/mmsengine/group"/>
+          </component>
+        </collection>
+        <collection name="messagingappbase" long-name="Messaging App Base" level="base">
+          <component name="msgavkon" filter="s60" long-name="Messaging Avkon UI">
+            <unit bldFile="/sf/app/messaging/messagingappbase/msgavkon/group"/>
+          </component>
+          <component name="mce" filter="s60" long-name="Message Center Application">
+            <unit bldFile="/sf/app/messaging/messagingappbase/mce/group"/>
+          </component>
+          <component name="mceextraitems" filter="s60" long-name="Message Center Extra Items">
+            <unit bldFile="/sf/app/messaging/messagingappbase/mceextraitems/group"/>
+          </component>
+          <component name="mcesettings" filter="s60" long-name="Message Center Settings">
+            <unit bldFile="/sf/app/messaging/messagingappbase/mcesettings/group"/>
+          </component>
+          <component name="msgerrorwatcher" filter="s60" long-name="Messaging Error Watcher" plugin="Y">
+            <unit bldFile="/sf/app/messaging/messagingappbase/msgerrorwatcher/group"/>
+          </component>
+          <component name="ncnlist" filter="s60" long-name="New Contacts Note List">
+            <unit bldFile="/sf/app/messaging/messagingappbase/ncnlist/group"/>
+          </component>
+          <component name="schemeplugin" filter="s60" long-name="Scheme Handler Plugin" plugin="Y">
+            <unit bldFile="/sf/app/messaging/messagingappbase/schemeplugin/group"/>
+          </component>
+          <component name="sendui" filter="s60" long-name="Send UI" plugin="Y">
+            <unit bldFile="/sf/app/messaging/messagingappbase/sendui/group"/>
+          </component>
+          <component name="smilengine" filter="s60" long-name="SMIL Engine">
+            <unit bldFile="/sf/app/messaging/messagingappbase/smilengine/group"/>
+          </component>
+          <component name="bium" filter="s60" long-name="BIO UI MTM" plugin="Y">
+            <unit bldFile="/sf/app/messaging/messagingappbase/bium/group"/>
+          </component>
+          <component name="smartmessaging" filter="s60" long-name="Smart Messaging">
+            <unit bldFile="/sf/app/messaging/messagingappbase/smartmessaging/group"/>
+          </component>
+          <component name="msgeditor" filter="s60" long-name="Messaging Editor">
+            <unit bldFile="/sf/app/messaging/messagingappbase/msgeditor/group"/>
+          </component>
+          <component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
+            <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/GROUP" mrp="/sf/app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
+          </component>
+          <component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/Group" mrp="/sf/app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
+          </component>
+        </collection>
+        <collection name="email" long-name="Email" level="mail">
+          <!-- use commonemail instead -->
+          <component name="alwaysonlineemailplugin" filter="s60" long-name="Always Online Mail Plugin" deprecated="^3" plugin="Y">
+            <unit bldFile="/sf/app/messaging/email/alwaysonlineemailplugin/group"/>
+          </component>
+          <component name="emailnotificationhandler" filter="s60" long-name="Email Notification Handler" deprecated="^3" plugin="Y">
+            <unit bldFile="/sf/app/messaging/email/emailnotificationhandler/group"/>
+          </component>
+          <component name="imum" filter="s60" long-name="Internet Mail UI MTM" deprecated="^3" plugin="Y">
+            <unit bldFile="/sf/app/messaging/email/imum/group"/>
+          </component>
+          <component name="mail" filter="s60" long-name="Mail Application" deprecated="^3">
+            <unit bldFile="/sf/app/messaging/email/mail/group"/>
+          </component>
+          <component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
+            <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/group" mrp="/sf/app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
+          </component>
+          <component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
+            <unit bldFile="/sf/app/messaging/email/imap4mtm/group" mrp="/sf/app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
+          </component>
+        </collection>
+        <collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
+          <component name="msg_plat" long-name="Messaging Apps Platform APIs" filter="s60" class="api">
+            <unit bldFile="/sf/app/messaging/msg_plat/group"/>
+          </component>
+          <component name="msg_pub" long-name="Messaging Apps Public APIs" filter="s60" class="api">
+            <unit bldFile="/sf/app/messaging/msg_pub/group"/>
+          </component>
+          <component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
+            <unit mrp="/sf/app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>