FCL/sftools/fbf/projects/platforms: comparison symbian3/single/sysdefs/system_model

equal deleted inserted replaced

-:ce8543a6aaaa
+:79fffd551b70
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition xmlns:qt="http://www.nokia.com/qt" id-namespace="http://www.symbian.org/system-definition" schema="3.0.0">
 <systemModel name="Symbian^3">
-<layer id="adaptation" name="Adaptation" levels="low mw high">
+<layer id="adapt" name="Adaptation" levels="low mw high">
 <package id="stubs" tech-domain="hb" level="high" name="Stubs" levels="stub">
 <collection id="s60_stubs" level="stub">
 <component id="audiostubs" name="Audio Stubs">
-<unit bldFile="/adaptation/stubs/audiostubs/group"/>
+<unit bldFile="/adapt/stubs/audiostubs/group"/>
 </component>
-<component id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub">
+<component id="btaudioadapt_stub" name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="/adaptation/stubs/btaudioadaptation_stub/group"/>
+<unit bldFile="/adapt/stubs/btaudioadapt_stub/group"/>
 </component>
 <component id="drm_stubs" name="DRM Stubs">
-<unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="/adapt/stubs/drm_stubs/group"/>
 </component>
 <component id="ocrsrv_stub" name="OCR Services Stub">
-<unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="/adapt/stubs/ocrsrv_stub/group"/>
 </component>
 <component id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="/adapt/stubs/omasuplasnconverterstubimpl/group"/>
 </component>
 <component id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" class="plugin">
-<unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="/adapt/stubs/posmsgpluginreferenceimpl/group"/>
 </component>
 <component id="srsfenginestub" name="SRSF Engine Stub">
-<unit bldFile="/adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="/adapt/stubs/srsfenginestub/group"/>
 </component>
 <component id="power_save_display_mode_stub" name="Power Save Display Mode Stub">
-<unit bldFile="/adaptation/stubs/power_save_display_mode_stub/group"/>
+<unit bldFile="/adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 <component id="systemswstubs" name="System Software Stubs">
-<unit bldFile="/adaptation/stubs/systemswstubs/group"/>
+<unit bldFile="/adapt/stubs/systemswstubs/group"/>
 </component>
 <component id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" class="plugin">
-<unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="/adapt/stubs/tactileclickplugin_stub/group"/>
 </component>
 <component id="wlanhwinit_stub" name="WLAN Hardware Init Stub">
-<unit bldFile="/adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="/adapt/stubs/wlanhwinit_stub/group"/>
 </component>
 </collection>
 </package>
 <package id="beagleboard" tech-domain="hb" level="low" name="Beagle Board" levels="hw-if">
 <collection id="omap3530" name="OMAP 3530" level="hw-if">
 <component id="omap3530_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530" mrp="/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+<unit bldFile="/adapt/beagleboard/omap3530" mrp="/adapt/beagleboard/omap3530/base_beagle.mrp"/>
 </component>
 <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="/adapt/beagleboard/omap3530/kernel"/>
 </component>
 <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="/adapt/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>
 </package>
 <package id="qemu" tech-domain="hb" level="low" name="QEMU and Baseport" levels="hw-if">
 <collection id="qemu_baseport" name="Baseport" level="hw-if">
 <component id="syborg" name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/qemu/baseport/syborg" mrp="/adaptation/qemu/baseport/syborg/syborg.mrp"/>
+<unit bldFile="/adapt/qemu/baseport/syborg" mrp="/adapt/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>
 </package>
 </layer>
 <layer id="os" name="OS" levels="hw services">
-<package id="kernelhwsrv" level="hw" tech-domain="hb" name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+<package id="kernelhwsrv" level="hw" tech-domain="hb" name="Kernel and Hardware Services" levels="hw-if adapt framework test">
 <collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
 <component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
 <unit mrp="/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
 </component>
 </collection>
 <collection id="bsptemplate" name="Board Support Package Template" level="hw-if">
 <component id="asspandvariant" name="Template ASSP and Variant" introduced="6.0" purpose="development">
 <unit bldFile="/os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="/os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
 </component>
 </collection>
-<collection id="kernel" name="Kernel Architecture" level="adaptation">
+<collection id="kernel" name="Kernel Architecture" level="adapt">
 <component id="eka" name="Kernel Architecture" introduced="8.0" purpose="mandatory">
 <unit bldFile="/os/kernelhwsrv/kernel/eka" mrp="/os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
 </component>
 </collection>
 <collection id="kerneltest" name="Kernel Test" level="hw-if">
 </component>
 <component id="f32test" name="File Server Tests" purpose="development">
 <unit bldFile="/os/kernelhwsrv/kerneltest/f32test/group" mrp="/os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
 </component>
 </collection>
-<collection id="ldds" name="Logical Device Drivers" level="adaptation">
+<collection id="ldds" name="Logical Device Drivers" level="adapt">
 <component id="ethernetldd" name="Ethernet Drivers" purpose="optional">
 <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
 </component>
 <component id="audioldd" name="Audio Drivers" introduced="8.1b" purpose="optional">
 <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/soundsc" mrp="/os/kernelhwsrv/kernel/eka/drivers/soundsc/base_e32_drivers_sound.mrp"/>
 <component id="ossrv_metadata" name="Generic OS Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
 </component>
 </collection>
 </package>
-<package id="persistentdata" level="services" tech-domain="hb" name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="persistentdata" level="services" tech-domain="hb" name="Persistent Data Services" levels="adapt hw-if plugin framework server app-if">
 <collection id="featuremgmt" name="Feature Management" level="framework">
 <component id="featuremgr" name="Feature Manager" introduced="^3" purpose="mandatory">
 <unit bldFile="/os/persistentdata/featuremgmt/featuremgr/group" mrp="/os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
 </component>
 <component id="featureregistry" name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
 <component id="persistentdata_metadata" name="Persistent Data Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
 </component>
 </collection>
 </package>
-<package id="devicesrv" level="services" tech-domain="hb" name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="devicesrv" level="services" tech-domain="hb" name="Device Services" levels="adapt hw-if plugin framework server app-if">
 <collection id="devicesrv_pub" name="Device Services Public Interfaces" level="app-if">
 <component id="platform_path_definitions_api" name="Platform Path Definitions API" class="api" filter="s60,bldmefirst">
 <unit bldFile="/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
 </component>
 <component id="common_platform_security_definitions_api" name="Common Platform Security Definitions API" class="api" filter="s60">
 <component id="security_metadata" name="OS Security Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/security/security_info/security_metadata/security_metadata.mrp"/>
 </component>
 </collection>
 </package>
-<package id="lbs" level="services" tech-domain="lo" name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+<package id="lbs" level="services" tech-domain="lo" name="Locating Services" levels="hw-if data-acquisition adapt management application-interface">
 <collection id="datasourcemodules" name="Generic Positioning Plugins" level="data-acquisition">
 <component id="defaultpositioningmodule" name="Default Positioning Module" introduced="^2" purpose="optional" class="plugin">
 <unit bldFile="/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
 </component>
 <component id="bluetoothgpspositioningmodule" name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" class="plugin">
 </component>
 <component id="locationapesuplpsy" name="APE SUPL PSY" introduced="^3" purpose="optional" class="plugin" filter="s60">
 <unit bldFile="/os/lbs/datasourcemodules/locationapesuplpsy/group"/>
 </component>
 </collection>
-<collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
+<collection id="datasourceadapt" name="Data Source Adaptation" level="adapt">
-<component id="gpsdatasourceadaptation" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
+<component id="gpsdatasourceadapt" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
-<unit bldFile="/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+<unit bldFile="/os/lbs/datasourceadapt/gpsdatasourceadapt/group" mrp="/os/lbs/datasourceadapt/gpsdatasourceadapt/group/lbs_gps_data_source_adapt.mrp"/>
 </component>
 </collection>
 <collection id="locationrequestmgmt" name="Location Request Management" level="application-interface">
 <component id="locationserver" name="Location Server" introduced="9.2" purpose="optional">
 <unit bldFile="/os/lbs/locationrequestmgmt/locationserver/group" mrp="/os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
 </component>
 <component id="networkgateway" name="Network Gateway" introduced="9.2" purpose="optional">
 <unit bldFile="/os/lbs/locationmgmt/networkgateway/group" mrp="/os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
 </component>
 </collection>
-<collection id="networkprotocolmodules" name="Network Protocol Modules" level="adaptation">
+<collection id="networkprotocolmodules" name="Network Protocol Modules" level="adapt">
 <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
 <unit bldFile="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
 <component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <component id="commstools" name="Comms Tools" introduced="^3" purpose="development" target="desktop">
 <unit bldFile="/os/commsfw/commsfwtools/commstools/group" mrp="/os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
 </component>
 </collection>
 </package>
-<package id="networkingsrv" level="services" tech-domain="dc" name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="networkingsrv" level="services" tech-domain="dc" name="Networking Services" levels="adapt hw-if plugin framework server app-if">
 <collection id="esockapiextensions" name="ESock API Extensions" level="app-if">
 <component id="internetsockets" name="Internet Sockets" introduced="ER5" purpose="mandatory">
 <unit bldFile="/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
 </component>
 </collection>
 <component id="wlan_metadata" name="WLAN Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
 </component>
 </collection>
 </package>
-<package id="cellularsrv" level="services" tech-domain="vc" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="cellularsrv" level="services" tech-domain="vc" name="Cellular Baseband Services" levels="adapt hw-if plugin framework server app-if">
 <collection id="basebandabstraction" name="Baseband Abstraction" level="hw-if">
 <component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
 <unit bldFile="/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
 </component>
 </collection>
-<collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
+<collection id="basebandadaptplugins" name="Baseband Adaptation Plugins" level="adapt">
 <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
-<unit bldFile="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
+<unit bldFile="/os/cellularsrv/basebandadaptplugins/basebandchanneladaptorforc32/group" mrp="/os/cellularsrv/basebandadaptplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
 </component>
 </collection>
 <collection id="fax" name="Fax" level="server">
 <component id="faxclientandserver" name="Fax Client and Server" purpose="optional">
 <unit bldFile="/os/cellularsrv/fax/faxclientandserver/Group" mrp="/os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
 </component>
 <component id="cellularsrv_metadata" name="Cellular Baseband Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
 </component>
 </collection>
-<collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adaptation">
+<collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adapt">
 <component id="mocksy" name="MockSY" introduced="^2" purpose="development" class="plugin">
 <unit bldFile="/os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="/os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
 </component>
 </collection>
 <collection id="cellularsrvapitest" name="Telephony API Tests" level="app-if">
 <component id="wapmessageapi" name="WAP Message API" purpose="development">
 <unit mrp="/os/cellularsrv/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp" bldFile="/os/cellularsrv/wapstack/wapmessageapi/group"/>
 </component>
 </collection>
 </package>
-<package id="bt" level="services" tech-domain="de" name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+<package id="bt" level="services" tech-domain="de" name="Bluetooth" levels="adapt hw-if plugin framework server app-if">
 <collection id="bt_plat" name="Bluetooth Platform Interfaces" level="app-if">
-<component id="bluetooth_audio_adaptation_api" name="Bluetooth Audio Adaptation API" class="api" filter="s60">
+<component id="bluetooth_audio_adapt_api" name="Bluetooth Audio Adaptation API" class="api" filter="s60">
-<unit bldFile="/os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+<unit bldFile="/os/bt/bt_plat/bluetooth_audio_adapt_api/group"/>
 </component>
 <component id="bluetooth_power_management_api" name="Bluetooth Power Management API" class="api" filter="s60">
 <unit bldFile="/os/bt/bt_plat/bluetooth_power_management_api/group"/>
 </component>
 <component id="at_command_handler_plugin_api" name="AT Command Handler Plugin API" class="api" filter="s60">
 <component id="bt_metadata" name="Bluetooth Metadata" class="config" introduced="^3" purpose="development" target="desktop">
 <unit mrp="/os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
 </component>
 </collection>
 </package>
-<package id="usb" level="services" tech-domain="de" name="USB" levels="adaptation hw-if plugin framework server app-if">
+<package id="usb" level="services" tech-domain="de" name="USB" levels="adapt hw-if plugin framework server app-if">
 <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
 <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
 </collection>
 <collection id="usbmgmt" name="USB Management" level="server">
 <component id="usbmgr" name="USB Manager" purpose="optional">
 <component id="usb_metadata" name="USB Metadata" class="config" introduced="^3" purpose="development" target="desktop">
 <unit mrp="/os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
 </component>
 </collection>
 </package>
-<package id="mm" level="services" tech-domain="mm" name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+<package id="mm" level="services" tech-domain="mm" name="Multimedia" levels="adapt hw-if device-fw devices middleware app-if">
 <collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
 <component id="audio_effects_api" name="Audio Effects API" class="api" filter="s60">
 <unit bldFile="/os/mm/mm_pub/audio_effects_api/group"/>
 </component>
 <component id="audio_effects_presets_api" name="Audio Effects Presets API" class="api" filter="s60">
 <unit bldFile="/os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
 </component>
 <component id="custom_interface_utility_api" name="Custom Interface Utility API" class="api" filter="s60">
 <unit bldFile="/os/mm/mm_plat/custom_interface_utility_api/group"/>
 </component>
-<component id="devsound_adaptation_api" name="DevSound Adaptation API" class="api" filter="s60">
+<component id="devsound_adapt_api" name="DevSound Adaptation API" class="api" filter="s60">
-<unit bldFile="/os/mm/mm_plat/devsound_adaptation_api/group"/>
+<unit bldFile="/os/mm/mm_plat/devsound_adapt_api/group"/>
 </component>
 <component id="display_posting_api" name="Display Posting API" class="api" filter="s60">
 <unit bldFile="/os/mm/mm_plat/display_posting_api/group"/>
 </component>
 <component id="eaac_plus_decoder_interface_api" name="eAAC Plus Decoder Interface API" class="api" filter="s60">
 <unit bldFile="/os/mm/mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
 </component>
 <component id="error_concealment_interface_proxy_api" name="Error Concealment Interface Proxy API" class="api" filter="s60">
 <unit bldFile="/os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
 </component>
-<component id="fm_radio_adaptation_api" name="FM Radio Adaptation API" class="api" filter="s60">
+<component id="fm_radio_adapt_api" name="FM Radio Adaptation API" class="api" filter="s60">
-<unit bldFile="/os/mm/mm_plat/fm_radio_adaptation_api/group"/>
+<unit bldFile="/os/mm/mm_plat/fm_radio_adapt_api/group"/>
 </component>
 <component id="g711_decoder_interface_api" name="G711 Decoder Interface API" class="api" filter="s60">
 <unit bldFile="/os/mm/mm_plat/g711_decoder_interface_api/group"/>
 </component>
 <component id="g711_decoder_interface_msg_hdlr_api" name="G711 Decoder Interface Message Handler API" class="api" filter="s60">
 <unit bldFile="/os/mm/mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
 </component>
 <component id="ra8_decoder_interface_proxy_api" name="RA8 Decoder Interface Proxy API" class="api" filter="s60">
 <unit bldFile="/os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
 </component>
-<component id="rds_adaptation_api" name="RDS Adaptation API" class="api" filter="s60">
+<component id="rds_adapt_api" name="RDS Adaptation API" class="api" filter="s60">
-<unit bldFile="/os/mm/mm_plat/rds_adaptation_api/group"/>
+<unit bldFile="/os/mm/mm_plat/rds_adapt_api/group"/>
 </component>
 <component id="restricted_audio_output_api" name="Restricted Audio Output API" class="api" filter="s60">
 <unit bldFile="/os/mm/mm_plat/restricted_audio_output_api/group"/>
 </component>
 <component id="restricted_audio_output_msg_hdlr_api" name="Restricted Audio Output Message Handler API" class="api" filter="s60">
 <component id="speechrecogsupport" name="Speech Recognition Support" introduced="7.0s" purpose="mandatory">
 <unit bldFile="/os/mm/mmdevicefw/speechrecogsupport/group" mrp="/os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
 </component>
 </collection>
-<collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
+<collection id="mmswadapt" name="Multimedia Software Adaptation" level="adapt">
 <component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="/os/mm/mmswadaptation/videorenderer/group" mrp="/os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
+<unit bldFile="/os/mm/mmswadapt/videorenderer/group" mrp="/os/mm/mmswadapt/videorenderer/group/multimedia_videorenderer.mrp"/>
 </component>
 </collection>
 <collection id="mmtestenv" name="Multimedia Test Environment" level="device-fw">
 <component id="a3fsrvstart" name="A3F Server Start" introduced="^2" purpose="optional" class="plugin">
 <unit bldFile="/os/mm/devsound/a3fsrvstart/group" mrp="/os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
 </component>
 </collection>
-<collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adapt">
 <component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
 <unit bldFile="/os/mm/devsound/hwdevapi/group" mrp="/os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
 </component>
 <component id="a3facl" name="A3F Audio Component Library" introduced="^2" purpose="development">
 <unit bldFile="/os/mm/mmhais/a3facl/group" mrp="/os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
 </component>
 <component id="a3fdevsoundcustomisation" name="A3F DevSound Customisation" introduced="^2" purpose="optional">
-<unit bldFile="/os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="/os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
+<unit bldFile="/os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="/os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptinfo.mrp"/>
 </component>
 <component id="refacladapt" name="Reference ACL Adaptation" introduced="^2" purpose="optional">
-<unit bldFile="/os/mm/mmhais/refacladapt/group" mrp="/os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
+<unit bldFile="/os/mm/mmhais/refacladapt/group" mrp="/os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladapt.mrp"/>
 </component>
 <component id="videohai" name="Video HAI" introduced="7.0s" purpose="mandatory">
 <unit bldFile="/os/mm/mmhais/videohai/group" mrp="/os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
 </component>
 <component id="dvbhreceiverhai" name="Mobile TV DVB-H Receiver HAI" introduced="^2" purpose="optional">
 <unit bldFile="/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
 </component>
 </collection>
 </package>
-<package id="imagingext" level="services" tech-domain="mm" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+<package id="imagingext" level="services" tech-domain="mm" name="Imaging Extensions" levels="adapt hw-if plugin framework server app-if">
 <collection id="imagingext_pub" name="Imaging Extensions Public Interfaces" level="app-if">
 <component id="exif_api" name="Exif API" class="api" filter="s60">
 <unit bldFile="/os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
 </component>
 </component>
 <component id="ecam_use_case_hint_custom_api" name="ECam Use Case Hint Custom API" class="api" filter="s60">
 <unit bldFile="/os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
 </component>
 </collection>
-<collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
+<collection id="imageadaptextensions" name="Image Adaptation Extensions" level="app-if">
 <component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
-<unit bldFile="/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
+<unit bldFile="/os/imagingext/imageadaptextensions/iclextjpegapi/group"/>
 </component>
-<component id="imageadaptationextensions_build" filter="s60" name="Image Adaptation Extensions Build">
+<component id="imageadaptextensions_build" filter="s60" name="Image Adaptation Extensions Build">
 <!--  Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
-<unit bldFile="/os/imagingext/imageadaptationextensions/group"/>
+<unit bldFile="/os/imagingext/imageadaptextensions/group"/>
 </component>
 </collection>
 <collection id="imagingmodules" name="Imaging Modules" level="hw-if">
 <component id="exiflib" filter="s60" name="Exif Library">
 <unit bldFile="/os/imagingext/imagingmodules/exiflib/group"/>
 <component id="jp2kcodec" filter="s60" name="JPEG2000 Decoder Plugin" class="plugin">
 <unit bldFile="/os/imagingext/imagingmodules/jp2kcodec/group"/>
 </component>
 </collection>
 </package>
-<package id="graphics" level="services" tech-domain="ui" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+<package id="graphics" level="services" tech-domain="ui" name="Graphics" levels="adapt engines internal-adapts device-interface internal-utils app-if">
-<collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+<collection id="graphicsaccelaration" name="Graphics Acceleration" level="adapt">
 <component id="vgi" filter="s60" name="VGI">
 <unit bldFile="/os/graphics/graphicsaccelaration/vgi/group"/>
 </component>
 </collection>
-<collection id="m3g" name="Mobile 3D Graphics" level="internal-adaptations">
+<collection id="m3g" name="Mobile 3D Graphics" level="internal-adapts">
 <component id="m3gcore11" filter="s60" name="M3G Core 1.1">
 <unit bldFile="/os/graphics/m3g/m3gcore11/group"/>
 </component>
 </collection>
 <collection id="graphicsresourceservices" name="Graphics Resource Services" level="engines">
 <component id="graphicsresource" name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional">
 <unit bldFile="/os/graphics/graphicsresourceservices/graphicsresource/group" mrp="/os/graphics/graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
 </component>
-<component id="graphicsresourceadaptation" name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+<component id="graphicsresourceadapt" name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
+<unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceadapt/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceadapt/group/graphics_graphicsresourceadapter.mrp"/>
 </component>
 </collection>
 <collection id="graphicsutils" name="Graphics Utils" level="engines">
 <component id="commongraphicsheaders" name="Common Graphics Headers" introduced="^3" purpose="mandatory">
 <unit bldFile="/os/graphics/graphicsutils/commongraphicsheaders/group" mrp="/os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
 </component>
 </collection>
-<collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adaptation">
+<collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adapt">
 <!-- displayldd to be moved here -->
 <component id="surfacemgr" name="Surface Manager" introduced="^3" purpose="optional">
 <unit bldFile="/os/graphics/graphicshwdrivers/surfacemgr/group" mrp="/os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
 </component>
 </collection>
 <collection id="fbs" name="Font and Bitmap Server" level="device-interface">
 <component id="fontandbitmapserver" name="Font and Bitmap Server" purpose="mandatory">
 <unit bldFile="/os/graphics/fbs/fontandbitmapserver/group" mrp="/os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
 </component>
 </collection>
-<collection id="opengles" name="OpenGLES" level="internal-adaptations">
+<collection id="opengles" name="OpenGLES" level="internal-adapts">
 <component id="openglesinterface" name="OpenGL ES Interface" introduced="8.0" purpose="optional">
 <unit bldFile="/os/graphics/opengles/openglesinterface/group" mrp="/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
 </component>
 <component id="opengles_stub" filter="sf_build" name="OpenGL ES Stub" purpose="optional" introduced="^2">
 <unit bldFile="/os/graphics/opengles/openglesinterface/group/opengles_stub"/>
 </component>
 </collection>
-<collection id="openvg" name="OpenVG" level="internal-adaptations">
+<collection id="openvg" name="OpenVG" level="internal-adapts">
 <component id="openvginterface" name="OpenVG Interface" introduced="^2" purpose="optional">
 <unit bldFile="/os/graphics/openvg/openvginterface/group" mrp="/os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
 </component>
 <component id="openvg11" filter="s60" name="OpenVG 1.1">
 <!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
 </component>
 <component id="sfopenvg" filter="sf_build" name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
 <unit bldFile="/os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
 </component>
 </collection>
-<collection id="egl" name="EGL" level="internal-adaptations">
+<collection id="egl" name="EGL" level="internal-adapts">
 <component id="eglinterface" name="EGL Interface" introduced="^2" purpose="optional">
 <unit bldFile="/os/graphics/egl/eglinterface/group" mrp="/os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
 </component>
 <component id="eglswitch" name="EGL Switch" introduced="^3" purpose="optional">
 <unit bldFile="/os/graphics/egl/eglswitch/group" mrp="/os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
 <unit bldFile="/os/graphics/graphicsdeviceinterface/directgdi/group" mrp="/os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
 </component>
 <component id="directgdiinterface" name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional">
 <unit bldFile="/os/graphics/graphicsdeviceinterface/directgdiinterface/group" mrp="/os/graphics/graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
 </component>
-<component id="directgdiadaptation" name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+<component id="directgdiadapt" name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="/os/graphics/graphicsdeviceinterface/directgdiadaptation/group" mrp="/os/graphics/graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
+<unit bldFile="/os/graphics/graphicsdeviceinterface/directgdiadapt/group" mrp="/os/graphics/graphicsdeviceinterface/directgdiadapt/group/graphics_directgdiadapter.mrp"/>
 </component>
 </collection>
 <collection id="graphicstools" name="Graphics Tools" level="internal-utils">
 <component id="gdi_tools" name="GDI Tools" purpose="development" target="desktop">
 <unit bldFile="/os/graphics/graphicstools/gdi_tools/group" mrp="/os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
 </component>
 <component id="richtexttohtmlconverter" name="RichText to HTML Converter" introduced="7.0s" purpose="optional" class="plugin">
 <unit bldFile="/mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="/mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
 </component>
 </collection>
-<collection id="hwresourceadaptation" name="Hardware Resource Adaptation" level="generic">
+<collection id="hwresourceadapt" name="Hardware Resource Adaptation" level="generic">
 <component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" class="plugin">
-<unit bldFile="/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+<unit bldFile="/mw/appsupport/hwresourceadapt/hwresourcemgruiplugin/group" mrp="/mw/appsupport/hwresourceadapt/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
 </component>
 </collection>
 <collection id="commonappservices" name="Common Application Services" level="framework">
 <component id="alarmserver" name="Alarm Server" introduced="7.0" purpose="optional">
 <unit bldFile="/mw/appsupport/commonappservices/alarmserver/Group" mrp="/mw/appsupport/commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
 <unit bldFile="/mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
 </component>
 <component id="lockapp_server_api" name="Lock Application Server API" class="api" filter="s60">
 <unit bldFile="/mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
 </component>
-<component id="devencadaptation_api" name="Device Encryption Adaptation API" class="api" filter="s60">
+<component id="devencadapt_api" name="Device Encryption Adaptation API" class="api" filter="s60">
-<unit bldFile="/mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+<unit bldFile="/mw/securitysrv/secsrv_plat/devencadapt_api/group"/>
 </component>
 <component id="devenccommonutils_api" name="Device Encryption Common Utils API" class="api" filter="s60">
 <unit bldFile="/mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
 </component>
 </collection>
 <unit bldFile="/app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
 </component>
 <component id="vas_vcommand_api" name="VAS Voice Command API" class="api" filter="s60">
 <unit bldFile="/app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
 </component>
-<component id="adaptation_hw_device_api" name="Adaptation Hardware Device API" class="api" filter="s60">
+<component id="adapt_hw_device_api" name="Adaptation Hardware Device API" class="api" filter="s60">
-<unit bldFile="/app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/adapt_hw_device_api/group"/>
 </component>
 <component id="nss_devtts_api" name="NSS DevTTS API" class="api" filter="s60">
 <unit bldFile="/app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
 </component>
 <component id="nss_srs_utility_api" name="NSS SRS Utility API" class="api" filter="s60">

changeset 763	79fffd551b70
parent 644	c8dddc123405