--- a/symbian3/app/conversations/package_definition.xml	Wed Dec 02 18:06:06 2009 +0000
+++ b/symbian3/app/conversations/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
@@ -1,85 +1,103 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
+<!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="conversations" long-name="Conversation Apps" tech_domain="pr" level="apps" levels="settings utils ui">
-    <collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-     <component name="vimpstsettings" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetabsettings/group"/>
-     </component>
-    </collection>
-    <collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-     <component name="imstutils_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/imstutils/help/group"/>
-     </component>
-     <component name="imconnectionprovider" long-name="IM Connection Provider" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/imstutils/imconnectionprovider/group"/>
-      <!-- <unit bldFile="/sf/app/conversations/imstutils/imconnectionprovider/tsrc/imconnectionprovider_test/group"/> -->
-     </component>
-     <component name="xmppadapter" long-name="XMPP Adapter" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/imstutils/xmppadapter/group"/>
-      <!-- <unit bldFile="/sf/app/conversations/imstutils/xmppadapter/tsrc/xmppadapter_test/group"/> -->
-     </component>
-     <component name="imconversationview" long-name="IM Conversation View" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/imstutils/imconversationview/group"/>
-      <!-- <unit bldFile="/sf/app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/dummytestadaptation/group"/> -->
-      <!-- <unit bldFile="/sf/app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/group"/> -->
-     </component>
-     <component unofficial="yes" name="imstutils_build" long-name="IM Service Tab Utils Build" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/imstutils/group"/>
-     </component>
-    </collection>
-    <collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-     <component name="vimpstutils" long-name="VIMP ST Utilities" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetab/vimpstutils/group"/>
-     </component>
-     <component name="vimpststorage" long-name="VIMP ST Storage" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetab/vimpststorage/group"/>
-      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactlist_ut/group"/> -->
-      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactsorter_ut/group"/> -->
-      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontact_ut/group"/> -->
-     </component>
-     <component name="vimpstengine" long-name="VIMP ST Engine" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetab/vimpstengine/group"/>
-      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpstengine/tsrc/group"/> -->
-     </component>
-     <component name="vimpstcmdprocess" long-name="VIMP ST Command Process" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpstcmdprocess/tsrc/group"/> -->
-     </component>
-     <component name="vimpstui" long-name="VIMP ST UI" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetab/vimpstui/group"/>
-     </component>
-     <component name="vimpstdetailsviewplugin" long-name="VIMP ST Details View Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-     </component>
-     <component unofficial="yes" name="uiservicetab_build" long-name="UI Service Tab Build" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetab/group"/>
-     </component>
-    </collection>
-    <collection name="servicewidget" long-name="Service Widget" level="ui">
-     <component name="servicewidgetactionhandler" long-name="Service Widget Action Handler" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/servicewidget/servicewidgetactionhandler/group"/>
-     </component>
-     <component name="servicewidgetdatapublisher" long-name="Service Widget Data Publisher" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-     </component>
-     <component name="themes" long-name="Themes" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/servicewidget/themes/install-themes/install/servicewidget/group"/>
-     </component>
-     <component unofficial="yes" name="servicewidget_build" long-name="Service Widget Build" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/servicewidget/group"/>
-     </component>
-    </collection>
-    <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-     <component unofficial="yes" name="conversations_plat" long-name="Conversation Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/conversations_plat/group"/>
-     </component>
-     <component unofficial="yes" name="conversations_build" long-name="Conversation Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/group"/>
-     </component>
-    </collection>
-   </block>
+<block name="conversations" level="apps" long-name="Conversation Apps"/>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file