--- a/tip_pbc/app/contentcontrol/package_definition.xml	Thu Aug 19 18:51:41 2010 +0100
+++ b/tip_pbc/app/contentcontrol/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
@@ -50,38 +50,38 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="contentcontrol" level="services" levels="plugin framework app" long-name="Content Control Daemons">
+   <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" introduced="^4" filter="s60" purpose="optional" class="api">
+<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" introduced="^3" filter="s60" purpose="optional" class="api">
+<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" long-name="Service Controllers" filter="s60" purpose="optional">
+<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" long-name="Data Sync Control DCMO Adapter" filter="s60" purpose="optional">
+<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" long-name="OMA DS Build" filter="s60" purpose="optional">
+<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" long-name="OMA DS Extensions" filter="s60" purpose="optional" plugin="Y">
+<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" long-name="OMA DS Qt Extensions" filter="s60" purpose="optional" plugin="Y">
+<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>