diff -r 1553c141c99f -r 5dfc4b38cad0 3k/mw/phonesrv/package_definition.xml
--- a/3k/mw/phonesrv/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/mw/phonesrv/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,238 +1,131 @@
 <?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="phonesrv" long-name="Telephony and SIM Services" tech_domain="vc" level="specific" levels="plugin framework server generic specific">
     <collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-     <component name="phonecmdhnlr" long-name="Phone Command Handler" origin-model="Foundation">
+     <component name="phonecmdhnlr" long-name="Phone Command Handler" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
      </component>
     </collection>
     <collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-     <component name="CbsServer" long-name="CBS Server" origin-model="Foundation">
+     <component name="cbsserver" long-name="CBS Server" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/cbs/cbsserver/group"/>
      </component>
-     <component name="cbsui" long-name="CBS UI" origin-model="Foundation">
+     <component name="cbsui" long-name="CBS UI" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/cbs/cbsui/group"/>
      </component>
     </collection>
     <collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-     <component name="callprovider" long-name="Call Provider" origin-model="Foundation">
+     <component name="callprovider" long-name="Call Provider" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/convergedcallengine/callprovider/group"/>
      </component>
-     <component name="cce" long-name="CCE" origin-model="Foundation">
+     <component name="cce" long-name="CCE" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cce/group"/>
      </component>
-     <component name="spsettings" long-name="SP Settings" origin-model="Foundation">
+     <component name="spsettings" long-name="SP Settings" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/group"/>
       <!-- <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group"/> -->
       <!-- <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/spsettingsut/group"/> -->
      </component>
-     <component name="cenrepdatabase" long-name="Cenrep Database" origin-model="Foundation">
+     <component name="cenrepdatabase" long-name="Cenrep Database" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
      </component>
-     <component name="serviceselector" long-name="Service Selector" origin-model="Foundation">
+     <component name="serviceselector" long-name="Service Selector" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/convergedcallengine/serviceselector/group"/>
      </component>
-     <component name="csplugin" long-name="CS Plugin" origin-model="Foundation">
+     <component name="csplugin" long-name="CS Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/convergedcallengine/csplugin/group"/>
      </component>
-     <component unofficial="yes" name="convergedcallengine_build" long-name="Converged Call Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="convergedcallengine_build" long-name="Converged Call Engine Build" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/convergedcallengine/group"/>
      </component>
     </collection>
     <collection name="networkhandling" long-name="Network Handling" level="plugin">
-     <component name="networkhandlingengine" long-name="Network Handling Engine" origin-model="Foundation">
+     <component name="networkhandlingengine" long-name="Network Handling Engine" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/networkhandling/networkhandlingengine/group"/>
      </component>
     </collection>
     <collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-     <component name="EnPolicy" long-name="En Policy" origin-model="Foundation">
+     <component name="enpolicy" long-name="En Policy" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/phoneclientserver/enpolicy/group"/>
      </component>
-     <component name="aiwdialdata" long-name="AIW Dial Data" origin-model="Foundation">
+     <component name="aiwdialdata" long-name="AIW Dial Data" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
      </component>
-     <component name="dialutils" long-name="Dial Utils" origin-model="Foundation">
+     <component name="dialutils" long-name="Dial Utils" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/phoneclientserver/dialutils/group"/>
      </component>
-     <component name="phoneclient" long-name="Phone Client" origin-model="Foundation">
+     <component name="phoneclient" long-name="Phone Client" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneclient/group"/>
      </component>
-     <component name="phoneserver" long-name="Phones Erver" origin-model="Foundation">
+     <component name="phoneserver" long-name="Phones Erver" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneserver/group"/>
      </component>
-     <component name="CallUI" long-name="Call UI" origin-model="Foundation">
+     <component name="callui" long-name="Call UI" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/phoneclientserver/callui/group"/>
      </component>
     </collection>
     <collection name="satengine" long-name="Sat Engine" level="generic">
-     <component name="SatServer" long-name="Sat Server" origin-model="Foundation">
+     <component name="satserver" long-name="Sat Server" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/satengine/satserver/group"/>
      </component>
-     <component unofficial="yes" name="satengine_build" long-name="Sat Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="satengine_build" long-name="Sat Engine Build" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/satengine/group"/>
      </component>
     </collection>
     <collection name="satui" long-name="Sat UI" level="specific">
-     <component name="satapp" long-name="Sat App" origin-model="Foundation">
+     <component name="satapp" long-name="Sat App" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/satui/satapp/group"/>
      </component>
-     <component name="satplugin" long-name="Sat Plugin" origin-model="Foundation">
+     <component name="satplugin" long-name="Sat Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/satui/satplugin/group"/>
      </component>
-     <component unofficial="yes" name="satui_build" long-name="Sat UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="satui_build" long-name="Sat UI Build" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/satui/group"/>
      </component>
     </collection>
     <collection name="telutils" long-name="Utilities" level="generic">
-     <component name="phoneparser" long-name="Phone Parser" origin-model="Foundation">
+     <component name="phoneparser" long-name="Phone Parser" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/telutils/phoneparser/group"/>
      </component>
-     <component name="telephonyservice" long-name="Telephony Service" origin-model="Foundation">
+     <component name="telephonyservice" long-name="Telephony Service" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/telutils/telephonyservice/group"/>
      </component>
     </collection>
     <collection name="cellular" long-name="Cellular" level="server">
-     <component name="telephonysettings" long-name="Telephony Settings" origin-model="Foundation">
+     <component name="telephonysettings" long-name="Telephony Settings" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/cellular/telephonysettings/group"/>
      </component>
-     <component name="SSSettings" long-name="SS Settings" origin-model="Foundation">
+     <component name="sssettings" long-name="SS Settings" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/cellular/sssettings/group"/>
      </component>
-     <component name="PsetNotesUi" long-name="Pset Notes UI" origin-model="Foundation">
+     <component name="psetnotesui" long-name="Pset Notes UI" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/cellular/psetnotesui/group"/>
      </component>
-     <component name="ServiceRequest" long-name="Service Request" origin-model="Foundation">
+     <component name="servicerequest" long-name="Service Request" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/cellular/servicerequest/group"/>
      </component>
     </collection>
     <collection name="engines" long-name="Telephony Engines" level="specific">
-     <component name="vmbxengine" long-name="Voice Mailbox Engine" origin-model="Foundation">
+     <component name="vmbxengine" long-name="Voice Mailbox Engine" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/engines/vmbxengine/group"/>
      </component>
     </collection>
     <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific">
-     <component unofficial="yes" name="phonesrv_build" long-name="Telephony and SIM Services Build" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/group"/>
-     </component>
-    </collection>
-    <collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="voice_mailbox_number_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-     </component>
-     <component unofficial="yes" name="cbs_mcn_client_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_notify_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-     </component>
-     <component unofficial="yes" name="converged_call_engine_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="dial_utils_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_ussd_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-     </component>
-     <component unofficial="yes" name="default_emergency_numbers_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_settings_observer_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_ussd_internal_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_command_handler_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_emergency_call_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_messenger_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-     </component>
-     <component unofficial="yes" name="call_information_mediator_api" origin-model="Foundation">
+     <component unofficial="yes" name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_mediator_api/group"/>
-     </component>
-     <component unofficial="yes" name="cbs_message_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="voice_mailbox_settings_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_settings_notes_ui_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_service_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="callui_reconnect_query_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-     </component>
-     <component unofficial="yes" name="ss_settings_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_dial_data_consumer_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_image_handler_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="service_provider_settings_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="string_parser_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="converged_call_provider_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_network_information_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="secondary_display_sat_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-     </component>
-     <component unofficial="yes" name="call_information_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="network_handling_engine_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_configuration_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_settings_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="cenrep_database_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_refresh_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_refresh_api/group"/>
+      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/group"/>
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="incoming_call_monitor_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_server_information_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
+     <component unofficial="yes" name="phonesrv_pub" long-name="Telephony and SIM Services Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="/sf/mw/phonesrv/phonesrv_pub/group"/>
      </component>
-     <component unofficial="yes" name="sat_client_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_client_api/group"/>
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="phone_client_utility_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
+     <component unofficial="yes" name="phonesrv_build" long-name="Telephony and SIM Services Build" origin-model="foundation">
+      <unit bldFile="/sf/mw/phonesrv/group"/>
      </component>
     </collection>
    </block>