--- a/symbian3/mw/serviceapifw/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/symbian3/mw/serviceapifw/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,35 +54,57 @@
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-    <collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-     <component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-      <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-     </component>
-     <component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-      <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-     </component>
-     <component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-      <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-     </component>
-     <component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-      <!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-      <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/group"/>
-     </component>
-    </collection>
-    <collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-     <component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-      <unit bldFile="/sf/mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-     </component>
-    </collection>
-    <collection name="serviceapifw_info" long-name="Service API Framework Info" level="specific">
-     <component name="serviceapifw_plat" filter="s60" long-name="Service API Framework Platform Interfaces" class="api">
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/group"/>
-     </component>
-     <component name="serviceapifw_pub" filter="s60" long-name="Service API Framework Public Interfaces" class="api">
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_pub/group"/>
-     </component>
-    </collection>
-   </block>
+<collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
+<collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
+<component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
+<unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+</component>
+<component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
+<unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
+</component>
+<component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
+<unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
+</component>
+<component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
+<unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
+</component>
+<component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
+<unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
+</component>
+<component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
+<unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
+</component>
+<component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
+<unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
+</component>
+<component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
+<unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
+</component>
+<component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
+<unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
+</component>
+</collection>
+<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
+<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
+<unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
+</component>
+<component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
+<unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
+</component>
+<component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
+<unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
+</component>
+<component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
+<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
+<unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/group"/>
+</component>
+</collection>
+<collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
+<component name="lifwservicehandler" filter="s60" long-name="Service Handler">
+<unit bldFile="/sf/mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file