--- a/CompilerCompatibility/mw/mmuifw/package_definition.xml	Mon Mar 15 18:47:03 2010 +0000
+++ b/CompilerCompatibility/mw/mmuifw/package_definition.xml	Tue Mar 16 16:25:56 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,75 @@
   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="mmuifw">
-<collection name="s60">
-<component name="mmuifw">
-<unit bldFile="/sf/mw/mmuifw/group" mrp=""/>
-</component>
-</collection>
-</block>
+<layer name="mw" long-name="Middleware" levels="generic specific">
+<block name="mmuifw" level="specific" long-name="Multimedia UI Framework" levels="mgr mdl util ui">
+    <collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="ui">
+     <component name="mmuifw_plat" filter="s60" long-name="Multimedia UI Framework Platform Interfaces" class="api">
+      <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/group"/>
+     </component>
+     <component name="mmuifw_build" filter="s60" long-name="Multimedia UI Framework Build">
+      <!-- Move exports into other componetns or remove all #includes and make this a ROM component -->
+      <unit bldFile="/sf/mw/mmuifw/group"/>
+     </component>
+    </collection>
+    <collection name="osncore" long-name="OS Neutral Library Core" level="util">
+     <!-- collection is really a component. Move down a directory -->
+     <component name="osncore_build" filter="s60" long-name="OSN Core Build">
+      <unit bldFile="/sf/mw/mmuifw/osncore/group"/>
+     </component>
+    </collection>
+    <collection name="alfwidgetutils" long-name="Accelerated LAF Widget Utils" level="ui">
+     <!-- collection is really a component. Move down a directory -->
+     <component name="alfwidgetutils_build" filter="s60" long-name="ALF Widget Utils">
+      <unit bldFile="/sf/mw/mmuifw/alfwidgetutils/group"/>
+     </component>
+    </collection>
+    <collection name="resourcepool" long-name="Resource Pool" level="util">
+     <!-- collection is really a component. Move down a directory -->
+     <component name="alfresourcepool" filter="s60" long-name="ALF Resource Pool">
+      <unit bldFile="/sf/mw/mmuifw/resourcepool/group"/>
+     </component>
+    </collection>
+    <collection name="widgetmodel" long-name="Widget Model" level="mdl">
+     <!-- collection is really a component. Move down a directory -->
+     <component name="widgetmodel_build" filter="s60" long-name="Widget Model Build">
+      <unit bldFile="/sf/mw/mmuifw/widgetmodel/group"/>
+     </component>
+    </collection>
+    <collection name="mulwidgets" long-name="MUL Widgets" level="ui">
+     <!-- should spell out MUL in the collection name -->
+     <component name="mullogging" filter="s60" long-name="MUL Logging">
+      <unit bldFile="/sf/mw/mmuifw/mulwidgets/mullogging/group"/>
+     </component>
+     <component name="muldatamodel" filter="s60" long-name="MUL Data Model">
+      <unit bldFile="/sf/mw/mmuifw/mulwidgets/muldatamodel/group"/>
+     </component>
+     <component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
+      <unit bldFile="/sf/mw/mmuifw/mulwidgets/common/group"/>
+     </component>
+     <component name="gesturehelper" filter="s60" long-name="Gesture Helper">
+      <unit bldFile="/sf/mw/mmuifw/mulwidgets/gesturehelper/group"/>
+     </component>
+     <component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
+      <unit bldFile="/sf/mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
+     </component>
+     <component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
+      <unit bldFile="/sf/mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
+     </component>
+     <component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
+      <unit bldFile="/sf/mw/mmuifw/mulwidgets/alfviewwidget/group"/>
+     </component>
+     <component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
+      <unit bldFile="/sf/mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
+     </component>
+     <component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
+      <unit bldFile="/sf/mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
+     </component>
+    </collection>
+   </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file