--- a/symbian3/mw/srvdiscovery/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/symbian3/mw/srvdiscovery/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,25 +54,42 @@
 <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">
-    <collection name="servicediscoveryandcontrol" long-name="Service Discovery and Control" level="framework">
-     <component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="^3" 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_plat" long-name="UPnP Stack Platform Interfaces" introduced="^3" purpose="optional" class="api">
-      <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/group"/>
-     </component>
-     <component name="upnpstack" long-name="UPnP Stack" introduced="^3" purpose="optional">
-      <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack/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" class="config PC">
-      <unit mrp="/sf/mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
+<collection name="upnpstack_plat" long-name="UPnP Stack Platform Interfaces" level="specific">
+<component name="upnpstack_plat" long-name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_device_api/group"/>
+</component>
+<component name="upnpstack_plat" long-name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_common_api/group"/>
+</component>
+<component name="upnpstack_plat" long-name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_utils_api/group"/>
+</component>
+<component name="upnpstack_plat" long-name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_control_point_api/group"/>
+</component>
+<component name="upnpstack_plat" long-name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+<unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_httpserver_api/group"/>
+</component>
+<component name="upnpstack_plat" long-name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" 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">
+<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">
+<unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack/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" class="config PC">
+<unit mrp="/sf/mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file