--- a/tip_pbc/mw/legacypresence/package_definition.xml	Thu Sep 09 10:32:56 2010 +0100
+++ b/tip_pbc/mw/legacypresence/package_definition.xml	Thu Sep 09 14:03:04 2010 +0100
@@ -50,60 +50,60 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
+   <block name="legacypresence" level="specific" levels="engine fw ui" long-name="Legacy Presence Services">
 <collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-<component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
+<component name="presence_list_api" long-name="Presence List API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/presence_list_api/group"/>
 </component>
-<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
+<component name="watcher_info_api" long-name="Watcher Info API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
 </component>
-<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
+<component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
 </component>
-<component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
+<component name="authorization_api" long-name="Authorization API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/authorization_api/group"/>
 </component>
-<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
+<component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
 </component>
-<component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
+<component name="watcher_api" long-name="Watcher API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/watcher_api/group"/>
 </component>
-<component name="xdm_api" long-name="XDM API" filter="s60" class="api">
+<component name="xdm_api" long-name="XDM API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/xdm_api/group"/>
 </component>
-<component name="registration_api" long-name="Registration API" filter="s60" class="api">
+<component name="registration_api" long-name="Registration API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/registration_api/group"/>
 </component>
-<component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
+<component name="publisher_api" long-name="Publisher API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/publisher_api/group"/>
 </component>
-<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
+<component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
 </component>
-<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
+<component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
 </component>
-<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
+<component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
 </component>
-<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
+<component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
 </component>
 </collection>
 <collection name="xdmengine" long-name="XDM Engine" level="engine">
 <!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
+<component name="xdmengine_build" long-name="XDM Engine Build" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/legacypresence/xdmengine/group"/>
 </component>
 </collection>
 <collection name="simpleengine" long-name="SIMPLE Engine" level="engine">
 <!-- collection is really a component. Need to move down a directory-->
-<component name="simpleengine_build" filter="s60" long-name="SIMPLE Engine Build" class="placeholder">
+<component name="simpleengine_build" long-name="SIMPLE Engine Build" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="simpleengine/group"/> not built -->
 </component>
 </collection>