diff -r 589d0dcca729 -r 921124097970 symbian4/mw/ipconnmgmt/package_definition.xml
--- a/symbian4/mw/ipconnmgmt/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/mw/ipconnmgmt/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -55,6 +55,9 @@
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server utils api">
 <collection name="ipcm_plat" long-name="IP Connectivity Management Platform Interfaces" level="api">
+<component name="ipcm_plat_qt_build" long-name="IP Connectivity Management Qt Platform Interfaces" filter="s60" introduced="^4" class="api">
+<unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat" proFile="ipcm_plat.pro"/>
+</component>
 <component name="access_point_engine_misc_api" long-name="Access Point Engine Misc API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
 </component>
@@ -91,6 +94,9 @@
 <component name="flextimer_api" long-name="Flex Timer API" filter="s60" introduced="^4" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/flextimer_api/group"/>
 </component>
+<component name="mpm_vpn_toggle_api" long-name="MPM VPN Toggle API" filter="s60" introduced="^4" class="api">
+<unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/mpm_vpn_toggle_api/group"/>
+</component>
 </collection>
 <collection name="ipcm_pub" long-name="IP Connectivity Management Public Interfaces" level="api">
 <component name="connection_settings_api" long-name="Connection Settings API" filter="s60" class="api">
@@ -146,6 +152,24 @@
 <component name="cmmgr" filter="s60" long-name="CM Manager">
 <unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cmmgr/group"/>
 </component>
+<component name="connection_settings_shim" long-name="Connection Settings Shim" introduced="^4">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/connection_settings_shim" proFile="connection_settings_shim.pro" qmakeArgs="-r"/>
+</component>
+<component name="cmapplsettingsui" long-name="Connection Settings UI" introduced="^4">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cmapplsettingsui" proFile="cmapplsettingsui.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpipsettingsplugin" long-name="Connection Settings IP Plugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cpipsettingsplugin" proFile="cpipsettingsplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpdestinationplugin" long-name="CP Destination Plugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cpdestinationplugin" proFile="cpdestinationplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="cppacketdataapplugin" long-name="CP Packet Data AP Pplugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cppacketdataapplugin" proFile="cppacketdataapplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpwlanapplugin" long-name="CP WLAN AP Plugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cpwlanapplugin" proFile="cpwlanapplugin.pro" qmakeArgs="-r"/>
+</component>
 </collection>
 <collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
 <component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
@@ -159,11 +183,23 @@
 <component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
 <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
 </component>
+<component name="cellularindicatorplugin" long-name="Cellular Indicator Plugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/cellularindicatorplugin" proFile="cellularindicatorplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="indicatorobserver" long-name="Indicator Observer" introduced="^4">
+<unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/indicatorobserver" proFile="indicatorobserver.pro" qmakeArgs="-r"/>
+</component>
+<component name="connectionmonitoringnview" long-name="Connection View" introduced="^4">
+<unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connectionview" proFile="connectionview.pro" qmakeArgs="-r"/>
+</component>
 </collection>
 <collection name="connectionutilities" long-name="Connection Utilities" level="utils">
 <component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
 <unit bldFile="/sf/mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
 </component>
+<component name="confirmqueries" long-name="Confirm Queries" introduced="^4">
+<unit bldFile="/sf/mw/ipconnmgmt/connectionutilities/confirmqueries" proFile="confirmqueries.pro" qmakeArgs="-r"/>
+</component>
 </collection>
 <collection name="keepalive" long-name="Keep Alive" level="server">
 <component name="flextimer" filter="s60" long-name="Flex Timer" introduced="^4">
@@ -193,9 +229,6 @@
 <!-- need to move exports to another component, or make this a config component and revmove the #includes -->
 <unit bldFile="/sf/mw/ipconnmgmt/group"/>
 </component>
-<component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-<unit bldFile="/sf/mw/ipconnmgmt" proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
-</component>
 </collection>
 </block>
   </layer>