# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1272374530 -3600
# Node ID ca5a2c685f32d6408d46395b652a52ac1553595d
# Parent  513cd446dccb53250ba42ce7bcdbf858714f05bf
Return some components to ^4 which disappeared and came back. Remove bad attributes in ^3 phonesrv.

diff -r 513cd446dccb -r ca5a2c685f32 symbian3/mw/phonesrv/package_definition.xml
--- a/symbian3/mw/phonesrv/package_definition.xml	Fri Apr 23 16:10:50 2010 +0100
+++ b/symbian3/mw/phonesrv/package_definition.xml	Tue Apr 27 14:22:10 2010 +0100
@@ -195,7 +195,8 @@
             <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
           </component>
           <component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group" filter="test,api_test"/>
           </component>
         </collection>
         <collection name="telutils" long-name="Telephony Utils" level="generic">
@@ -216,33 +217,32 @@
         </collection>
         <collection name="cellular" long-name="Cellular" level="server">
           <component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-            <unit bldFile="/sf/mw/phonesrv/cellular/telephonysettings/group"/>
+            <unit bldFile="/sf/mw/phonesrv/cellular/telephonysettings/group" filter="!test"/>
+            <unit bldFile="/sf/mw/phonesrv/cellular/telephonysettings/tsrc/public/basic/group" filter="test,api_test"/>
           </component>
           <component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-            <unit bldFile="/sf/mw/phonesrv/cellular/sssettings/group"/>
+            <unit bldFile="/sf/mw/phonesrv/cellular/sssettings/group" filter="!test"/>
+            <unit bldFile="/sf/mw/phonesrv/cellular/SSSettings/tsrc/public/basic/group" filter="test,api_test"/>
           </component>
           <component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-            <unit bldFile="/sf/mw/phonesrv/cellular/psetnotesui/group"/>
+            <unit bldFile="/sf/mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
+            <unit bldFile="/sf/mw/phonesrv/cellular/PsetNotesUi/tsrc/public/basic/group" filter="test,api_test"/>
           </component>
           <component name="servicerequest" filter="s60" long-name="Service Request">
             <unit bldFile="/sf/mw/phonesrv/cellular/servicerequest/group"/>
           </component>
-          <component name="cellular_test" filter="s60,test,api_test" long-name="Cellular Tests" purpose="development">
-            <!-- can only have one unit. Need to #include from a single bld.inf  (cellular/tsrc/bld.inf?) -->
-            <unit bldFile="/sf/mw/phonesrv/cellular/PsetNotesUi/tsrc/public/basic/group"/>
-            <unit bldFile="/sf/mw/phonesrv/cellular/SSSettings/tsrc/public/basic/group"/>
-            <unit bldFile="/sf/mw/phonesrv/cellular/telephonysettings/tsrc/public/basic/group"/>
-          </component>
         </collection>
         <collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
           <component name="callprovider" filter="s60" long-name="Call Provider">
             <unit bldFile="/sf/mw/phonesrv/convergedcallengine/callprovider/group"/>
           </component>
           <component name="cce" filter="s60" long-name="CCE">
-            <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cce/group"/>
+            <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cce/group" filter="!test"/>
+            <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cce/tsrc/public/basic/group" filter="test,api_test"/>
           </component>
           <component name="spsettings" filter="s60" long-name="Service Provider Settings">
-            <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/group"/>
+            <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/group" filter="!test"/>
+            <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group" filter="test,api_test"/>
           </component>
           <component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
             <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
@@ -254,11 +254,6 @@
             <!--  should spell out CS in name -->
             <unit bldFile="/sf/mw/phonesrv/convergedcallengine/csplugin/group"/>
           </component>
-          <component name="convergedcallengine_test" filter="s60,test,api_test" long-name="CCE Tests" purpose="development">
-            <!-- can only have one unit. Need to #include from a single bld.inf  (convergedcallengine/tsrc/bld.inf?) -->
-            <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cce/tsrc/public/basic/group"/>
-            <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group"/>
-          </component>
         </collection>
         <collection name="engines" long-name="Telephony Engines" level="specific">
           <component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
@@ -275,13 +270,16 @@
             <unit bldFile="/sf/mw/phonesrv/phoneclientserver/enpolicy/group"/>
           </component>
           <component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
-            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
+            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/aiwdialdata/group" filter="!test"/>
+            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/aiwdialdata/tsrc/public/basic/group" filter="test,api_test"/>
           </component>
           <component name="dialutils" filter="s60" long-name="Dial Utils">
-            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/dialutils/group"/>
+            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/dialutils/group" filter="!test"/>
+            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/dialutils/tsrc/public/basic/group" filter="test,api_test"/>
           </component>
           <component name="phoneclient" filter="s60" long-name="Phone Client">
-            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneclient/group"/>
+            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneclient/group" filter="!test"/>
+            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneclient/tsrc/public/basic/group" filter="test,api_test"/>
           </component>
           <component name="phoneserver" filter="s60" long-name="Phone Server">
             <unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneserver/group"/>
@@ -289,12 +287,6 @@
           <component name="callui" filter="s60" long-name="Call UI">
             <unit bldFile="/sf/mw/phonesrv/phoneclientserver/callui/group"/>
           </component>
-          <component name="phoneclientserver_test" filter="s60,test,api_test" long-name="Phone Client/Server Tests" purpose="development">
-            <!-- can only have one unit. Need to #include from a single bld.inf  (phoneclientserver/tsrc/bld.inf?) -->
-            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
-            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/dialutils/tsrc/public/basic/group"/>
-            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneclient/tsrc/public/basic/group"/>
-          </component>
         </collection>
         <collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
           <component name="satserver" filter="s60" long-name="SAT Server">
@@ -314,12 +306,6 @@
             <unit bldFile="/sf/mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
           </component>
         </collection>
-        <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific">
-          <component name="phonesrv_test" filter="s60,test,api_test" long-name="Telephony and SIM Services Tests" purpose="development">
-            <!-- can only have one unit. Need to #include from a single bld.inf  (phonesrv_plat/tsrc/bld.inf?) -->
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>
diff -r 513cd446dccb -r ca5a2c685f32 symbian3/mw/phonesrv/package_definition_3.0.xml
--- a/symbian3/mw/phonesrv/package_definition_3.0.xml	Fri Apr 23 16:10:50 2010 +0100
+++ b/symbian3/mw/phonesrv/package_definition_3.0.xml	Tue Apr 27 14:22:10 2010 +0100
@@ -25,7 +25,7 @@
    <component id="sat_refresh_api" name="SAT Refresh API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/sat_refresh_api/sat_refresh_api.metaxml"/>
     <unit bldFile="phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-    <unit unitID="tedo.sat_refresh_api.test" bldFile="phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="network_handling_engine_api" name="Network Handling Engine API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/network_handling_engine_api/network_handling_engine_api.metaxml"/>
@@ -54,7 +54,7 @@
    <component id="sat_client_api" name="SAT Client API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/sat_client_api/sat_client_api.metaxml"/>
     <unit bldFile="phonesrv_plat/sat_client_api/group" filter="!test"/>
-    <unit unitID="tedo.sat_client_api.test" bldFile="phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="phone_client_api" name="Phone Client API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/phone_client_api/phone_client_api.metaxml"/>
@@ -63,7 +63,7 @@
    <component id="sat_service_api" name="SAT Service API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/sat_service_api/sat_service_api.metaxml"/>
     <unit bldFile="phonesrv_plat/sat_service_api/group" filter="!test"/>
-    <unit unitID="tedo.sat_service_api.test" bldFile="phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="cbs_message_api" name="CBS Message API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/cbs_message_api/cbs_message_api.metaxml"/>
@@ -147,15 +147,16 @@
    <component id="call_information_api" name="Call Information API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/call_information_api/call_information_api.metaxml"/>
     <unit bldFile="phonesrv_plat/call_information_api/group" filter="!test"/>
-    <unit unitID="tedo.call_information_api.test" bldFile="phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="call_remote_party_information_api" name="Call Remote Party Information API" class="api" filter="s60">
     <unit bldFile="phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-    <unit unitID="tedo.call_remote_party_information_api.test" bldFile="phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/telephony_mediator_api/telephony_mediator_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/telephony_mediator_api/group"/>
+    <unit bldFile="phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group" filter="test,api_test"/>
    </component>
   </collection>
   <collection id="telutils" name="Telephony Utils" level="generic">
@@ -176,33 +177,32 @@
   </collection>
   <collection id="cellular" name="Cellular" level="server">
    <component id="telephonysettings" filter="s60" name="Telephony Settings">
-    <unit bldFile="cellular/telephonysettings/group"/>
+    <unit bldFile="cellular/telephonysettings/group" filter="!test"/>
+    <unit bldFile="cellular/telephonysettings/tsrc/public/basic/group" filter="test,api_test"/>
    </component>
    <component id="sssettings" filter="s60" name="Supplementary Service Settings">
-    <unit bldFile="cellular/sssettings/group"/>
+    <unit bldFile="cellular/sssettings/group" filter="!test"/>
+    <unit bldFile="cellular/SSSettings/tsrc/public/basic/group" filter="test,api_test"/>
    </component>
    <component id="psetnotesui" filter="s60" name="Phone Settings Notes UI">
-    <unit bldFile="cellular/psetnotesui/group"/>
+    <unit bldFile="cellular/psetnotesui/group" filter="!test"/>
+    <unit bldFile="cellular/PsetNotesUi/tsrc/public/basic/group" filter="test,api_test"/>
    </component>
    <component id="servicerequest" filter="s60" name="Service Request">
     <unit bldFile="cellular/servicerequest/group"/>
    </component>
-   <component id="cellular_test" filter="s60,test,api_test" name="Cellular Tests" purpose="development">
-    <!-- can only have one unit. Need to #include from a single bld.inf  (cellular/tsrc/bld.inf?) -->
-    <unit unitID="tedo.PsetNotesUi.test" bldFile="cellular/PsetNotesUi/tsrc/public/basic/group"/>
-    <unit unitID="tedo.SSSettings.test" bldFile="cellular/SSSettings/tsrc/public/basic/group"/>
-    <unit unitID="tedo.telephonysettings.test" bldFile="cellular/telephonysettings/tsrc/public/basic/group"/>
-   </component>
   </collection>
   <collection id="convergedcallengine" name="Converged Call Engine" level="framework">
    <component id="callprovider" filter="s60" name="Call Provider">
     <unit bldFile="convergedcallengine/callprovider/group"/>
    </component>
    <component id="cce" filter="s60" name="CCE">
-    <unit bldFile="convergedcallengine/cce/group"/>
+    <unit bldFile="convergedcallengine/cce/group" filter="!test"/>
+    <unit filter="test,api_test" bldFile="convergedcallengine/cce/tsrc/public/basic/group"/>
    </component>
    <component id="spsettings" filter="s60" name="Service Provider Settings">
-    <unit bldFile="convergedcallengine/spsettings/group"/>
+    <unit bldFile="convergedcallengine/spsettings/group" filter="!test"/>
+    <unit filter="test,api_test" bldFile="convergedcallengine/spsettings/tsrc/public/basic/group"/>
    </component>
    <component id="cenrepdatabase" filter="s60" name="CCE Cenrep Database">
     <unit bldFile="convergedcallengine/cenrepdatabase/group"/>
@@ -214,11 +214,6 @@
     <!--  should spell out CS in name -->
     <unit bldFile="convergedcallengine/csplugin/group"/>
    </component>
-   <component id="convergedcallengine_test" filter="s60,test,api_test" name="CCE Tests" purpose="development">
-    <!-- can only have one unit. Need to #include from a single bld.inf  (convergedcallengine/tsrc/bld.inf?) -->
-    <unit unitID="tedo.cce.test" bldFile="convergedcallengine/cce/tsrc/public/basic/group"/>
-    <unit unitID="tedo.spsettings.test" bldFile="convergedcallengine/spsettings/tsrc/public/basic/group"/>
-   </component>
   </collection>
   <collection id="engines" name="Telephony Engines" level="specific">
    <component id="vmbxengine" filter="s60" name="Voice Mailbox Engine">
@@ -235,13 +230,16 @@
     <unit bldFile="phoneclientserver/enpolicy/group"/>
    </component>
    <component id="aiwdialdata" filter="s60" name="AIW Dial Data">
-    <unit bldFile="phoneclientserver/aiwdialdata/group"/>
+    <unit bldFile="phoneclientserver/aiwdialdata/group" filter="!test"/>
+    <unit filter="test,api_test" bldFile="phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
    </component>
    <component id="dialutils" filter="s60" name="Dial Utils">
-    <unit bldFile="phoneclientserver/dialutils/group"/>
+    <unit bldFile="phoneclientserver/dialutils/group" filter="!test"/>
+    <unit filter="test,api_test" bldFile="phoneclientserver/dialutils/tsrc/public/basic/group"/>
    </component>
    <component id="phoneclient" filter="s60" name="Phone Client">
-    <unit bldFile="phoneclientserver/phoneclient/group"/>
+    <unit bldFile="phoneclientserver/phoneclient/group" filter="!test"/>
+    <unit filter="test,api_test" bldFile="phoneclientserver/phoneclient/tsrc/public/basic/group"/>
    </component>
    <component id="phoneserver" filter="s60" name="Phone Server">
     <unit bldFile="phoneclientserver/phoneserver/group"/>
@@ -249,12 +247,6 @@
    <component id="callui" filter="s60" name="Call UI">
     <unit bldFile="phoneclientserver/callui/group"/>
    </component>
-   <component id="phoneclientserver_test" filter="s60,test,api_test" name="Phone Client/Server Tests" purpose="development">
-    <!-- can only have one unit. Need to #include from a single bld.inf  (phoneclientserver/tsrc/bld.inf?) -->
-    <unit unitID="tedo.aiwdialdata.test" bldFile="phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
-    <unit unitID="tedo.dialutils.test" bldFile="phoneclientserver/dialutils/tsrc/public/basic/group"/>
-    <unit unitID="tedo.phoneclient.test" bldFile="phoneclientserver/phoneclient/tsrc/public/basic/group"/>
-   </component>
   </collection>
   <collection id="satengine" name="SIM Application Toolkit Engine" level="generic">
    <component id="satserver" filter="s60" name="SAT Server">
@@ -274,11 +266,5 @@
     <unit bldFile="phonecmdhandler/phonecmdhnlr/group"/>
    </component>
   </collection>
-  <collection id="phonesrv_info" name="Telephony and SIM Services Info" level="specific">
-   <component id="phonesrv_test" filter="s60,test,api_test" name="Telephony and SIM Services Tests" purpose="development">
-    <!-- can only have one unit. Need to #include from a single bld.inf  (phonesrv_plat/tsrc/bld.inf?) -->
-    <unit unitID="tedo.telephony_mediator_api.test" bldFile="phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group"/>
-   </component>
-  </collection>
  </package>
 </SystemDefinition>
diff -r 513cd446dccb -r ca5a2c685f32 symbian4/mw/phonesrv/package_definition.xml
--- a/symbian4/mw/phonesrv/package_definition.xml	Fri Apr 23 16:10:50 2010 +0100
+++ b/symbian4/mw/phonesrv/package_definition.xml	Tue Apr 27 14:22:10 2010 +0100
@@ -78,24 +78,129 @@
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="plugin framework server generic specific">
         <collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
+          <component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
+          </component>
+          <component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
+          </component>
+          <component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
+          </component>
+          <component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+          </component>
+          <component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
+          </component>
           <component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
           </component>
+          <component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
+          </component>
+          <component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
+          </component>
+          <component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
+          </component>
+          <component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
+          </component>
+          <component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
+          </component>
+          <component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
+          </component>
           <component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
           </component>
+          <component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
+          </component>
           <component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
           </component>
+          <component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
+          </component>
+          <component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
+          </component>
+          <component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
+          </component>
+          <component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
+          </component>
+          <component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
+          </component>
+          <component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
+          </component>
+          <component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
+          </component>
+          <component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
+          </component>
+          <component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
+          </component>
+          <component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
+          </component>
+          <component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
+          </component>
+          <component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
+          </component>
+          <component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
+          </component>
+          <component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
+          </component>
+          <component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
+          </component>
+          <component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
+          </component>
+          <component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
+          </component>
+          <component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
+          </component>
+          <component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
+          </component>
+          <component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
+          </component>
           <component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
           </component>
           <component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
           </component>
           <component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group" filter="test,api_test"/>
           </component>
+          <component name="dialpad_api" long-name="Dialpad API" filter="s60" introduced="^4" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/dialpad_api/group"/>
+          </component>
         </collection>
         <collection name="cellular" long-name="Cellular" level="server">
           <component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development">
diff -r 513cd446dccb -r ca5a2c685f32 symbian4/mw/phonesrv/package_definition_3.0.xml
--- a/symbian4/mw/phonesrv/package_definition_3.0.xml	Fri Apr 23 16:10:50 2010 +0100
+++ b/symbian4/mw/phonesrv/package_definition_3.0.xml	Tue Apr 27 14:22:10 2010 +0100
@@ -2,29 +2,164 @@
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <package id="phonesrv" name="Telephony and SIM Services" levels="plugin framework server generic specific">
   <collection id="phonesrv_plat" name="Telephony and SIM Services Platform Interfaces" level="specific">
+   <component id="string_parser_api" name="String Parser API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/string_parser_api/string_parser_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/string_parser_api/group"/>
+   </component>
+   <component id="cbs_mcn_client_api" name="CBS MCN Client API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/cbs_mcn_client_api/cbs_mcn_client_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/cbs_mcn_client_api/group"/>
+   </component>
+   <component id="converged_call_engine_api" name="Converged Call Engine API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/converged_call_engine_api/converged_call_engine_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/converged_call_engine_api/group"/>
+   </component>
+   <component id="aiw_dial_data_consumer_api" name="AIW Dial Data Consumer API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/aiw_dial_data_consumer_api/aiw_dial_data_consumer_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+   </component>
+   <component id="phone_client_ussd_api" name="Phone Client USSD API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_ussd_api/phone_client_ussd_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_ussd_api/group"/>
+   </component>
    <component id="sat_refresh_api" name="SAT Refresh API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/sat_refresh_api/sat_refresh_api.metaxml"/>
-    <unit unitID="tedo.sat_refresh_api.test" bldFile="phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="network_handling_engine_api" name="Network Handling Engine API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/network_handling_engine_api/network_handling_engine_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/network_handling_engine_api/group"/>
+   </component>
+   <component id="phone_client_emergency_call_api" name="Phone Client Emergency Call API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_emergency_call_api/phone_client_emergency_call_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_emergency_call_api/group"/>
+   </component>
+   <component id="sat_configuration_api" name="SAT Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/sat_configuration_api/sat_configuration_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/sat_configuration_api/group"/>
+   </component>
+   <component id="dial_utils_api" name="Dial Utils API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/dial_utils_api/dial_utils_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/dial_utils_api/group"/>
+   </component>
+   <component id="phone_client_image_handler_api" name="Phone Client Image Handler API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_image_handler_api/phone_client_image_handler_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_image_handler_api/group"/>
+   </component>
+   <component id="phone_client_messenger_api" name="Phone Client Messenger API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_messenger_api/phone_client_messenger_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_messenger_api/group"/>
    </component>
    <component id="sat_client_api" name="SAT Client API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/sat_client_api/sat_client_api.metaxml"/>
-    <unit unitID="tedo.sat_client_api.test" bldFile="phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/sat_client_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="phone_client_api" name="Phone Client API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_api/phone_client_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_api/group"/>
    </component>
    <component id="sat_service_api" name="SAT Service API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/sat_service_api/sat_service_api.metaxml"/>
-    <unit unitID="tedo.sat_service_api.test" bldFile="phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/sat_service_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="cbs_message_api" name="CBS Message API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/cbs_message_api/cbs_message_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/cbs_message_api/group"/>
+   </component>
+   <component id="phone_client_server_information_api" name="Phone Client Server Information API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_server_information_api/phone_client_server_information_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_server_information_api/group"/>
+   </component>
+   <component id="phone_client_ussd_internal_api" name="Phone Client USSD Internal API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_ussd_internal_api/phone_client_ussd_internal_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_ussd_internal_api/group"/>
+   </component>
+   <component id="phone_client_command_handler_api" name="Phone Client Command Handler API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_command_handler_api/phone_client_command_handler_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_command_handler_api/group"/>
+   </component>
+   <component id="phone_client_notify_api" name="Phone Client Notify API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_notify_api/phone_client_notify_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_notify_api/group"/>
+   </component>
+   <component id="phone_client_utility_api" name="Phone Client Utility API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_utility_api/phone_client_utility_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_utility_api/group"/>
+   </component>
+   <component id="telephony_network_information_api" name="Telephony Network Information API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/telephony_network_information_api/telephony_network_information_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/telephony_network_information_api/group"/>
+   </component>
+   <component id="secondary_display_sat_api" name="Secondary Display SAT API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/secondary_display_sat_api/secondary_display_sat_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/secondary_display_sat_api/group"/>
+   </component>
+   <component id="callui_reconnect_query_api" name="CallUI Reconnect Query API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/callui_reconnect_query_api/callui_reconnect_query_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/callui_reconnect_query_api/group"/>
+   </component>
+   <component id="service_provider_settings_api" name="Service Provider Settings API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/service_provider_settings_api/service_provider_settings_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/service_provider_settings_api/group"/>
+   </component>
+   <component id="converged_call_provider_api" name="Converged Call Provider API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/converged_call_provider_api/converged_call_provider_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/converged_call_provider_api/group"/>
+   </component>
+   <component id="incoming_call_monitor_api" name="Incoming Call Monitor API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/incoming_call_monitor_api/incoming_call_monitor_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/incoming_call_monitor_api/group"/>
+   </component>
+   <component id="default_emergency_numbers_api" name="Default Emergency Numbers API" class="api" filter="s60">
+    <unit bldFile="phonesrv_plat/default_emergency_numbers_api/group"/>
+   </component>
+   <component id="cenrep_database_api" name="Central Repository Database API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/cenrep_database_api/cenrep_database_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/cenrep_database_api/group"/>
+   </component>
+   <component id="ss_settings_api" name="SS Settings API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/ss_settings_api/ss_settings_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/ss_settings_api/group"/>
+   </component>
+   <component id="phone_settings_observer_api" name="Phone Settings Observer API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_settings_observer_api/phone_settings_observer_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_settings_observer_api/group"/>
+   </component>
+   <component id="phone_settings_notes_ui_api" name="Phone Settings Notes UI API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_settings_notes_ui_api/phone_settings_notes_ui_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_settings_notes_ui_api/group"/>
+   </component>
+   <component id="phone_settings_api" name="Phone Settings API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_settings_api/phone_settings_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_settings_api/group"/>
+   </component>
+   <component id="voice_mailbox_number_api" name="Voice Mailbox Number API" class="api" filter="s60">
+    <unit bldFile="phonesrv_plat/voice_mailbox_number_api/group"/>
+   </component>
+   <component id="voice_mailbox_settings_api" name="Voice Mailbox Settings API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/voice_mailbox_settings_api/voice_mailbox_settings_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/voice_mailbox_settings_api/group"/>
    </component>
    <component id="call_information_api" name="Call Information API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/call_information_api/call_information_api.metaxml"/>
-    <unit unitID="tedo.call_information_api.test" bldFile="phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/call_information_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="call_remote_party_information_api" name="Call Remote Party Information API" class="api" filter="s60">
-    <unit unitID="tedo.call_remote_party_information_api.test" bldFile="phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/telephony_mediator_api/telephony_mediator_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
     <unit bldFile="phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group" filter="test,api_test"/>
    </component>
+   <component id="dialpad_api" name="Dialpad API" class="api" filter="s60" introduced="^4">
+    <unit bldFile="phonesrv_plat/dialpad_api/group"/>
+   </component>
   </collection>
   <collection id="cellular" name="Cellular" level="server">
    <component id="telephonysettings" filter="s60" name="Telephony Settings" purpose="development">
diff -r 513cd446dccb -r ca5a2c685f32 symbian4/os/kernelhwsrv/package_definition.xml
--- a/symbian4/os/kernelhwsrv/package_definition.xml	Fri Apr 23 16:10:50 2010 +0100
+++ b/symbian4/os/kernelhwsrv/package_definition.xml	Tue Apr 27 14:22:10 2010 +0100
@@ -137,6 +137,14 @@
             <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
             <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
           </component>
+          <component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
+            <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+          </component>
+          <component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
+            <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+          </component>
         </collection>
         <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
           <component name="mediadrivers" long-name="Media Drivers" purpose="optional">
diff -r 513cd446dccb -r ca5a2c685f32 symbian4/os/kernelhwsrv/package_definition_3.0.xml
--- a/symbian4/os/kernelhwsrv/package_definition_3.0.xml	Fri Apr 23 16:10:50 2010 +0100
+++ b/symbian4/os/kernelhwsrv/package_definition_3.0.xml	Tue Apr 27 14:22:10 2010 +0100
@@ -61,6 +61,14 @@
         <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
         <unit bldFile="kernel/eka/drivers/usbc" mrp="kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
       </component>
+      <component id="usbdescriptors" name="USB Descriptors" purpose="optional">
+        <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+        <unit bldFile="kernel/eka/drivers/usbho/usbdescriptors" mrp="kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+      </component>
+      <component id="usbdi_utils" name="USB DI Utils" purpose="optional">
+        <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+        <unit bldFile="kernel/eka/drivers/usbho/usbdi_utils" mrp="kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+      </component>
     </collection>
     <collection id="driversupport" name="Generic Driver Support" level="hw-if">
       <component id="mediadrivers" name="Media Drivers" purpose="optional">