--- a/symbian3/single/sysdefs/auto/system_model.xml Thu Nov 04 12:06:50 2010 +0000
+++ b/symbian3/single/sysdefs/auto/system_model.xml Thu Nov 04 14:03:07 2010 +0000
@@ -76,7 +76,7 @@
<SystemDefinition name="Symbian^3" schema="2.0.1">
<systemModel>
<layer name="adapt" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
+<block name="stubs" level="high" span="2" long-name="Stubs" levels="stub">
<collection name="s60_stubs" level="stub">
<component name="audiostubs" long-name="Audio Stubs">
<unit bldFile="adapt/stubs/audiostubs/group"/>
@@ -647,7 +647,7 @@
<component name="dbus_api" long-name="Dbus API" filter="s60" class="api">
<unit bldFile="os/ossrv/ossrv_pub/dbus/group"/>
</component>
-<component name="dbus-glib" long-name="Dbus-glib API" filter="s60" class="api">
+<component name="dbus_glib_api" long-name="D-Bus GLib API" filter="s60" class="api">
<unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
</component>
</collection>
@@ -790,7 +790,7 @@
<component name="eventlogger" long-name="Event Logger" introduced="6.0" purpose="optional">
<unit bldFile="os/persistentdata/loggingservices/eventlogger/group" mrp="os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
</component>
-<component name="filelogger" long-name="File Logger" introduced="ER5" purpose="optional">
+<component name="filelogger" long-name="File Logger" introduced="ER5" deprecated="^3" purpose="optional">
<unit bldFile="os/persistentdata/loggingservices/filelogger/group" mrp="os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
</component>
<component name="rfilelogger" long-name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
@@ -1214,6 +1214,12 @@
<component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
<unit bldFile="os/security/contentmgmt/cafrecogniserconfig" mrp="os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
</component>
+<component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0" purpose="development">
+<unit bldFile="os/security/contentmgmt/referencedrmagent/RefTestAgent/group" mrp="os/security/contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
+</component>
+<component name="cafstreamingsupport" long-name="CAF Streaming Support" introduced="^3" purpose="optional">
+<unit bldFile="os/security/contentmgmt/cafstreamingsupport/group" mrp="os/security/contentmgmt/cafstreamingsupport/group/security_streamingcaf.mrp"/>
+</component>
</collection>
<collection name="crypto" long-name="Crypto Libraries" level="libraries">
<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
@@ -1291,8 +1297,8 @@
<component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="^3" purpose="optional" plugin="Y">
<unit bldFile="os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
</component>
-<component name="locationapesuplpsy" long-name="APE SUPL PSY" introduced="^3" purpose="optional" filter="s60" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/locationapesuplpsy/group"/>
+<component name="locationapesuplpsy" long-name="APE SUPL Positioning Module" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
</component>
</collection>
<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adapt">
@@ -1550,12 +1556,6 @@
<component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development">
<unit bldFile="os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
</component>
-<component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development">
-<unit bldFile="os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
-</component>
-<component name="networkingperformancemeasurementtools" long-name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
-<unit bldFile="os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
-</component>
</collection>
<collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
<component name="networkingrom" long-name="Networking ROM" purpose="mandatory">
@@ -1650,11 +1650,6 @@
</component>
</collection>
<collection name="wlanapitest" long-name="WLAN API Tests" level="test"/>
-<collection name="wlan_info" long-name="WLAN Info" level="test">
-<component name="wlan_metadata" long-name="WLAN Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
-</component>
-</collection>
</block>
<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adapt hw-if plugin framework server app-if">
<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
@@ -1855,6 +1850,9 @@
</collection>
</block>
<block name="usb" level="services" long-name="USB" levels="adapt hw-if plugin framework server app-if">
+<collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
+<!-- placeholder for platform APIs -->
+</collection>
<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
<!-- usbclientdrivers to be moved here from kernelhwsrv-->
</collection>
@@ -1875,13 +1873,13 @@
<block name="mm" level="services" long-name="Multimedia" levels="adapt hw-if device-fw devices middleware app-if">
<collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
<component name="audio_effects_api" long-name="Audio Effects API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_pub/audio_effects_api/group"/>
+<unit bldFile="os/mm/mm_pub/audio_effects_api/group" filter="!test"/>
</component>
<component name="audio_effects_presets_api" long-name="Audio Effects Presets API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_pub/audio_effects_presets_api/group"/>
+<unit bldFile="os/mm/mm_pub/audio_effects_presets_api/group" filter="!test"/>
</component>
<component name="drm_audio_player_api" long-name="DRM Audio Player API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_pub/drm_audio_player_api/group"/>
+<unit bldFile="os/mm/mm_pub/drm_audio_player_api/group" filter="!test"/>
</component>
<component name="multimedia_extension_interfaces_api" long-name="Multimedia Extension Interfaces API" filter="s60" class="api">
<unit bldFile="os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
@@ -1889,7 +1887,7 @@
</collection>
<collection name="mm_plat" long-name="Multimedia Platform Interfaces" level="app-if">
<component name="aac_decoder_config_api" long-name="AAC Decoder Config API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_api/group"/>
+<unit bldFile="os/mm/mm_plat/aac_decoder_config_api/group" filter="!test"/>
</component>
<component name="aac_decoder_config_msg_hdlr_api" long-name="AAC Decoder Config Msg Hdlr API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
@@ -1916,7 +1914,7 @@
<unit bldFile="os/mm/mm_plat/audio_policy_header_api/group"/>
</component>
<component name="audio_routing_api" long-name="Audio Routing API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_api/group"/>
+<unit bldFile="os/mm/mm_plat/audio_routing_api/group" filter="!test"/>
</component>
<component name="audio_routing_msg_hdlr_api" long-name="Audio Routing Msg Hdlr API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
@@ -1943,7 +1941,7 @@
<unit bldFile="os/mm/mm_plat/display_posting_api/group"/>
</component>
<component name="eaac_plus_decoder_interface_api" long-name="eAAC Plus Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/group" filter="!test"/>
</component>
<component name="eaac_plus_decoder_interface_msg_hdlr_api" long-name="eAAC Plus Decoder Interface Message Handler API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
@@ -1952,7 +1950,7 @@
<unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
</component>
<component name="error_concealment_interface_api" long-name="Error Concealment Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/error_concealment_interface_api/group" filter="!test"/>
</component>
<component name="error_concealment_interface_msg_hdlr_api" long-name="Error Concealment Interface Message Handler API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
@@ -1964,7 +1962,7 @@
<unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
</component>
<component name="g711_decoder_interface_api" long-name="G711 Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group" filter="!test"/>
</component>
<component name="g711_decoder_interface_msg_hdlr_api" long-name="G711 Decoder Interface Message Handler API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
@@ -1973,7 +1971,7 @@
<unit bldFile="os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
</component>
<component name="g711_encoder_interface_api" long-name="G711 Encoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/group" filter="!test"/>
</component>
<component name="g711_encoder_interface_msg_hdlr_api" long-name="G711 Encoder Interface Message Handler API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
@@ -1982,7 +1980,7 @@
<unit bldFile="os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
</component>
<component name="g729_decoder_interface_api" long-name="G729 Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/group" filter="!test"/>
</component>
<component name="g729_decoder_interface_msg_hdlr_api" long-name="G729 Decoder Interface Message Handler API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
@@ -1991,7 +1989,7 @@
<unit bldFile="os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
</component>
<component name="g729_encoder_interface_api" long-name="G729 Encoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/group" filter="!test"/>
</component>
<component name="g729_encoder_interface_proxy_api" long-name="G729 Encoder Interface Proxy API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
@@ -2000,13 +1998,13 @@
<unit bldFile="os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
</component>
<component name="global_audio_settings_api" long-name="Global Audio Settings API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/global_audio_settings_api/group"/>
+<unit bldFile="os/mm/mm_plat/global_audio_settings_api/group" filter="!test"/>
</component>
<component name="global_audio_settings_definition_api" long-name="Global Audio Settings Definition API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/global_audio_settings_definition_api/group"/>
</component>
<component name="ilbc_decoder_interface_api" long-name="Ilbc Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/group" filter="!test"/>
</component>
<component name="ilbc_decoder_interface_msg_hdlr_api" long-name="Ilbc Decoder Interface Message Handler API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
@@ -2015,7 +2013,7 @@
<unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
</component>
<component name="ilbc_encoder_interface_api" long-name="Ilbc Encoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/group" filter="!test"/>
</component>
<component name="ilbc_encoder_interface_msg_hdlr_api" long-name="Ilbc Encoder Interface Message Handler API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
@@ -2036,7 +2034,7 @@
<unit bldFile="os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
</component>
<component name="ra8_decoder_interface_api" long-name="RA8 Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/group" filter="!test"/>
</component>
<component name="ra8_decoder_interface_msg_hdlr_api" long-name="RA8 Decoder Interface Message Handler API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
@@ -2048,7 +2046,7 @@
<unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
</component>
<component name="restricted_audio_output_api" long-name="Restricted Audio Output API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group"/>
+<unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group" filter="!test"/>
</component>
<component name="restricted_audio_output_msg_hdlr_api" long-name="Restricted Audio Output Message Handler API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
@@ -2057,7 +2055,7 @@
<unit bldFile="os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
</component>
<component name="sbc_encoder_interface_api" long-name="SBC Encoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/group" filter="!test"/>
</component>
<component name="sbc_encoder_interface_msg_hdlr_api" long-name="SBC Encoder Interface Message Handler API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
@@ -2069,7 +2067,7 @@
<unit bldFile="os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
</component>
<component name="speech_encoder_config_api" long-name="Speech Encoder Config API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_api/group"/>
+<unit bldFile="os/mm/mm_plat/speech_encoder_config_api/group" filter="!test"/>
</component>
<component name="speech_encoder_config_msg_hdlr_api" long-name="Speech Encoder Config Message Handler API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
@@ -2099,7 +2097,7 @@
<unit bldFile="os/mm/mm_plat/video_window_control_custom_interface/group"/>
</component>
<component name="wma_decoder_interface_api" long-name="WMA Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/group" filter="!test"/>
</component>
<component name="wma_decoder_interface_msg_hdlr_api" long-name="WMA Decoder Interface Message Handler API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
@@ -2258,7 +2256,7 @@
<component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
<unit bldFile="os/mm/devsound/devsoundrefplugin/group" mrp="os/mm/devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
</component>
-<component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" plugin="Y">
+<component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" deprecated="^4" plugin="Y">
<unit bldFile="os/mm/devsound/sounddevbt/group" mrp="os/mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
</component>
<component name="a3ftrace" long-name="A3F Trace Utility" introduced="^2" purpose="development">
@@ -2314,7 +2312,7 @@
<component name="ecam_face_tracking_custom_api" long-name="ECam Face Tracking Custom API" filter="s60" class="api">
<unit bldFile="os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
</component>
-<component name="ecam_use_case_hint_custom_api" long-name="ECam Use Case Hint Custom API" filter="s60" class="api">
+<component name="ecam_use_case_hint_custom_api" long-name="ECam Use Case Hint Custom API" filter="s60" introduced="^3" class="api">
<unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
</component>
</collection>
@@ -2759,7 +2757,7 @@
</component>
</collection>
</block>
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
+<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace analysis">
<collection name="stif" long-name="STIF" level="fw">
<component name="stif_plat" filter="s60" long-name="STIF Platform Interfaces" purpose="development" class="api">
<unit bldFile="os/osrndtools/stif/stif_plat/group"/>
@@ -2809,23 +2807,23 @@
<unit bldFile="os/osrndtools/stif/group"/>
</component>
</collection>
-<collection name="memspy" long-name="Memspy" level="trace">
-<component name="memspy_plat" filter="s60" long-name="Memspy Platform Interfaces" purpose="development" class="api">
+<collection name="memspy" long-name="MemSpy" level="trace">
+<component name="memspy_plat" filter="s60" long-name="MemSpy Platform Interfaces" purpose="development" class="api">
<unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
</component>
-<component name="driver" filter="s60" long-name="Memspy Driver" purpose="development">
+<component name="driver" filter="s60" long-name="MemSpy Driver" purpose="development">
<unit bldFile="os/osrndtools/memspy/driver/group"/>
</component>
-<component name="memspy_engine" filter="s60" long-name="Memspy Engine" purpose="development">
+<component name="memspy_engine" filter="s60" long-name="MemSpy Engine" purpose="development">
<unit bldFile="os/osrndtools/memspy/engine/group"/>
</component>
-<component name="commandline" filter="s60" long-name="Memspy Command Line" purpose="development">
+<component name="commandline" filter="s60" long-name="MemSpy Command Line" purpose="development">
<unit bldFile="os/osrndtools/memspy/commandline/group"/>
</component>
-<component name="console" filter="s60" long-name="Memspy Console" purpose="development">
+<component name="console" filter="s60" long-name="MemSpy Console" purpose="development">
<unit bldFile="os/osrndtools/memspy/console/group"/>
</component>
-<component name="memspy_build" filter="s60" long-name="Memspy Build" purpose="development">
+<component name="memspy_build" filter="s60" long-name="MemSpy Build" purpose="development">
<!-- move exports into self-contained component.-->
<unit bldFile="os/osrndtools/memspy/group"/>
</component>
@@ -2869,11 +2867,6 @@
<unit bldFile="os/osrndtools/hti/group"/>
</component>
</collection>
-<collection name="osrndtools_info" long-name="OS R&D tools Info" level="trace">
-<component name="osrndtools_metadata" long-name="OS R&D tools Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
-</component>
-</collection>
</block>
</layer>
<layer name="mw" long-name="Middleware" levels="generic specific">
@@ -3687,8 +3680,8 @@
</component>
</collection>
</block>
-<block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server generic utils">
-<collection name="ipcm_plat" long-name="IP Connectivity Management Platform Interfaces" level="utils">
+<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="access_point_engine_misc_api" long-name="Access Point Engine Misc API" filter="s60" class="api">
<unit bldFile="mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
</component>
@@ -3726,7 +3719,7 @@
<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
</component>
</collection>
-<collection name="ipcm_pub" long-name="IP Connectivity Management Public Interfaces" level="utils">
+<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">
<unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
</component>
@@ -3832,7 +3825,7 @@
<unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
</component>
</collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
+<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="api">
<component name="ipcm_build" filter="s60" long-name="IP Connectivity Management Build">
<!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
<unit bldFile="mw/ipconnmgmt/group"/>
@@ -4043,7 +4036,7 @@
</component>
</collection>
<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi" filter="s60" long-name="VPN API">
+<component name="vpnapi_impl" filter="s60" long-name="VPN API">
<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
</component>
</collection>
@@ -4143,7 +4136,7 @@
<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group" filter="!oem_build"/>
</component>
-<component name="vpnmanagementui" filter="s60" long-name="VPN Management UI" plugin="Y">
+<component name="vpnmanagementui" filter="s60" long-name="VPN Management UI" deprecated="^3" plugin="Y">
<unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
</component>
<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
@@ -4221,9 +4214,6 @@
<!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
<unit mrp="mw/ipappsrv/group"/>
</component>
-<component name="ipappsrv_metadata" long-name="IP App Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappsrv/ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
-</component>
</collection>
</block>
<block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="plugin framework server generic specific">
@@ -4466,7 +4456,7 @@
<unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
</component>
</collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="fw">
+<collection name="msgbranched" long-name="Messaging Branched" level="support">
<!-- collection is really a component. Need to move down a directory -->
<component name="msgbranched_build" filter="s60" long-name="Messaging Branched Build">
<unit bldFile="mw/messagingmw/msgbranched/group"/>
@@ -4600,7 +4590,7 @@
<component name="im_cache_server_api" long-name="IM Cache Server API" filter="s60" class="api">
<unit bldFile="mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
</component>
-<component name="presence_avabilitytext" long-name="Presence Availbility Text" filter="s60" class="api">
+<component name="presence_avabilitytext" long-name="Presence Availability Text" filter="s60" class="api">
<unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
</component>
</collection>
@@ -4682,12 +4672,6 @@
<unit bldFile="mw/legacypresence/xdmengine/group"/>
</component>
</collection>
-<collection name="xdmsettingsui" long-name="XDM Settings UI" level="ui">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
-<component name="xdmsettingsui_build" filter="s60" long-name="XDM Settings UI Build">
-<unit bldFile="mw/legacypresence/xdmsettingsui/group"/>
-</component>
-</collection>
<collection name="xdmprotocols" long-name="XDM Protocols" level="fw">
<!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
<component name="xdmprotocols_build" filter="s60" long-name="XDM Protocols Build">
@@ -4700,12 +4684,6 @@
<unit bldFile="mw/legacypresence/msgconnmanager/group"/>
</component>
</collection>
-<collection name="presencesettingsui" long-name="Presence Settings UI" level="ui">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="presencesettingsui_build" filter="s60" long-name="Presence Settings UI Build">
-<unit bldFile="mw/legacypresence/presencesettingsui/group"/>
-</component>
-</collection>
<collection name="simpleengine" long-name="SIMPLE Engine" level="engine">
<!-- collection is really a component. Need to move down a directory-->
<component name="simpleengine_build" filter="s60" long-name="SIMPLE Engine Build">
@@ -5045,37 +5023,37 @@
</block>
<block name="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
<collection name="upnpstack_plat" long-name="UPnP Stack Platform Interfaces" level="specific">
-<component name="upnpstack_plat" long-name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+<component name="upnp_device_api" long-name="UPnP Device API" purpose="optional" introduced="^3" class="api">
<unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_device_api/group"/>
</component>
-<component name="upnpstack_plat" long-name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+<component name="upnp_common_api" long-name="UPnP Common API" purpose="optional" introduced="^3" class="api">
<unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_common_api/group"/>
</component>
-<component name="upnpstack_plat" long-name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+<component name="upnp_utils_api" long-name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
<unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_utils_api/group"/>
</component>
-<component name="upnpstack_plat" long-name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
+<component name="upnp_control_point_api" long-name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
<unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_control_point_api/group"/>
</component>
-<component name="upnpstack_plat" long-name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+<component name="upnp_httpserver_api" long-name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
<unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_httpserver_api/group"/>
</component>
-<component name="upnpstack_plat" long-name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
+<component name="upnp_http_transfer_api" long-name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
<unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
</component>
</collection>
<collection name="servicediscoveryandcontrol" long-name="Service Discovery and Control" level="framework">
-<component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="^3" purpose="optional">
+<component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="^3" purpose="optional" filter="s60">
<unit bldFile="mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="mw/srvdiscovery/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
</component>
</collection>
<collection name="upnp" long-name="UPnP" level="server">
-<component name="upnpstack" long-name="UPnP Stack" introduced="^3" purpose="optional">
+<component name="upnpstack" long-name="UPnP Stack" introduced="^3" purpose="optional" filter="s60">
<unit bldFile="mw/srvdiscovery/upnp/upnpstack/group"/>
</component>
</collection>
<collection name="srvdiscovery_info" long-name="Service Discovery and Usage Info" level="specific">
-<component name="srvdiscovery_metadata" long-name="Service Discovery and Usage Metadata" introduced="^2" purpose="development" class="config PC">
+<component name="srvdiscovery_metadata" long-name="Service Discovery and Usage Metadata" introduced="^2" purpose="development" filter="s60" class="config PC">
<unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
</component>
</collection>
@@ -5292,19 +5270,19 @@
<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_api/group"/>
</component>
<component name="bluetooth_engine_connection_management_api" long-name="Bluetooth Engine Connection Management API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group"/>
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group" filter="!test"/>
</component>
<component name="bluetooth_engine_device_management_api" long-name="Bluetooth Engine Device Management API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group"/>
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group" filter="!test"/>
</component>
<component name="bluetooth_engine_discovery_api" long-name="Bluetooth Engine Discovery API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group"/>
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group" filter="!test"/>
</component>
<component name="bluetooth_engine_features_api" long-name="Bluetooth Engine Features API" filter="s60" class="api">
<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_features_api/group"/>
</component>
<component name="bluetooth_engine_settings_api" long-name="Bluetooth Engine Settings API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_settings_api/group"/>
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_settings_api/group" filter="!test"/>
</component>
<component name="bluetooth_engine_plugin_api" long-name="Bluetooth Engine Plugin API" filter="s60" class="api">
<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_plugin_api/group"/>
@@ -5330,7 +5308,7 @@
<unit bldFile="mw/btservices/bluetoothengine/btnotif/group"/>
</component>
<component name="btaudioman" filter="s60" long-name="Bluetooth Audio Manager">
-<unit bldFile="mw/btservices/bluetoothengine/btaudioman/group"/>
+<unit bldFile="mw/btservices/bluetoothengine/btaudioman/group" filter="!test"/>
</component>
<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
<unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
@@ -5339,7 +5317,7 @@
<unit bldFile="mw/btservices/bluetoothengine/btsac/group"/>
</component>
<component name="btaudiostreamer" filter="s60" long-name="Bluetooth Audio Streamer">
-<unit bldFile="mw/btservices/bluetoothengine/btaudiostreamer/group"/>
+<unit bldFile="mw/btservices/bluetoothengine/btaudiostreamer/group" filter="!test"/>
</component>
<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
<unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
@@ -5550,34 +5528,14 @@
</block>
<block name="metadatasrv" level="specific" long-name="Legacy Metadata Services" levels="plugin framework server generic specific">
<collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
-<component name="content_listing_framework_api" long-name="Content Listing Framework API" filter="s60" class="api">
-<!-- Leave commented out until confguration is in use
- unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
-</component>
<component name="media_fetch_api" long-name="Media Fetch API" filter="s60" class="api">
<unit bldFile="mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
</component>
-<component name="metadatasrv_pub_build" long-name="Legacy Metadata Services Public Interface Build" filter="s60" class="api">
-<!-- only needed for #ifdefs, remove when confguration is in use -->
-<unit bldFile="mw/metadatasrv/metadatasrv_pub/group"/>
-</component>
</collection>
<collection name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" level="specific">
<component name="media_fetch_implementation_api" long-name="Media Fetch Implementation API" filter="s60" class="api">
<unit bldFile="mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
</component>
-<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" filter="s60" class="api">
-<!-- Leave commented out until confguration is in use
- <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
-</component>
-<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" filter="s60" class="api">
-<!-- Leave commented out until confguration is in use
- <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
-</component>
-<component name="metadatasrv_plat_build" long-name="Legacy Metadata Services Platform Interface Build" filter="s60" class="api">
-<!-- only needed for #ifdefs, remove when confguration is in use -->
-<unit bldFile="mw/metadatasrv/metadatasrv_plat/group"/>
-</component>
</collection>
<collection name="mediamanagementutilities" long-name="Media Management Utilities" level="generic">
<component name="mediafetch" filter="s60" long-name="Media Fetch">
@@ -5703,112 +5661,112 @@
</block>
<block name="mmuifw" level="specific" long-name="Multimedia UI Framework" levels="mgr mdl util ui api">
<collection name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" level="api">
-<component name="alf_widgetfactory_api" long-name="ALF Widget Factory API" filter="s60" class="api">
+<component name="alf_widgetfactory_api" long-name="ALF Widget Factory API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetfactory_api/group"/>
</component>
-<component name="alf_widgetutils_api" long-name="ALF Widget Utils API" filter="s60" class="api">
+<component name="alf_widgetutils_api" long-name="ALF Widget Utils API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetutils_api/group"/>
</component>
-<component name="alf_widgetmodel_api" long-name="ALF Widget Model API" filter="s60" class="api">
+<component name="alf_widgetmodel_api" long-name="ALF Widget Model API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetmodel_api/group"/>
</component>
-<component name="osn_container_api" long-name="OSN Container API" filter="s60" class="api">
+<component name="osn_container_api" long-name="OSN Container API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/osn_container_api/group"/>
</component>
-<component name="osn_global_api" long-name="OSN Global API" filter="s60" class="api">
+<component name="osn_global_api" long-name="OSN Global API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/osn_global_api/group"/>
</component>
-<component name="osn_string_api" long-name="OSN String API" filter="s60" class="api">
+<component name="osn_string_api" long-name="OSN String API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/osn_string_api/group"/>
</component>
-<component name="alf_resourcepool_api" long-name="ALF Resource Pool API" filter="s60" class="api">
+<component name="alf_resourcepool_api" long-name="ALF Resource Pool API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/alf_resourcepool_api/group"/>
</component>
-<component name="alf_containerwidget_api" long-name="ALF Container Widget API" filter="s60" class="api">
+<component name="alf_containerwidget_api" long-name="ALF Container Widget API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/alf_containerwidget_api/group"/>
</component>
-<component name="alf_viewwidget_api" long-name="ALF View Widget API" filter="s60" class="api">
+<component name="alf_viewwidget_api" long-name="ALF View Widget API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/alf_viewwidget_api/group"/>
</component>
-<component name="alf_scrollbarwidget_api" long-name="ALF Scrollbar Widget API" filter="s60" class="api">
+<component name="alf_scrollbarwidget_api" long-name="ALF Scrollbar Widget API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/alf_scrollbarwidget_api/group"/>
</component>
-<component name="alf_customlayoutmanagers_api" long-name="ALF Custom Layout Managers API" filter="s60" class="api">
+<component name="alf_customlayoutmanagers_api" long-name="ALF Custom Layout Managers API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
</component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" class="api">
+<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/gesturehelper_api/group"/>
</component>
-<component name="mul_coverflowwidget_api" long-name="MUL Coverflow Widget API" filter="s60" class="api">
+<component name="mul_coverflowwidget_api" long-name="MUL Coverflow Widget API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/mul_coverflowwidget_api/group"/>
</component>
-<component name="mul_datamodel_api" long-name="MUL Data Model API" filter="s60" class="api">
+<component name="mul_datamodel_api" long-name="MUL Data Model API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/mul_datamodel_api/group"/>
</component>
-<component name="mul_sliderwidget_api" long-name="MUL Slider Widget API" filter="s60" class="api">
+<component name="mul_sliderwidget_api" long-name="MUL Slider Widget API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/mul_sliderwidget_api/group"/>
</component>
-<component name="mul_widget_api" long-name="MUL Widget API" filter="s60" class="api">
+<component name="mul_widget_api" long-name="MUL Widget API" filter="s60" deprecated="^3" class="api">
<unit bldFile="mw/mmuifw/mmuifw_plat/mul_widget_api/group"/>
</component>
</collection>
<collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="ui">
-<component name="mmuifw_build" filter="s60" long-name="Multimedia UI Framework Build">
+<component name="mmuifw_build" filter="s60" long-name="Multimedia UI Framework Build" deprecated="^3">
<!-- Move exports into other componetns or remove all #includes and make this a ROM component -->
<unit bldFile="mw/mmuifw/group"/>
</component>
</collection>
<collection name="osncore" long-name="OS Neutral Library Core" level="util">
<!-- collection is really a component. Move down a directory -->
-<component name="osncore_build" filter="s60" long-name="OSN Core Build">
+<component name="osncore_build" filter="s60" long-name="OSN Core Build" deprecated="^3">
<unit bldFile="mw/mmuifw/osncore/group"/>
</component>
</collection>
<collection name="alfwidgetutils" long-name="Accelerated LAF Widget Utils" level="ui">
<!-- collection is really a component. Move down a directory -->
-<component name="alfwidgetutils_build" filter="s60" long-name="ALF Widget Utils">
+<component name="alfwidgetutils_build" filter="s60" long-name="ALF Widget Utils" deprecated="^3">
<unit bldFile="mw/mmuifw/alfwidgetutils/group"/>
</component>
</collection>
<collection name="resourcepool" long-name="Resource Pool" level="util">
<!-- collection is really a component. Move down a directory -->
-<component name="alfresourcepool" filter="s60" long-name="ALF Resource Pool">
+<component name="alfresourcepool" filter="s60" long-name="ALF Resource Pool" deprecated="^3">
<unit bldFile="mw/mmuifw/resourcepool/group"/>
</component>
</collection>
<collection name="widgetmodel" long-name="Widget Model" level="mdl">
<!-- collection is really a component. Move down a directory -->
-<component name="widgetmodel_build" filter="s60" long-name="Widget Model Build">
+<component name="widgetmodel_build" filter="s60" long-name="Widget Model Build" deprecated="^3">
<unit bldFile="mw/mmuifw/widgetmodel/group"/>
</component>
</collection>
<collection name="mulwidgets" long-name="MUL Widgets" level="ui">
<!-- should spell out MUL in the collection name -->
-<component name="mullogging" filter="s60" long-name="MUL Logging">
+<component name="mullogging" filter="s60" long-name="MUL Logging" deprecated="^3">
<unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
</component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
+<component name="muldatamodel" filter="s60" long-name="MUL Data Model" deprecated="^3">
<unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
</component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
+<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils" deprecated="^3">
<unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
</component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
+<component name="gesturehelper" filter="s60" long-name="Gesture Helper" deprecated="^3">
<unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
</component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
+<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget" deprecated="^3">
<unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
</component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
+<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget" deprecated="^3">
<unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
</component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
+<component name="alfviewwidget" filter="s60" long-name="ALF View Widget" deprecated="^3">
<unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
</component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
+<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget" deprecated="^3">
<unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
</component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
+<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget" deprecated="^3">
<unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
</component>
</collection>
@@ -5816,10 +5774,10 @@
<block name="videoutils" level="specific" long-name="Video Utils" levels="eng util if">
<collection name="videoutils_plat" long-name="Video Utils Platform Interfaces" level="if">
<component name="videoscheduler_api" long-name="Video Scheduler API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
+<unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/group" filter="!test"/>
</component>
<component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
+<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group" filter="!test"/>
</component>
<component name="videoplayer_constants_api" long-name="Videoplayer Constants API" filter="s60" class="api">
<unit bldFile="mw/videoutils/videoutils_plat/videoplayer_constants_api/group"/>
@@ -7961,10 +7919,10 @@
</component>
</collection>
<collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="if">
-<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
+<component name="uitools_cdl_api" long-name="CDL API" filter="s60" class="api">
<unit bldFile="mw/uitools/uitools_plat/cdl_api/group"/>
</component>
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
+<component name="uitools_layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
<unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
</component>
</collection>
@@ -8009,11 +7967,9 @@
</component>
</collection>
</block>
-<!-- <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition.xml"/> -->
</layer>
<layer name="app" long-name="Applications" levels="services apps">
<block name="location" level="apps" long-name="Location Apps" levels="ui events loc apps">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="apps"/>
<collection name="loc_pub" long-name="Location Apps Public Interfaces" level="apps">
<component name="landmarks_ui_selector_api" long-name="Landmarks UI Selector API" filter="s60" class="api">
<unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/group"/>
@@ -8547,29 +8503,29 @@
</block>
<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
<collection name="devicediagnostics" long-name="Device Diagnostics" level="app">
-<component name="devdiagapp" filter="s60" long-name="Device Diagnostics App">
+<component name="devdiagapp" filter="s60" long-name="Device Diagnostics App" deprecated="^3">
<unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
</component>
-<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
+<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" deprecated="^3" plugin="Y">
<unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
</component>
-<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
+<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" deprecated="^3" plugin="Y">
<unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
</component>
-<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
+<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" deprecated="^3" plugin="Y">
<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
</component>
-<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
+<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build" deprecated="^3">
<!-- can the exports be moved to one of the other components?
or all #includes removed from here, and it renamed Device Diagnostics ROM -->
<unit bldFile="app/devicecontrol/devicediagnostics/group"/>
</component>
</collection>
<collection name="omadm" long-name="OMA Device Management" level="oma">
-<component name="omadmappui" filter="s60" long-name="OMA DM Application UI">
+<component name="omadmappui" filter="s60" long-name="OMA DM Application UI" deprecated="^3">
<unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
</component>
-<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" plugin="Y">
+<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" deprecated="^3" plugin="Y">
<unit bldFile="app/devicecontrol/omadm/omadmextensions/group"/>
</component>
<component name="dcmo" filter="s60" long-name="Device Capabilities Management Object" introduced="^3" plugin="Y">
@@ -8577,7 +8533,7 @@
</component>
</collection>
<collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-<component name="pnpms" filter="s60" long-name="PnP MS">
+<component name="pnpms" filter="s60" long-name="PnP MS" deprecated="^3">
<unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
</component>
</collection>
@@ -9759,10 +9715,10 @@
<block name="camera" level="apps" long-name="Camera Apps">
<collection name="camera_plat" long-name="Camera Apps Platform Interfaces">
<component name="camcorder_ui_constants_api" long-name="Camcorder UI Constants API" filter="s60" class="api">
-<unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/group"/>
+<unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/group" filter="!test"/>
</component>
<component name="active_palette_2_api" long-name="Active Palette 2 API" filter="s60" class="api">
-<unit bldFile="app/camera/camera_plat/active_palette_2_api/group"/>
+<unit bldFile="app/camera/camera_plat/active_palette_2_api/group" filter="!test"/>
</component>
</collection>
<collection name="camerauis" long-name="Camera UIs">
@@ -9774,7 +9730,6 @@
<unit bldFile="app/camera/camerauis/cameraapp/help/group"/>
</component>
</collection>
-<collection name="camera_info" long-name="Camera Apps Info"/>
</block>
<block name="imgeditor" level="apps" long-name="Image Editor Apps" levels="engine ui">
<collection name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" level="ui">
@@ -10310,7 +10265,7 @@
</component>
</collection>
<collection name="taskswitcher" long-name="Task Switcher" level="support">
-<component name="contextengine" filter="s60" long-name="Context Engine" introduced="^3">
+<component name="hs_contextengine" filter="s60" long-name="Context Engine" introduced="^3">
<unit bldFile="app/homescreen/taskswitcher/contextengine/group"/>
</component>
<component name="taskswitcherui" filter="s60" long-name="Task Switcher UI" introduced="^3">
@@ -10739,7 +10694,7 @@
</collection>
<collection name="techviewplat" long-name="Techview Platform" level="services"/>
<collection name="techviewui" long-name="Techview UI" level="ui"/>
-<collection name="controlpanel" long-name="Control Panel" level="ui"/>
+<collection name="tv_controlpanel" long-name="Control Panel" level="ui"/>
<collection name="pimapps" long-name="PIM Apps" level="apps3"/>
<collection name="securityapps" long-name="Security Apps" level="apps3"/>
<collection name="utilityapps" long-name="Utility Apps" level="apps2"/>