diff -r e9ebcfcb4702 -r 30e67220bf86 symbian3/mw/camerasrv/package_definition.xml
--- a/symbian3/mw/camerasrv/package_definition.xml	Tue May 25 11:17:36 2010 +0100
+++ b/symbian3/mw/camerasrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
@@ -1,147 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!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="mw" long-name="Middleware" levels="generic specific">
-      <block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-        <collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-          <component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-          </component>
-          <component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-          </component>
-          <component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-          </component>
-          <component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-          </component>
-          <component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group" filter="test,api_test"/>
-          </component>
-        </collection>
-        <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_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 schema="3.0.0">
+ <package id="camerasrv" name="Camera Services" levels="plugin fw api">
+  <collection id="camerasrv_plat" name="Camera Services Platform Interfaces" level="api">
+   <component id="media_recorder_sink_api" name="Media Recorder Sink API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/media_recorder_sink_api/media_recorder_sink_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/media_recorder_sink_api/group"/>
+   </component>
+   <component id="cae_extentension_api" name="CAE Extension API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/cae_extentension_api/cae_extentension_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/cae_extentension_api/group"/>
+   </component>
+   <component id="camera_application_engine_api" name="Camera Application Engine API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/camera_application_engine_api/camera_application_engine_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
+    <unit bldFile="camerasrv_plat/camera_application_engine_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="custom_onboard_camera_api" name="Custom Onboard Camera API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/custom_onboard_camera_api/custom_onboard_camera_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/custom_onboard_camera_api/group"/>
+   </component>
+   <component id="imaging_configuration_manager_api" name="Imaging Configuration Manager API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/imaging_configuration_manager_api/imaging_configuration_manager_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+    <unit bldFile="camerasrv_plat/imaging_configuration_manager_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="media_recorder_api" name="Media Recorder API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/media_recorder_api/media_recorder_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/media_recorder_api/group" filter="!test"/>
+    <unit bldFile="camerasrv_plat/media_recorder_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="3gp_file_composer_api" name="3GP File Composer API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/3gp_file_composer_api/3gp_file_composer_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/3gp_file_composer_api/group"/>
+   </component>
+   <component id="asynchronous_file_saving_queue_api" name="Asynchronous File Saving Queue API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/asynchronous_file_saving_queue_api/asynchronous_file_saving_queue_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
+    <unit bldFile="camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group" filter="test,api_test"/>
+   </component>
+  </collection>
+  <collection id="camappengine" name="Camera App Engine" level="fw">
+   <!-- is this collection really a component? If so, move down a directory -->
+   <component id="stillconverter" filter="s60" name="Still Image Converter">
+    <!-- should separate this from parent engine's bld.inf  -->
+    <!-- <unit bldFile="camappengine/stillconverter/group"/> -->
+   </component>
+   <component id="camappengine_engine" filter="s60" name="Camera App Engine">
+    <!-- should separate this from parent engine's bld.inf  -->
+    <!-- <unit bldFile="camappengine/engine/group"/> -->
+   </component>
+   <component id="asynchfilesavequeue" filter="s60" name="Asynch File Save Queue">
+    <unit bldFile="camappengine/asynchfilesavequeue/group"/>
+   </component>
+   <component id="camappengine_build" filter="s60" name="Camera App Engine Build">
+    <unit bldFile="camappengine/build"/>
+   </component>
+  </collection>
+  <collection id="camcordermmfplugin" name="Camcorder MMF Plugin" level="plugin">
+   <!-- collection is really a component. Should move down a directory -->
+   <component id="camcordermmfplugin_build" filter="s60" name="Camcorder MMF Plugin Build" class="plugin">
+    <unit bldFile="camcordermmfplugin/build"/>
+   </component>
+  </collection>
+  <collection id="configmanagers" name="Config Managers" level="api">
+   <component id="imagingconfigmanager" filter="s60" name="Imaging Config Manager">
+    <unit bldFile="configmanagers/imagingconfigmanager/group"/>
+   </component>
+  </collection>
+  <collection id="camerasrv_info" name="Camera Services Info" level="api">
+   <component id="camerasrv_build" filter="s60" name="Camera Services Build">
+    <!-- should split into individual bld.infs -->
+    <unit bldFile="group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>