--- a/symbian3/app/phone/package_definition.xml	Wed Jan 27 15:59:56 2010 +0000
+++ b/symbian3/app/phone/package_definition.xml	Thu Jan 28 14:49:47 2010 +0000
@@ -1,109 +1,182 @@
 <?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="phone" level="apps" span="2" long-name="Phone Apps">
-<collection name="s60">
-<component name="phone">
-<unit bldFile="/sf/app/phone/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="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
+        <collection name="phoneapp" long-name="Phone Application" level="app">
+          <component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
+            <unit bldFile="/sf/app/phone/phoneapp/blacklist/group"/>
+          </component>
+          <component name="phoneui" filter="s60" long-name="Phone UI">
+            <unit bldFile="/sf/app/phone/phoneapp/phoneui/group"/>
+          </component>
+          <component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
+            <unit bldFile="/sf/app/phone/phoneapp/phoneuicontrol/group"/>
+          </component>
+          <component name="phoneuistates" filter="s60" long-name="Phone UI States">
+            <unit bldFile="/sf/app/phone/phoneapp/phoneuistates/group"/>
+          </component>
+          <component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
+            <unit bldFile="/sf/app/phone/phoneapp/phoneuiutils/group"/>
+          </component>
+          <component name="phoneuiview" filter="s60" long-name="Phone UI View">
+            <unit bldFile="/sf/app/phone/phoneapp/phoneuiview/group"/>
+          </component>
+          <component name="phoneuivoipextension" filter="s60" long-name="Phone UI VOIP Extension">
+            <unit bldFile="/sf/app/phone/phoneapp/phoneuivoipextension/group"/>
+          </component>
+          <component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
+            <unit bldFile="/sf/app/phone/phoneapp/silenceactionplugin/group"/>
+          </component>
+          <component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
+            <unit bldFile="/sf/app/phone/phoneapp/phonemediatorcenter/group"/>
+          </component>
+          <component name="phoneapp_api_test" filter="s60,api_test" long-name="Phone App API Tests">
+            <unit bldFile="/sf/app/phone/phoneapp/phoneui/tsrc/public/basic/group"/>
+          </component>
+        </collection>
+        <collection name="phoneengine" long-name="Phone Engine" level="engine">
+          <component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
+            <unit bldFile="/sf/app/phone/phoneengine/phonecntfinder/group"/>
+          </component>
+          <component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
+            <unit bldFile="/sf/app/phone/phoneengine/audiohandling/group"/>
+          </component>
+          <component name="callhandling" filter="s60" long-name="Call Handling">
+            <unit bldFile="/sf/app/phone/phoneengine/callhandling/group"/>
+          </component>
+          <component name="contacthandling" filter="s60" long-name="Phone Contact Handling">
+            <unit bldFile="/sf/app/phone/phoneengine/contacthandling/group"/>
+          </component>
+          <component name="loghandling" filter="s60" long-name="Phone Log Handling">
+            <unit bldFile="/sf/app/phone/phoneengine/loghandling/group"/>
+          </component>
+          <component name="engineinfo" filter="s60" long-name="Phone Engine Info">
+            <unit bldFile="/sf/app/phone/phoneengine/engineinfo/group"/>
+          </component>
+          <component name="phonemodel" filter="s60" long-name="Phone Model">
+            <unit bldFile="/sf/app/phone/phoneengine/phonemodel/group"/>
+          </component>
+          <component name="servicehandling" filter="s60" long-name="Phone Service Handling">
+            <unit bldFile="/sf/app/phone/phoneengine/servicehandling/group"/>
+          </component>
+        </collection>
+        <collection name="phonesettings" long-name="Phone Settings" level="plugin">
+          <component name="aiwcallimageplugin" filter="s60" long-name="Call Image AIW Plugin" plugin="Y">
+            <unit bldFile="/sf/app/phone/phonesettings/aiwcallimageplugin/group"/>
+          </component>
+          <component name="pslncallimageplugin" filter="s60" long-name="Call Image Personalization Plugin" plugin="Y">
+            <unit bldFile="/sf/app/phone/phonesettings/pslncallimageplugin/group"/>
+          </component>
+        </collection>
+        <collection name="phoneuis" long-name="Phone UIs" level="ui">
+          <component name="dialer" filter="s60" long-name="Dialer">
+            <unit bldFile="/sf/app/phone/phoneuis/dialer/group"/>
+          </component>
+          <component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
+            <unit bldFile="/sf/app/phone/phoneuis/bubblemanager/group"/>
+          </component>
+          <component name="connectutil" filter="s60" long-name="Connection Utility" plugin="Y">
+            <unit bldFile="/sf/app/phone/phoneuis/connectutil/group"/>
+          </component>
+          <component name="ussd" filter="s60" long-name="Unstructured Supplementary Services Data">
+            <unit bldFile="/sf/app/phone/phoneuis/ussd/group"/>
+          </component>
+          <component name="vmbx" filter="s60" long-name="Voice Mailbox">
+            <unit bldFile="/sf/app/phone/phoneuis/vmbx/group"/>
+          </component>
+          <component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
+            <unit bldFile="/sf/app/phone/phoneuis/telephonydevicemode/group"/>
+          </component>
+          <component name="phoneuis_api_test" filter="s60,api_test" long-name="Phone UIs API Tests">
+            <unit bldFile="/sf/app/phone/phoneuis/dialer/tsrc/public/basic/group"/>
+          </component>
+        </collection>
+        <collection name="phone_info" long-name="Phone Apps Info" level="app">
+          <component name="phone_plat" filter="s60" long-name="Phone Apps Platform Interfaces" class="api">
+            <unit bldFile="/sf/app/phone/phone_plat/group"/>
+          </component>
+        </collection>
+        <collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
+          <component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/phone/phoneplugins/telbranding/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>