diff -r 52097e3efe51 -r af9a3c6582bb symbian4/mw/srvdiscovery/package_definition.xml
--- a/symbian4/mw/srvdiscovery/package_definition.xml	Thu Sep 09 10:32:56 2010 +0100
+++ b/symbian4/mw/srvdiscovery/package_definition.xml	Thu Sep 09 14:03:04 2010 +0100
@@ -50,50 +50,50 @@
   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="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
+   <block name="srvdiscovery" level="generic" levels="plugin framework server generic specific" long-name="Service Discovery and Usage">
 <collection name="upnpstack_plat" long-name="UPnP Stack Platform Interfaces" level="specific">
-<component name="upnp_device_api" long-name="UPnP Device API" purpose="optional" introduced="^3" filter="s60" class="api">
+<component name="upnp_device_api" long-name="UPnP Device API" introduced="^3" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_device_api/group"/>
 </component>
-<component name="upnp_common_api" long-name="UPnP Common API" purpose="optional" introduced="^3" filter="s60" class="api">
+<component name="upnp_common_api" long-name="UPnP Common API" introduced="^3" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_common_api/group"/>
 </component>
-<component name="upnp_utils_api" long-name="UPnP Utils API" purpose="optional" introduced="^3" filter="s60" class="api">
+<component name="upnp_utils_api" long-name="UPnP Utils API" introduced="^3" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_utils_api/group"/>
 </component>
-<component name="upnp_control_point_api" long-name="UPnP Control Point API" purpose="optional" introduced="^3" filter="s60" class="api">
+<component name="upnp_control_point_api" long-name="UPnP Control Point API" introduced="^3" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_control_point_api/group"/>
 </component>
-<component name="upnp_httpserver_api" long-name="UPnP HTTP Server API" purpose="optional" introduced="^3" filter="s60" class="api">
+<component name="upnp_httpserver_api" long-name="UPnP HTTP Server API" introduced="^3" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_httpserver_api/group"/>
 </component>
-<component name="upnp_http_transfer_api" long-name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" filter="s60" class="api">
+<component name="upnp_http_transfer_api" long-name="UPnP HTTP Transfer API" introduced="^3" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
 </component>
 </collection>
 <collection name="servicediscoveryandcontrol" long-name="Service Discovery and Control" level="framework">
-<component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="^3" purpose="optional" filter="s60">
+<component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="^3" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="/sf/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
 </component>
 </collection>
 <collection name="upnp" long-name="UPnP" level="server">
-<component name="upnpstack" long-name="UPnP Stack" introduced="^3" purpose="optional" filter="s60">
+<component name="upnpstack" long-name="UPnP Stack" introduced="^3" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack/group"/>
 </component>
 </collection>
 <collection name="srvdiscovery_services" long-name="Service Discovery Services" level="server">
-<component name="terminalmodeservice_plat" long-name="Terminal Mode Service Platform Interfaces" introduced="^4" filter="s60" class="api">
+<component name="terminalmodeservice_plat" long-name="Terminal Mode Service Platform Interfaces" introduced="^4" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/srvdiscovery/services/terminalmodeservice_plat/group"/>
 </component>
-<component name="terminalmodeservice" long-name="Terminal Mode Service" introduced="^4" filter="s60">
+<component name="terminalmodeservice" long-name="Terminal Mode Service" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/srvdiscovery/services/terminalmodeservice/group"/>
 </component>
 </collection>
 <collection name="srvdiscovery_info" long-name="Service Discovery and Usage Info" level="specific">
-<component name="srvdiscovery_metadata" long-name="Service Discovery and Usage Metadata" introduced="^2" purpose="development" filter="s60" class="config PC">
+<component name="srvdiscovery_metadata" long-name="Service Discovery and Usage Metadata" introduced="^2" filter="s60" purpose="development" class="config PC">
 <unit mrp="/sf/mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
 </component>
 </collection>