--- a/CompilerCompatibility/mw/camerasrv/package_definition.xml	Mon Mar 15 18:47:03 2010 +0000
+++ b/CompilerCompatibility/mw/camerasrv/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,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="camerasrv">
-<collection name="s60">
-<component name="camerasrv">
-<unit bldFile="/sf/mw/camerasrv/group" mrp=""/>
-</component>
-</collection>
-</block>
+<layer name="mw" long-name="Middleware" levels="generic specific">
+<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
+    <collection name="camappengine" long-name="Camera App Engine" level="fw">
+     <!-- is this collection really a component? If so, move down a directory -->
+     <component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
+      <!-- should separate this from parent engine's bld.inf  -->
+      <!-- <unit bldFile="camappengine/stillconverter/group"/> -->
+     </component>
+     <component name="camappengine_engine" filter="s60" long-name="Camera App Engine" class="placeholder">
+      <!-- should separate this from parent engine's bld.inf  -->
+      <!-- <unit bldFile="camappengine/engine/group"/> -->
+     </component>
+     <component name="asynchfilesavequeue" filter="s60" long-name="Asynch File Save Queue">
+      <unit bldFile="/sf/mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
+     </component>
+     <component name="camappengine_build" filter="s60" long-name="Camera App Engine Build">
+      <unit bldFile="/sf/mw/camerasrv/camappengine/build"/>
+     </component>
+    </collection>
+    <collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
+     <!-- collection is really a component. Should move down a directory -->
+     <component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
+      <unit bldFile="/sf/mw/camerasrv/camcordermmfplugin/build"/>
+     </component>
+    </collection>
+    <collection name="configmanagers" long-name="Config Managers" level="api">
+     <component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
+      <unit bldFile="/sf/mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
+     </component>
+    </collection>
+    <collection name="camerasrv_info" long-name="Camera Services Info" level="api">
+     <component name="camerasrv_plat" filter="s60" long-name="Camera Services Platform Interfaces" class="api">
+      <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/group"/>
+     </component>
+     <component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
+      <!-- should split into individual bld.infs -->
+      <unit bldFile="/sf/mw/camerasrv/group"/>
+     </component>
+    </collection>
+   </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file