--- a/tip_pbc/mw/ipconnmgmt/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/tip_pbc/mw/ipconnmgmt/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,184 +50,179 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="ipconnmgmt" level="generic" levels="plugin framework server utils api" long-name="IP Connectivity Management">
+   <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" introduced="^4" filter="s60" purpose="optional" class="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" purpose="optional" class="api">
+<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>
-<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" purpose="optional" class="api">
+<component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
 </component>
-<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" purpose="optional" class="api">
+<component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
 </component>
-<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" purpose="optional" class="api">
+<component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
 </component>
-<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" purpose="optional" class="api">
+<component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
 </component>
-<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" purpose="optional" class="api">
+<component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
 </component>
-<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" purpose="optional" class="api">
+<component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
 </component>
-<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" purpose="optional" class="api">
+<component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
 </component>
-<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" purpose="optional" class="api">
+<component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
 </component>
-<component name="pdpcontextmanager2_settings_api" long-name="PDP Context Manager 2 Settings API" filter="s60" purpose="optional" class="api">
+<component name="pdpcontextmanager2_settings_api" long-name="PDP Context Manager 2 Settings API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
 </component>
-<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" purpose="optional" class="api">
+<component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
 </component>
-<component name="flextimer_api" long-name="Flex Timer API" introduced="^4" filter="s60" purpose="optional" class="api">
+<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" introduced="^4" filter="s60" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<component name="connection_settings_api" long-name="Connection Settings API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
 </component>
-<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" purpose="optional" class="api">
+<component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/access_point_engine_api/group"/>
 </component>
-<component name="access_point_settings_handler_api" long-name="Access Point Settings Handler API" filter="s60" purpose="optional" class="api">
+<component name="access_point_settings_handler_api" long-name="Access Point Settings Handler API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/access_point_settings_handler_api/group"/>
 </component>
-<component name="data_connection_log_counters_api" long-name="Data Connection Log Counters API" filter="s60" purpose="optional" class="api">
+<component name="data_connection_log_counters_api" long-name="Data Connection Log Counters API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/data_connection_log_counters_api/group"/>
 </component>
-<component name="connection_monitor_server_api" long-name="Connection Monitor Server API" filter="s60" purpose="optional" class="api">
+<component name="connection_monitor_server_api" long-name="Connection Monitor Server API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
 </component>
-<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" purpose="optional" class="api">
+<component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
 </component>
-<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" purpose="optional" class="api">
+<component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
 </component>
-<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" purpose="optional" class="api">
+<component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
 </component>
 </collection>
 <collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-<component name="pdpcontextmanager2" long-name="PDP Context Manager 2" filter="s60" purpose="optional">
+<component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
 <unit bldFile="/sf/mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
 </component>
 </collection>
 <collection name="apengine" long-name="Access Point Engine" level="framework">
-<component name="apeng" long-name="Access Point Engine" filter="s60" purpose="optional">
+<component name="apeng" filter="s60" long-name="Access Point Engine">
 <unit bldFile="/sf/mw/ipconnmgmt/apengine/apeng/group"/>
 </component>
-<component name="apsettingshandlerui" long-name="Access Point Settings Handler UI" filter="s60" purpose="optional">
+<component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
 <unit bldFile="/sf/mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
 </component>
 </collection>
 <collection name="bearermanagement" long-name="Bearer Management" level="framework">
-<component name="mpm" long-name="Mobility Policy Manager" filter="s60" purpose="optional">
+<component name="mpm" filter="s60" long-name="Mobility Policy Manager">
 <unit bldFile="/sf/mw/ipconnmgmt/bearermanagement/mpm/group"/>
 </component>
-<component name="extendedconnpref" long-name="Extended Connection Preferences" filter="s60" purpose="optional">
+<component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
 <unit bldFile="/sf/mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
 </component>
-<component name="s60mcpr" long-name="S60 Meta-Connection Provider" filter="s60" purpose="optional" plugin="Y">
+<component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
 <unit bldFile="/sf/mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
 </component>
 </collection>
 <collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-<component name="cmmgr" long-name="CM Manager" filter="s60" purpose="optional">
+<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" purpose="optional">
-<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/connection_settings_shim" proFile="connection_settings_shim.pro" qmakeArgs="-r"/>
+<component name="connection_settings_shim" long-name="Connection Settings Shim" introduced="^4" filter="s60">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/connection_settings_shim" proFile="connection_settings_shim.pro"/>
 </component>
-<component name="cmapplsettingsui" long-name="Connection Settings UI" introduced="^4" purpose="optional">
-<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cmapplsettingsui" proFile="cmapplsettingsui.pro" qmakeArgs="-r"/>
+<component name="cmapplsettingsui" long-name="Connection Settings UI" introduced="^4" filter="s60">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cmapplsettingsui" proFile="cmapplsettingsui.pro"/>
 </component>
-<component name="cpipsettingsplugin" long-name="Connection Settings IP Plugin" introduced="^4" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cpipsettingsplugin" proFile="cpipsettingsplugin.pro" qmakeArgs="-r"/>
+<component name="cpipsettingsplugin" long-name="Connection Settings IP Plugin" introduced="^4" filter="s60" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cpipsettingsplugin" proFile="cpipsettingsplugin.pro"/>
 </component>
-<component name="cpdestinationplugin" long-name="CP Destination Plugin" introduced="^4" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cpdestinationplugin" proFile="cpdestinationplugin.pro" qmakeArgs="-r"/>
+<component name="cpdestinationplugin" long-name="CP Destination Plugin" introduced="^4" filter="s60" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cpdestinationplugin" proFile="cpdestinationplugin.pro"/>
 </component>
-<component name="cppacketdataapplugin" long-name="CP Packet Data AP Pplugin" introduced="^4" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cppacketdataapplugin" proFile="cppacketdataapplugin.pro" qmakeArgs="-r"/>
+<component name="cppacketdataapplugin" long-name="CP Packet Data AP Pplugin" introduced="^4" filter="s60" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cppacketdataapplugin" proFile="cppacketdataapplugin.pro"/>
 </component>
-<component name="cpwlanapplugin" long-name="CP WLAN AP Plugin" introduced="^4" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cpwlanapplugin" proFile="cpwlanapplugin.pro" qmakeArgs="-r"/>
+<component name="cpwlanapplugin" long-name="CP WLAN AP Plugin" introduced="^4" filter="s60" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cpwlanapplugin" proFile="cpwlanapplugin.pro"/>
 </component>
 </collection>
 <collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-<component name="connectionmonitorui" long-name="Connection Monitor UI" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-</component>
-<component name="connmon" long-name="Connection Monitor" filter="s60" purpose="optional">
+<component name="connmon" filter="s60" long-name="Connection Monitor">
 <!-- either split into two components, or #include from a common bld.inf -->
 <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
 <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
 </component>
-<component name="connmonext" long-name="Connection Monitor Extension API" filter="s60" purpose="optional">
+<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" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/cellularindicatorplugin" proFile="cellularindicatorplugin.pro" qmakeArgs="-r"/>
+<component name="cellularindicatorplugin" long-name="Cellular Indicator Plugin" introduced="^4" filter="s60" plugin="Y">
+<unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/cellularindicatorplugin" proFile="cellularindicatorplugin.pro"/>
 </component>
-<component name="indicatorobserver" long-name="Indicator Observer" introduced="^4" purpose="optional">
-<unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/indicatorobserver" proFile="indicatorobserver.pro" qmakeArgs="-r"/>
+<component name="indicatorobserver" long-name="Indicator Observer" introduced="^4" filter="s60">
+<unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/indicatorobserver" proFile="indicatorobserver.pro"/>
 </component>
-<component name="connectionmonitoringnview" long-name="Connection View" introduced="^4" purpose="optional">
-<unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connectionview" proFile="connectionview.pro" qmakeArgs="-r"/>
+<component name="connectionmonitoringnview" long-name="Connection View" introduced="^4" filter="s60">
+<unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connectionview" proFile="connectionview.pro"/>
 </component>
 </collection>
 <collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-<component name="connectiondialogs" long-name="Connection Dialogs" filter="s60" purpose="optional">
+<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" purpose="optional">
-<unit bldFile="/sf/mw/ipconnmgmt/connectionutilities/confirmqueries" proFile="confirmqueries.pro" qmakeArgs="-r"/>
+<component name="confirmqueries" long-name="Confirm Queries" introduced="^4" filter="s60">
+<unit bldFile="/sf/mw/ipconnmgmt/connectionutilities/confirmqueries" proFile="confirmqueries.pro"/>
 </component>
 </collection>
 <collection name="keepalive" long-name="Keep Alive" level="server">
-<component name="flextimer" long-name="Flex Timer" introduced="^4" filter="s60" purpose="optional">
+<component name="flextimer" filter="s60" long-name="Flex Timer" introduced="^4">
 <unit bldFile="/sf/mw/ipconnmgmt/keepalive/flextimer/group"/>
 </component>
 </collection>
 <collection name="dbcreator" long-name="DB Creator" level="utils">
-<component name="commsdatcreator" long-name="Comms Database Creator" introduced="9.3" filter="s60" purpose="optional">
+<component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
 </component>
-<component name="commsdatcreatorrfsplugin" long-name="Comms Database Creator RFS Plugin" introduced="9.3" filter="s60" purpose="optional" plugin="Y">
+<component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
 </component>
-<component name="commsdatstartup" long-name="Comms Database Startup" introduced="9.3" filter="s60" purpose="optional">
+<component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
 </component>
-<component name="dbcreatorexe" long-name="DB Creator" introduced="9.3" filter="s60" purpose="optional">
+<component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
 </component>
-<component name="dbcreator_build" long-name="DB Creator Build" introduced="9.3" filter="s60" purpose="optional">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/group"/>
+<component name="dbcreator_conf" filter="s60" long-name="DB Creator Config" introduced="9.3" class="config">
+<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/conf"/>
 </component>
 </collection>
 <collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="api">
-<component name="ipcm_build" long-name="IP Connectivity Management Build" filter="s60" purpose="optional">
-<!-- need to move exports to another component, or make this a config component and revmove the #includes -->
-<unit bldFile="/sf/mw/ipconnmgmt/group"/>
+<component name="ipcm_data" filter="s60" long-name="IP Connectivity Management Data" class="config">
+<unit bldFile="/sf/mw/ipconnmgmt/data"/>
 </component>
 </collection>
 </block>