--- a/symbian3/mw/videoutils/package_definition.xml	Tue May 25 11:17:36 2010 +0100
+++ b/symbian3/mw/videoutils/package_definition.xml	Wed May 26 17:18:20 2010 +0100
@@ -1,115 +1,40 @@
 <?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="videoutils" level="specific" long-name="Video Utils" levels="eng util if">
-        <collection name="videoutils_plat" long-name="Video Utils Platform Interfaces" level="if">
-          <component name="videoscheduler_api" long-name="Video Scheduler API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
-          </component>
-          <component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-          </component>
-          <component name="videoplayer_constants_api" long-name="Videoplayer Constants API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoplayer_constants_api/group"/>
-          </component>
-        </collection>
-        <collection name="videoscheduler" long-name="Video Scheduler" level="util">
-          <component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-            <unit bldFile="/sf/mw/videoutils/videoscheduler/schedulerclient/group"/>
-          </component>
-          <component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-            <unit bldFile="/sf/mw/videoutils/videoscheduler/schedulerserver/group"/>
-          </component>
-        </collection>
-        <collection name="videoconnutility" long-name="Video Connection Utility" level="util">
-          <component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
-            <unit bldFile="/sf/mw/videoutils/videoconnutility/connutilpsworker/group"/>
-          </component>
-          <component name="video_connutility" filter="s60" long-name="Video Connection Utility">
-            <unit bldFile="/sf/mw/videoutils/videoconnutility/connutility/group"/>
-          </component>
-        </collection>
-        <collection name="videoutils_info" long-name="Video Utils Info" level="if">
-          <component name="videoutils_test" filter="s60,test,api_test" long-name="Video Utils Tests">
-            <unit bldFile="/sf/mw/videoutils/tsrc/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="videoutils" name="Video Utils" levels="eng util if">
+  <collection id="videoutils_plat" name="Video Utils Platform Interfaces" level="if">
+   <component id="videoscheduler_api" name="Video Scheduler API" class="api" filter="s60">
+    <meta rel="Api" href="videoutils_plat/videoscheduler_api/videoscheduler_api.metaxml"/>
+    <unit bldFile="videoutils_plat/videoscheduler_api/group"/>
+   </component>
+   <component id="videoconnutility_api" name="Video Connection Utility API" class="api" filter="s60">
+    <meta rel="Api" href="videoutils_plat/videoconnutility_api/videoconnutility_api.metaxml"/>
+    <unit bldFile="videoutils_plat/videoconnutility_api/group"/>
+   </component>
+   <component id="videoplayer_constants_api" name="Videoplayer Constants API" class="api" filter="s60">
+    <meta rel="Api" href="videoutils_plat/videoplayer_constants_api/videoplayer_constants_api.metaxml"/>
+    <unit bldFile="videoutils_plat/videoplayer_constants_api/group"/>
+   </component>
+  </collection>
+  <collection id="videoscheduler" name="Video Scheduler" level="util">
+   <component id="schedulerclient" filter="s60" name="Video Scheduler Client">
+    <unit bldFile="videoscheduler/schedulerclient/group"/>
+   </component>
+   <component id="schedulerserver" filter="s60" name="Video Scheduler Server">
+    <unit bldFile="videoscheduler/schedulerserver/group"/>
+   </component>
+  </collection>
+  <collection id="videoconnutility" name="Video Connection Utility" level="util">
+   <component id="connutilpsworker" filter="s60" name="Connection Utility Publish and Subscribe Worker">
+    <unit bldFile="videoconnutility/connutilpsworker/group"/>
+   </component>
+   <component id="video_connutility" filter="s60" name="Video Connection Utility">
+    <unit bldFile="videoconnutility/connutility/group"/>
+   </component>
+  </collection>
+  <collection id="videoutils_info" name="Video Utils Info" level="if">
+   <component id="videoutils_test" filter="s60,test,api_test" name="Video Utils Tests">
+    <unit bldFile="tsrc/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>