--- a/symbian4/app/contentcontrol/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/contentcontrol/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,114 +1,37 @@
 <?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^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
-        <collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-          <component name="ds_contactsdatastoreextension_api" long-name="DS Contacts Data Store Extension API" filter="s60" introduced="^4" class="api">
-            <unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
-          </component>
-          <component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" introduced="^3" class="api">
-            <unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
-          </component>
-        </collection>
-        <collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-          <component name="secon" filter="s60" long-name="Service Controllers">
-            <unit bldFile="/sf/app/contentcontrol/connectivitymodules/secon/group"/>
-          </component>
-        </collection>
-        <collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-          <!-- Component at wrong rank, should move down a directory -->
-          <component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-            <unit bldFile="/sf/app/contentcontrol/dsdcmoadapter/group"/>
-          </component>
-        </collection>
-        <collection name="omads" long-name="OMA Data Sync" level="app">
-          <component name="omads_build" filter="s60" long-name="OMA DS Build">
-            <unit bldFile="/sf/app/contentcontrol/omads/group"/>
-            <!-- need to remove #include and rename and OMA DS ROM -->
-          </component>
-          <component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-            <unit bldFile="/sf/app/contentcontrol/omads/omadsextensions/group"/>
-          </component>
-          <component name="omadsextensions_qt" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-            <unit bldFile="/sf/app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="contentcontrol" name="Content Control Daemons" levels="plugin framework app">
+  <collection id="contentctrl_plat" name="Content Control Daemons Platforn Interfaces" level="app">
+   <component id="ds_contactsdatastoreextension_api" name="DS Contacts Data Store Extension API" class="api" filter="s60" introduced="^4">
+    <meta rel="Api" href="contentctrl_plat/ds_contactsdatastoreextension_api/ds_contactsdatastoreextension_api.metaxml"/>
+    <unit bldFile="contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
+   </component>
+   <component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60" introduced="^3">
+    <meta rel="Api" href="contentctrl_plat/ds_data_modification_api/ds_data_modification_api.metaxml"/>
+    <unit bldFile="contentctrl_plat/ds_data_modification_api/group"/>
+   </component>
+  </collection>
+  <collection id="connectivitymodules" name="Connectivity Modules" level="framework">
+   <component id="secon" filter="s60" name="Service Controllers">
+    <unit bldFile="connectivitymodules/secon/group"/>
+   </component>
+  </collection>
+  <collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
+   <!-- Component at wrong rank, should move down a directory -->
+   <component id="dsdcmoadapter_build" filter="s60" name="Data Sync Control DCMO Adapter">
+    <unit bldFile="dsdcmoadapter/group"/>
+   </component>
+  </collection>
+  <collection id="omads" name="OMA Data Sync" level="app">
+   <component id="omads_build" filter="s60" name="OMA DS Build">
+    <unit bldFile="omads/group"/> <!-- need to remove #include and rename and OMA DS ROM -->
+   </component>
+   <component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
+    <unit bldFile="omads/omadsextensions/group"/>
+   </component>
+   <component id="omadsextensions_qt" filter="s60" name="OMA DS Qt Extensions" class="plugin">
+    <unit bldFile="omads/omadsextensions" qt:proFile="omadsextensions.pro"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>