--- a/tip_pbc/mw/ipappsrv/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/tip_pbc/mw/ipappsrv/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,64 +50,64 @@
   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="mw" long-name="Middleware" levels="generic specific">
-   <block name="ipappsrv" level="specific" levels="framework generic server conn plugin" long-name="IP App Services">
+   <block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
 <collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-<component name="transcoder_api" long-name="Transcoder API" filter="s60" purpose="optional" class="api">
+<component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
 </component>
-<component name="comms_event_api" long-name="Comms Event API" filter="s60" purpose="optional" class="api">
+<component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
 </component>
-<component name="floor_control_api" long-name="Floor Control API" filter="s60" purpose="optional" class="api">
+<component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
 </component>
-<component name="media_control_api" long-name="Media Control API" filter="s60" purpose="optional" class="api">
+<component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
 </component>
-<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" purpose="optional" class="api">
+<component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
 </component>
-<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" purpose="optional" class="api">
+<component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
 </component>
 </collection>
 <collection name="natfw" long-name="NAT Framework" level="framework">
 <!-- collection is really a component. Need to move down a directory -->
-<component name="natfw_build" long-name="NAT Framework Build" introduced="^2" filter="s60" purpose="optional">
+<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
 <unit bldFile="/sf/mw/ipappsrv/natfw/group"/>
 </component>
 </collection>
 <collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
 <!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommscontroller_build" long-name="Multimedia Comms Controller Build" filter="s60" purpose="optional">
+<component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
 <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/group"/>
 </component>
 </collection>
 <collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
 <!-- collection is really a component. Need to move down a directory -->
-<component name="multimediacommsengine_build" long-name="Multimedia Comms Engine Build" filter="s60" purpose="optional">
+<component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
 <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/group"/>
 </component>
 </collection>
 <collection name="natplugins" long-name="NAT Plugins" level="plugin">
-<component name="natpcliprovisioningnatfwadapter" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" filter="s60" purpose="optional" plugin="Y">
+<component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
 <unit bldFile="/sf/mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
 </component>
-<component name="natpdevmgmtnatfwadapter" long-name="Device Management NAT Framework Traversal Adapter" filter="s60" purpose="optional" plugin="Y">
+<component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
 <unit bldFile="/sf/mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
 </component>
-<component name="natptraversalcontroller" long-name="NAT Traversal Controller" filter="s60" purpose="optional" plugin="Y">
+<component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
 <unit bldFile="/sf/mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
 </component>
-<component name="natpnatfwsdpprovider" long-name="NAT Framework SDP Provider" filter="s60" purpose="optional" plugin="Y">
+<component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
 <unit bldFile="/sf/mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
 </component>
 </collection>
 <collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60" purpose="optional">
+<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
 <!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
 <unit mrp="/sf/mw/ipappsrv/group"/>
 </component>