--- a/3k/mw/serviceapifw/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/mw/serviceapifw/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,63 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="serviceapifw" long-name="Service API Framework" tech_domain="rt" level="specific" levels="plugin framework server generic specific">
     <collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-     <component name="servicehandler" long-name="Service Handler" origin-model="Foundation">
+     <component name="lifwservicehandler" long-name="Service Handler" origin-model="foundation">
       <unit bldFile="/sf/mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
      </component>
     </collection>
     <collection name="rtsecuritymanager" long-name="RT Security Manager" level="server">
-     <component name="rtsecuritymanagerutil" long-name="RT Security Manager Util" origin-model="Foundation">
+     <component name="rtsecuritymanagerutil" long-name="RT Security Manager Util" origin-model="foundation">
       <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
      </component>
-     <component name="rtsecuritymanagerserver" long-name="RT Security Managers Erver" origin-model="Foundation">
+     <component name="rtsecuritymanagerserver" long-name="RT Security Managers Erver" origin-model="foundation">
       <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
      </component>
-     <component name="rtsecuritymanagerclient" long-name="RT Security Manager Client" origin-model="Foundation">
+     <component name="rtsecuritymanagerclient" long-name="RT Security Manager Client" origin-model="foundation">
       <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
      </component>
-     <component unofficial="yes" name="rtsecuritymanager_build" long-name="RT Security Manager Build" origin-model="Foundation">
+     <component unofficial="yes" name="rtsecuritymanager_build" long-name="RT Security Manager Build" origin-model="foundation">
       <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/group"/>
      </component>
     </collection>
-    <collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-     <component unofficial="yes" name="liw_criteria_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
+    <collection name="serviceapifw_info" long-name="Service API Framework Info" level="specific">
+     <component unofficial="yes" name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_pub/group"/>
      </component>
-     <component unofficial="yes" name="liw_generic_parameter_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-     </component>
-     <component unofficial="yes" name="liw_service_handler_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="rtsecuritymanager_common_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+     <component unofficial="yes" name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/group"/>
+      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_criteria_api/tsrc/group"/>
+      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/group"/>
       <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="liw_service_interface_base_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="rtsecuritymanager_client_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="liw_provider_utility_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="rtsecuritymanager_utility_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
       <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="liw_service_interface_menu_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-     </component>
-    </collection>
-    <collection name="serviceapifw_info" long-name="Service API Framework Info" level="specific">
-     <component unofficial="yes" name="serviceapifw_test" long-name="Service API Framework Test" origin-model="Foundation">
-      <!-- <unit bldFile="mw/serviceapifw/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="serviceapifw_build" long-name="Service API Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="serviceapifw_build" long-name="Service API Framework Build" origin-model="foundation">
       <unit bldFile="/sf/mw/serviceapifw/group"/>
      </component>
     </collection>