--- a/symbian3/mw/imsrv/package_definition.xml	Mon Mar 15 18:29:08 2010 +0000
+++ b/symbian3/mw/imsrv/package_definition.xml	Mon Mar 15 18:47:03 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ELEMENT SystemDefinition (systemModel)>
  <!ATTLIST SystemDefinition
   name CDATA #REQUIRED
   schema CDATA #REQUIRED>
@@ -49,61 +49,49 @@
   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">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
 <systemModel>
-<layer name="mw">
-<block name="imsrv">
-<collection name="s60">
-<component name="imsrv">
-<unit bldFile="/sf/mw/imsrv/group" mrp=""/>
-</component>
-</collection>
-</block>
+<layer name="mw" long-name="Middleware" levels="generic specific">
+<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
+    <collection name="ximpfw" long-name="XIMP Framework" level="framework">
+     <!-- collection is really a component. Needs to be moved down a directory -->
+     <component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
+      <unit bldFile="/sf/mw/imsrv/ximpfw/group"/>
+     </component>
+    </collection>
+    <collection name="imservices" long-name="IM Services" level="generic">
+     <component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
+      <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/group"/>
+     </component>
+     <component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
+      <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/group"/>
+     </component>
+     <component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
+      <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsapi/group"/>
+     </component>
+     <component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
+      <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
+     </component>
+     <component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
+      <unit bldFile="/sf/mw/imsrv/imservices/ossprotocoladaptation/group"/>
+     </component>
+     <component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
+      <unit bldFile="/sf/mw/imsrv/imservices/instantmessagingcache/group"/>
+     </component>
+    </collection>
+    <collection name="brandingserver" long-name="Branding Server" level="specific">
+     <!-- collection is really a component. Needs to be moved down a directory -->
+     <component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
+      <unit bldFile="/sf/mw/imsrv/brandingserver/group"/>
+     </component>
+    </collection>
+    <collection name="imsrv_info" long-name="Instant Messaging and Presence Services Info" level="specific">
+     <component name="imsrv_plat" filter="s60" long-name="Instant Messaging and Presence Services Platform Interfaces" class="api">
+      <unit bldFile="/sf/mw/imsrv/imsrv_plat/group"/>
+     </component>
+    </collection>
+   </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file